Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/response/PaymentListResponse.java

@@ -48,6 +48,10 @@ public class PaymentListResponse {
      * 实收时间
      */
     private LocalDate workDate;
+    /**
+     * 终止时间
+     */
+    private LocalDate endDate;
     /**
      * 收款人
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -56,7 +56,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
      * @date 2019/12/7 11:53 AM
      */
     public IPage<ContractResponse> list(ContractRequest request) {
-        request.addDesc("end_date");
+        request.addDesc("c.end_date");
         return contractsMapper.findByCondition(request.getPage(), request);
     }
 

lift-business-service/src/main/resources/mapper/contract/PaymentMapper.xml

@@ -44,10 +44,12 @@
 			   c.work_money_total              AS workMoney,
 		       pa.plan_date                    AS planDate,
 		       pa.work_date                    AS workDate,
-			   pa.cashier_user                 AS cashierUser
+		       c.end_date                      AS endDate,
+		       ui.name                         AS cashierUser
 		FROM contracts c
 				 LEFT JOIN payment pa ON c.id = pa.contracts_id
 				 LEFT JOIN project p ON c.project_id = p.id
+		         LEFT JOIN user_info ui on pa.cashier_user = ui.user_id
 		WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		AND pa.type in('1','2','3','4')
 		<if test="request.projectName!=null and request.projectName!=''">
@@ -58,19 +60,21 @@
 	<select id="findCapitalByCondition" parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentRequest"
 			resultType="cn.com.ty.lift.business.contract.dao.entity.model.response.PaymentListResponse">
 		SELECT
-		cr.id                           AS projectId,
-		c.id                            AS contractId,
-		c.code                          AS contractCode,
-		cr.project_name                 AS projectName,
-		pa.code                         AS paymentCode,
-		pa.plan_money                   AS planMoney,
-		pa.work_money                   AS workMoney,
-		pa.plan_date                    AS planDate,
-		pa.work_date                    AS workDate,
-		pa.cashier_user                 AS cashierUser
+			cr.id                           AS projectId,
+			c.id                            AS contractId,
+			c.code                          AS contractCode,
+			cr.project_name                 AS projectName,
+			pa.code                         AS paymentCode,
+			pa.plan_money                   AS planMoney,
+			pa.work_money                   AS workMoney,
+			pa.plan_date                    AS planDate,
+			pa.work_date                    AS workDate,
+			c.end_date                      AS endDate,
+			ui.name                         AS cashierUser
 		FROM contracts c
-		LEFT JOIN payment pa ON c.id = pa.contracts_id
-		LEFT JOIN capital_repair cr ON c.project_id = cr.id
+			LEFT JOIN payment pa ON c.id = pa.contracts_id
+			LEFT JOIN capital_repair cr ON c.project_id = cr.id
+		    LEFT JOIN user_info ui on pa.cashier_user = ui.user_id
 		WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		AND pa.type = '5'
 		<if test="request.projectName!=null and request.projectName!=''">