LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支出合同变更修改

Browse Source
This commit is contained in:
梁琦涛
2021-10-28 16:34:47 +08:00
parent e7117db802
commit a784851bbc
5 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+4 -3
View File
@@ -21,6 +21,7 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.contract.common.PayIncomeContractCommon;
import com.jero.contract.entity.*;
import com.jero.contract.service.IPaySpendingContractAuditService;
import com.jero.contract.service.IPaySpendingContractInstallmentService;
@@ -317,14 +318,14 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
@ApiOperation(value="支出合同-导出excel", notes="支出合同-导出excel")
public ModelAndView exportXls(HttpServletRequest request, PaySpendingContract paySpendingContract,
@RequestParam(name="startTime",required = false) String startTime,
@RequestParam(name="endTime",required = false) String endTime) {
@RequestParam(name="endTime",required = false) String endTime,
@RequestParam(name="chargeStatus",required = false) String chargeStatus) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
paySpendingContract.setPrincipalId(sysUser.getId());
}
List<PaySpendingContract> pageList = paySpendingContractService.queryList(paySpendingContract.getPrincipalId(), paySpendingContract.getContractNum(),
paySpendingContract.getContractName(),startTime,endTime);
List<PaySpendingContract> pageList = paySpendingContractService.queryList(paySpendingContract,startTime,endTime,chargeStatus);
List<PaySpendingContract> exportList = null;
// 过滤选中数据
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
+2 -3
View File
@@ -36,8 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper<PaySpendingContrac
* @Return
* @Exception
*/
List<PaySpendingContract> queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum,
@Param("contractName") String contractName,@Param("startTime") String startTime,
@Param("endTime") String endTime);
List<PaySpendingContract> queryList(@Param("paySpendingContract") PaySpendingContract paySpendingContract
,@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("chargeStatus") String chargeStatus);
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+14 -8
View File
@@ -58,10 +58,10 @@
AND principal_id = #{paySpendingContract.principalId}
</if>
<if test="paySpendingContract.status != null and paySpendingContract.status != ''">
AND aa.status = #{paySpendingContract.status}
AND psc.status = #{paySpendingContract.status}
</if>
<if test="chargeStatus != null and chargeStatus != ''">
AND aa.chargeStatus = #{chargeStatus}
AND psc.chargeStatus = #{chargeStatus}
</if>
</where>
ORDER BY chargeStatus desc,create_time desc
@@ -105,11 +105,11 @@
) AS chargeStatus
FROM pay_spending_contract psc
<where>
<if test="contractNum != null and contractNum != ''">
AND contract_num LIKE CONCAT('%',CONCAT(#{contractNum},'%'))
<if test="paySpendingContract.contractNum != null and paySpendingContract.contractNum != ''">
AND contract_num LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractNum},'%'))
</if>
<if test="contractName != null and contractName != ''">
AND contract_name LIKE CONCAT('%',CONCAT(#{contractName},'%'))
<if test="paySpendingContract.contractName != null and paySpendingContract.contractName != ''">
AND contract_name LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractName},'%'))
</if>
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
@@ -117,8 +117,14 @@
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
</if>
<if test="principalId != null and principalId != ''">
AND principal_id = #{principalId}
<if test="paySpendingContract.principalId != null and paySpendingContract.principalId != ''">
AND principal_id = #{paySpendingContract.principalId}
</if>
<if test="paySpendingContract.status != null and paySpendingContract.status != ''">
AND psc.status = #{paySpendingContract.status}
</if>
<if test="chargeStatus != null and chargeStatus != ''">
AND psc.chargeStatus = #{chargeStatus}
</if>
</where>
ORDER BY chargeStatus desc,create_time desc
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
+1 -1
View File
@@ -82,7 +82,7 @@ public interface IPaySpendingContractService extends IService<PaySpendingContrac
* @Return
* @Exception
*/
List<PaySpendingContract> queryList(String contractNum,String contractName,String startTime,String endTime);
List<PaySpendingContract> queryList(PaySpendingContract paySpendingContract,String startTime,String endTime,String chargeStatus);
/**
* @Description 审核
* @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+3 -2
View File
@@ -549,6 +549,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
paySpendingContract.setPrincipalId(principalName.getId());
paySpendingContract.setPrincipalName(principalName.getRealname());
paySpendingContract.setStatus(PayIncomeContractCommon.STATUS2);
paySpendingContractService.save(paySpendingContract);
List<PaySpendingContractInstallment> listPaySpendingContractInstallment = p.getListInstallment();
if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){
@@ -568,8 +569,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
}
@Override
public List<PaySpendingContract> queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) {
return paySpendingContractMapper.queryList(principalId, contractNum, contractName, startTime, endTime);
public List<PaySpendingContract> queryList(PaySpendingContract paySpendingContract,String startTime,String endTime,String chargeStatus) {
return paySpendingContractMapper.queryList( paySpendingContract, startTime, endTime, chargeStatus);
}
@Override