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

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalRepairController.java

@@ -236,4 +236,20 @@ public class CapitalRepairController {
     public RestResponse signInRecord(@Val @RequestBody CapitalRepairRequest request) {
         return signInService.list(request);
     }
+
+    /**
+     * @param request 项目电梯关联列表请求
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 批量插入项目电梯关联数据
+     * @date 2020/5/9 10:31 上午
+     */
+    @PostMapping("batch/insert")
+    @Validation(fields = {"list"})
+    public RestResponse insertBatch(@Val @RequestBody CapitalRepairRequest request) {
+        boolean result = capitalRepairLiftRelevanceService.insertBatch(request.getList());
+        if (!result) {
+            return RestResponse.fail(MessageUtils.get("msg.add.batch.fail"));
+        }
+        return RestResponse.success(null, MessageUtils.get("msg.add.batch.success"));
+    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/CapitalRepair.java

@@ -146,7 +146,7 @@ public class CapitalRepair extends BaseEntity {
     private Integer overdueFlag;
 
     /**
-     * 状态 1:尚未开始;2:施工中;3:待审核;4:完成
+     * 状态 1:尚未开始;2:施工中;3:待审核;4:完成;5:停止服务
      */
     @FieldName(name = "项目状态")
     private String projectStatus;

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairLiftRelevanceService.java

@@ -47,6 +47,16 @@ public class CapitalRepairLiftRelevanceService extends ServiceImpl<CapitalRepair
         return updateBatchById(list, list.size());
     }
 
+    /**
+     * @param list 项目电梯关联列表
+     * @return 是否成功
+     * @description 批量插入项目电梯关联表
+     * @date 2020/5/9 10:36 上午
+     */
+    public boolean insertBatch(List<CapitalRepairLiftRelevance> list) {
+        return saveBatch(list, list.size());
+    }
+
     /**
      * @param mtCompanyId   公司id
      * @param projectStatus 项目状态

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairService.java

@@ -118,9 +118,13 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         Long notStart = collect.get(CapitalRepairStatus.NO_START.getCode());
         Long inService = collect.get(CapitalRepairStatus.ABUILDING.getCode());
         Long complete = collect.get(CapitalRepairStatus.COMPLETE.getCode());
+        Long checkPending = collect.get(CapitalRepairStatus.CHECK_PENDING.getCode());
+        Long stopService = collect.get(CapitalRepairStatus.STOP_SERVICE.getCode());
         totalMap.put("notStart", notStart == null ? 0 : notStart);
         totalMap.put("inService", inService == null ? 0 : inService);
         totalMap.put("complete", complete == null ? 0 : complete);
+        totalMap.put("checkPending", checkPending == null ? 0 : checkPending);
+        totalMap.put("stopService", stopService == null ? 0 : stopService);
         int projectCount = count(mtCompanyId, projectStatus);
         int liftCount = capitalRepairLiftRelevanceService.count(mtCompanyId, projectStatus);
         int stopLiftCount = platformCompanyService.countCapital(mtCompanyId, projectStatus);

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

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.*;
@@ -121,10 +122,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
         }
         if (CollUtil.isNotEmpty(deleteList)) {
             boolean deleteResult = removeByIds(deleteList.stream().map(Payment::getId).collect(Collectors.toList()));
-            if (!deleteResult) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return RestResponse.fail(MessageUtils.get("msg.delete.batch.fail"));
-            }
+            if (!deleteResult) return RestResponse.fail(MessageUtils.get("msg.delete.batch.fail"));
         }
         if (CollUtil.isNotEmpty(updateList)) {
             boolean updateResult = updateBatchById(updateList, updateList.size());
@@ -140,7 +138,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
                 return RestResponse.fail(MessageUtils.get("msg.add.batch.fail"));
             }
         }
-        return RestResponse.fail(MessageUtils.get("msg.modify.success"));
+        return RestResponse.success(MessageUtils.get("msg.modify.success"));
     }
 
     /**
@@ -149,6 +147,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
      * @description 批量修改收款信息
      * @date 2019/12/11 3:50 PM
      */
+    @Transactional(rollbackFor = Exception.class)
     public RestResponse modifyBatchById(PaymentRequest request) {
         List<Payment> paymentList = request.getPaymentList();
         List<Long> paymentIdList = paymentList.stream().map(Payment::getId).collect(Collectors.toList());

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -265,11 +265,8 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         List<ProjectLiftRelevance> list = request.getList();
         list.forEach(entry -> entry.setWorkerId(request.getWorkerId()));
         boolean result = updateBatchById(list);
-        if (!result) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        }
-        for (ProjectLiftRelevance entry : list){
+        if (!result) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        for (ProjectLiftRelevance entry : list) {
             sendMessage(entry.getProjectId(), entry.getMtCompanyId(), entry.getLiftId(), entry.getWorkerId(), newWorkerId);
         }
         return RestResponse.success(null, MessageUtils.get("msg.modify.success"));