From a784851bbcdd85746faf12ad1d05d957bbb2d682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Thu, 28 Oct 2021 16:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PaySpendingContractController.java        |  7 +++---
 .../mapper/PaySpendingContractMapper.java     |  5 ++---
 .../mapper/xml/PaySpendingContractMapper.xml  | 22 ++++++++++++-------
 .../service/IPaySpendingContractService.java  |  2 +-
 .../impl/PaySpendingContractServiceImpl.java  |  5 +++--
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
index 04225069..5a07d442 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
@@ -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;
 
 		// 过滤选中数据
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
index 0eadf172..c01bfe8f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java
@@ -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);
 
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
index ae85f392..42c7841e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml
@@ -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
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
index 3789b2a3..e862f9a3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
@@ -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
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index b574b947..65b4e018 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -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