公司台量上限校验，项目列表查询实际台量增加电梯状态判断，付款列表sql修改

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

@@ -43,7 +43,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
      * @date 2020/2/20 3:10 下午
      */
     public IPage<PaymentListResponse> maintenanceList(PaymentRequest request) {
-        request.addDesc("work_date");
+        request.addDesc("c.end_date");
         return baseMapper.findProjectByCondition(request.getPage(), request);
     }
 
@@ -54,7 +54,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
      * @date 2020/4/27 11:15 上午
      */
     public IPage<PaymentListResponse> capitalList(PaymentRequest request) {
-        request.addDesc("work_date");
+        request.addDesc("c.end_date");
         return baseMapper.findCapitalByCondition(request.getPage(), request);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -271,8 +271,6 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         //公司id
         Long mtCompanyId = request.getMtCompanyId();
         Lift lift = request.getLift();
-        if (maintenanceService.judge(mtCompanyId))
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));
         RestResponse response = preJudgment(mtCompanyId, lift.getRegistrationCode());
         if (ApiConstants.RESULT_ERROR.equals(response.getStatusCode())) return response;
         //新增标记 (0:新增,1:查询后带入)
@@ -297,10 +295,26 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         switch (source) {
             //电梯管理入口
             case "0":
+                if (maintenanceService.judge(mtCompanyId))
+                    return RestResponse.fail(MessageUtils.get("msg.limit.num"));
                 saveCompanyLiftInfo(id, mtCompanyId);
                 break;
             //项目管理入口
             case "1":
+                Long projectId = request.getProjectId();
+                Optional<Project> optional = projectService.getOne(projectId);
+                int num = 0;
+                if (optional.isPresent()) {
+                    Project project = optional.get();
+                    num = project.getNum();
+                }
+                //获取该公司企业电梯关联表的实际电梯台量
+                int currentNum = platformService.countLiftNum(mtCompanyId);
+                if (currentNum >= num) {
+                    return RestResponse.fail(MessageUtils.get("msg.project.limit.num"));
+                }
+                if (maintenanceService.judge(mtCompanyId))
+                    return RestResponse.fail(MessageUtils.get("msg.limit.num"));
                 //新增企业电梯关联表
                 PlatformCompanyLiftRelevance companyLiftEntry = platformService.save(id, mtCompanyId);
                 if (ObjectUtil.isEmpty(companyLiftEntry)) {

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

@@ -40,11 +40,11 @@ public class ProjectResponse {
     /**
      * 台量
      */
-    private Integer num;
+    private int num;
     /**
      * 系统台量（实际台量）
      */
-    private Integer actualNum;
+    private int actualNum;
     /**
      * 项目地址
      */

lift-business-service/src/main/resources/locale/response.properties

@@ -12,6 +12,7 @@ msg.modify.batch.success=\u6279\u91CF\u4FEE\u6539\u6210\u529F
 msg.modify.batch.fail=\u6279\u91CF\u4FEE\u6539\u5931\u8D25
 msg.delete.batch.fail=\u6279\u91CF\u5220\u9664\u5931\u8D25
 msg.limit.num=\u5F53\u524D\u7535\u68AF\u53F0\u91CF\u5927\u4E8E\u4F01\u4E1A\u8BBE\u7F6E\u7535\u68AF\u53F0\u91CF
+msg.project.limit.num=\u5F53\u524D\u7535\u68AF\u53F0\u91CF\u5927\u4E8E\u9879\u76EE\u53F0\u91CF
 msg.param.empty=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
 msg.lift.exist=\u516C\u53F8\u4E0B\u5DF2\u6709\u6B64\u7535\u68AF\uFF0C\u4E0D\u80FD\u91CD\u590D\u6DFB\u52A0
 msg.lift.company.exist=\u5176\u4ED6\u516C\u53F8\u5DF2\u6709\u6B64\u7535\u68AF\uFF0C\u8FD4\u56DE\u7535\u68AF\u4FE1\u606F

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

@@ -39,19 +39,15 @@
 		       c.id                            AS contractId,
 		       c.code                          AS contractCode,
 			   p.project_name                  AS projectName,
-			   pa.code                         AS paymentCode,
 			   c.plan_money_total              AS planMoney,
 			   c.work_money_total              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 project p ON c.project_id = p.id
-		         LEFT JOIN user_info ui on pa.cashier_user = ui.user_id
+		         LEFT JOIN user_info ui on c.update_id = ui.user_id
 		WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-		AND pa.type in('1','2','3','4')
+		AND c.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>
@@ -64,19 +60,15 @@
 			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.plan_money_total              AS planMoney,
+			c.work_money_total              AS workMoney,
 			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 user_info ui on pa.cashier_user = ui.user_id
+		    LEFT JOIN user_info ui on c.update_id = ui.user_id
 		WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-		AND pa.type = '5'
+		AND c.type = '5'
 		<if test="request.projectName!=null and request.projectName!=''">
 			AND cr.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
 		</if>

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -73,7 +73,11 @@
 		LEFT JOIN contracts c ON p.id = c.project_id
 		LEFT JOIN (SELECT count(1) AS actualNum, project_id
 					FROM project_lift_relevance plr
+					LEFT JOIN platform_company_lift_relevance pclr
+					ON plr.lift_id = pclr.lift_id AND pclr.mt_company_id = plr.mt_company_id
 					WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+					AND pclr.lift_company_status != '1'
+					AND pclr.delete_flag = '0'
 					GROUP BY project_id) plr ON plr.project_id = p.id
         WHERE p.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		<if test="request.provinceCode!=null and request.provinceCode!=''">