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

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

@@ -50,11 +50,11 @@ public class CapitalRepairHistoryService extends ServiceImpl<CapitalRepairHistor
      * @description 保存大修项目操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public boolean saveOperaHistory(CapitalRepair oldEntry, CapitalRepair newEntry, Long mtCompanyId) {
+    public CapitalRepairHistory saveOperaHistory(CapitalRepair oldEntry, CapitalRepair newEntry, Long mtCompanyId) {
         Map<String, String> resultMap = new HashMap<>();
         try {
             resultMap = utils.compareAttribute(oldEntry, newEntry);
-            if (MapUtil.isEmpty(resultMap)) return false;
+            if (MapUtil.isEmpty(resultMap)) return null;
         } catch (NoSuchFieldException e) {
             log.error("大修项目操作记录保存异常", e);
         }
@@ -67,7 +67,7 @@ public class CapitalRepairHistoryService extends ServiceImpl<CapitalRepairHistor
         capitalRepairHistory.setAfterContent(resultMap.get("after"));
         capitalRepairHistory.setOperatorId(10000L);
         capitalRepairHistory.setOperateDate(LocalDateTime.now());
-        return save(capitalRepairHistory);
+        return capitalRepairHistory;
     }
 
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.capital.service;
 
 import cn.com.ty.lift.business.capital.dao.entity.CapitalRepair;
+import cn.com.ty.lift.business.capital.dao.entity.CapitalRepairHistory;
 import cn.com.ty.lift.business.capital.dao.entity.model.request.CapitalRepairRequest;
 import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairResponse;
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairMapper;
@@ -173,11 +174,15 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         boolean result = updateById(capitalRepair);
         if (!result)
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        //保存大修项目操作记录
-        boolean projectResult = capitalRepairHistoryService.saveOperaHistory(oldCapital, capitalRepair, request.getMtCompanyId());
-        if (!projectResult) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        //生成大修项目操作记录
+        CapitalRepairHistory history = capitalRepairHistoryService.saveOperaHistory(oldCapital, capitalRepair, request.getMtCompanyId());
+        if (Objects.nonNull(history)) {
+            //保存大修项目操作记录
+            boolean projectResult = capitalRepairHistoryService.save(history);
+            if (!projectResult) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            }
         }
         return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }

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

@@ -77,6 +77,7 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
         } else {
             SignIn signIn = new SignIn();
             signIn.setCoordinate(request.getCoordinate());
+            signIn.setMtCompanyId(request.getMtCompanyId());
             signIn.setAddress(request.getAddress());
             signIn.setSignDate(LocalDate.now());
             signIn.setApproachTime(LocalTime.now().withNano(0).toString());

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

@@ -50,11 +50,11 @@ public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper,
      * @description 保存合同操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public boolean saveOperaHistory(Contracts oldEntry, Contracts newEntry){
+    public ContractsHistory createOperaHistory(Contracts oldEntry, Contracts newEntry){
         Map<String, String> resultMap = new HashMap<>();
         try {
             resultMap = utils.compareAttribute(oldEntry, newEntry);
-            if (MapUtil.isEmpty(resultMap)) return false;
+            if (MapUtil.isEmpty(resultMap)) return null;
         } catch (NoSuchFieldException e) {
             log.error("合同操作记录保存异常", e);
         }
@@ -66,6 +66,6 @@ public class ContractHistoryService extends ServiceImpl<ContractsHistoryMapper,
         contractsHistory.setAfterContent(resultMap.get("after"));
         contractsHistory.setOperatorId(10000L);
         contractsHistory.setOperateDate(LocalDateTime.now());
-        return save(contractsHistory);
+        return contractsHistory;
     }
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.contract.service;
 
 import cn.com.ty.lift.business.contract.dao.entity.Contracts;
+import cn.com.ty.lift.business.contract.dao.entity.ContractsHistory;
 import cn.com.ty.lift.business.contract.dao.entity.Payment;
 import cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest;
 import cn.com.ty.lift.business.contract.dao.entity.model.response.ContractResponse;
@@ -23,10 +24,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 import static java.math.BigDecimal.ZERO;
 
@@ -174,11 +172,15 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
 
         Contracts entry = oldContract.get();
-        //保存合同操作记录
-        boolean historyResult = contractHistoryService.saveOperaHistory(entry, contracts);
-        if (!historyResult) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        //生成合同操作记录
+        ContractsHistory history = contractHistoryService.createOperaHistory(entry, contracts);
+        if (Objects.nonNull(history)) {
+            //保存合同操作记录
+            boolean historyResult = contractHistoryService.save(history);
+            if (!historyResult) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            }
         }
 
         if (CollUtil.isNotEmpty(paymentList)) {

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

@@ -52,11 +52,11 @@ public class LiftHistoryService extends ServiceImpl<LiftHistoryMapper, LiftHisto
      * @description 保存电梯操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public boolean saveOperaHistory(Lift oldEntry, Lift newEntry, Long mtCompanyId) {
+    public LiftHistory createOperaHistory(Lift oldEntry, Lift newEntry, Long mtCompanyId) {
         Map<String, String> resultMap = new HashMap<>();
         try {
             resultMap = utils.compareAttribute(oldEntry, newEntry);
-            if (MapUtil.isEmpty(resultMap)) return false;
+            if (MapUtil.isEmpty(resultMap)) return null;
         } catch (NoSuchFieldException e) {
             log.error("电梯操作记录保存异常", e);
         }
@@ -69,6 +69,6 @@ public class LiftHistoryService extends ServiceImpl<LiftHistoryMapper, LiftHisto
         liftHistory.setAfterContent(resultMap.get("after"));
         liftHistory.setOperatorId(10000L);
         liftHistory.setOperateDate(LocalDateTime.now());
-        return save(liftHistory);
+        return liftHistory;
     }
 }

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.library.service;
 import cn.com.ty.lift.business.capital.service.CapitalRepairLiftRelevanceService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
+import cn.com.ty.lift.business.library.dao.entity.LiftHistory;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
 import cn.com.ty.lift.business.library.dao.entity.model.LiftImportModel;
 import cn.com.ty.lift.business.library.dao.entity.model.LiftProjectModel;
@@ -280,12 +281,17 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         boolean result = updateById(lift);
         if (!result)
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        //修改电梯保存操作记录
+
         Lift entry = oldLift.get();
-        boolean historyResult = liftHistoryService.saveOperaHistory(entry, lift, request.getMtCompanyId());
-        if (!historyResult) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        //生成电梯操作记录
+        LiftHistory history = liftHistoryService.createOperaHistory(entry, lift, request.getMtCompanyId());
+        if (Objects.nonNull(history)) {
+            //保存电梯操作记录
+            boolean historyResult = liftHistoryService.save(history);
+            if (!historyResult) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            }
         }
         ProjectLiftRelevance liftRelevance = new ProjectLiftRelevance();
         liftRelevance.setId(request.getRelevanceId());

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

@@ -50,11 +50,11 @@ public class ProjectHistoryService extends ServiceImpl<ProjectHistoryMapper, Pro
      * @description 保存项目操作记录
      * @date 2020/4/28 9:52 上午
      */
-    public boolean saveOperaHistory(Project oldEntry, Project newEntry, Long mtCompanyId) {
+    public ProjectHistory createOperaHistory(Project oldEntry, Project newEntry, Long mtCompanyId) {
         Map<String, String> resultMap = new HashMap<>();
         try {
             resultMap = utils.compareAttribute(oldEntry, newEntry);
-            if (MapUtil.isEmpty(resultMap)) return false;
+            if (MapUtil.isEmpty(resultMap)) return null;
         } catch (NoSuchFieldException e) {
             log.error("项目操作记录保存异常", e);
         }
@@ -68,6 +68,6 @@ public class ProjectHistoryService extends ServiceImpl<ProjectHistoryMapper, Pro
         projectHistory.setAfterContent(resultMap.get("after"));
         projectHistory.setOperatorId(10000L);
         projectHistory.setOperateDate(LocalDateTime.now());
-        return save(projectHistory);
+        return projectHistory;
     }
 }

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

@@ -251,12 +251,16 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         boolean result = updateById(project);
         if (!result)
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        //保存项目操作记录
         Project entry = oldProject.get();
-        boolean projectResult = projectHistoryService.saveOperaHistory(entry, project, project.getMtCompanyId());
-        if (!projectResult) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        //生成项目操作记录
+        ProjectHistory history = projectHistoryService.createOperaHistory(entry, project, project.getMtCompanyId());
+        if (Objects.nonNull(history)) {
+            //保存项目操作记录
+            boolean projectResult = projectHistoryService.save(history);
+            if (!projectResult) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+            }
         }
         return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }