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

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

@@ -40,12 +40,27 @@ public class PaymentController {
     /**
      * @param request 收款列表查询条件
      * @return RestResponse 付款分页列表结果
-     * @description 查询收款列表
+     * @description 查询维保收款列表
      * @date 2020/2/20 3:10 下午
      */
-    @PostMapping("list")
-    public RestResponse list(@Valid @RequestBody PaymentRequest request) {
-        IPage<PaymentListResponse> page = paymentService.list(request);
+    @PostMapping("maintenance/list")
+    public RestResponse maintenanceList(@Valid @RequestBody PaymentRequest request) {
+        IPage<PaymentListResponse> page = paymentService.maintenanceList(request);
+        if (CollUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
+
+    /**
+     * @param request 收款列表查询条件
+     * @return RestResponse 付款分页列表结果
+     * @description 查询大修收款列表
+     * @date 2020/4/27 11:15 上午
+     */
+    @PostMapping("capital/list")
+    public RestResponse capitalList(@Valid @RequestBody PaymentRequest request) {
+        IPage<PaymentListResponse> page = paymentService.capitalList(request);
         if (CollUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }

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

@@ -24,9 +24,4 @@ public class PaymentRequest extends PageRequest {
      * 项目名称
      */
     private String projectName;
-    /**
-     * 付款类型  (1:维保，2:大修)
-     */
-    @NotEmpty(message = "notEmpty")
-    private String paymentType;
 }

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

@@ -184,13 +184,20 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
 
-        if (CollUtil.isNotEmpty(paymentList)){
+        if (CollUtil.isNotEmpty(paymentList)) {
             //修改付款信息
             boolean paymentResult = paymentService.modifyBatchById(paymentList);
             if (!paymentResult) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
             }
+        } else {
+            //批量插入收款信息
+            boolean ret = paymentService.insertBatch(paymentList, contracts);
+            if (!ret) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return RestResponse.fail(MessageUtils.get("msg.add.batch.fail"));
+            }
         }
         return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }

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

@@ -31,14 +31,20 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
      * @description 查询付款列表
      * @date 2020/2/20 3:10 下午
      */
-    public IPage<PaymentListResponse> list(PaymentRequest request){
-        //大修列表
-        if ("2".equals(request.getPaymentType())) {
-            return baseMapper.findCapitalByCondition(request.getPage(), request);
-        }
+    public IPage<PaymentListResponse> maintenanceList(PaymentRequest request){
         return baseMapper.findProjectByCondition(request.getPage(), request);
     }
 
+    /**
+     * @param request 付款列表查询条件
+     * @return RestResponse 付款分页列表结果
+     * @description 查询大修付款列表
+     * @date 2020/4/27 11:15 上午
+     */
+    public IPage<PaymentListResponse> capitalList(PaymentRequest request){
+        return baseMapper.findCapitalByCondition(request.getPage(), request);
+    }
+
     /**
      * @param request 付款详情查询条件
      * @return RestResponse 付款详情

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

@@ -49,12 +49,10 @@
 				 LEFT JOIN payment pa ON c.id = pa.contracts_id
 				 LEFT JOIN project p ON c.project_id = p.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!=''">
 			AND p.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
 		</if>
-		<if test="request.paymentType!=null and request.paymentType!=''">
-			AND pa.type = #{request.paymentType,jdbcType=VARCHAR}
-		</if>
 	</select>
 
 	<select id="findCapitalByCondition" parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentRequest"
@@ -74,12 +72,10 @@
 		LEFT JOIN payment pa ON c.id = pa.contracts_id
 		LEFT JOIN capital_repair cr ON c.project_id = cr.id
 		WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+		AND pa.type = '5'
 		<if test="request.projectName!=null and request.projectName!=''">
 			AND cr.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
 		</if>
-		<if test="request.paymentType!=null and request.paymentType!=''">
-			AND pa.type = #{request.paymentType,jdbcType=VARCHAR}
-		</if>
 	</select>
 
 	<select id="queryProjectDetailById" parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.PaymentRequest"