低空不欠债改造

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxLowaltitudeDebtfreeCheckServiceImpl.java

@@ -191,7 +191,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
 
         //改check
-        updateCheckObj(req, checkDo, "quality");
+        updateCheckObj(req, checkDo);
 
         //分包商
         //明细
@@ -226,7 +226,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
     public void updateCheck4Power(SaveCheckRequest req) {
         final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
         //改check
-        updateCheckObj(req, checkDo, "power");
+        updateCheckObjPower(req, checkDo);
 
         try {
             if(ObjectUtil.isNotEmpty(req.getDetailList())) {
@@ -249,17 +249,13 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
      * @param req
      * @return
      */
-    private void updateCheckObj(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo, String source) {
+    private void updateCheckObj(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
         ZhcxLowaltitudeDebtfreeCheckDo entity  = new ZhcxLowaltitudeDebtfreeCheckDo();
         entity.setId(req.getId());
-        if("quality".equals(source)) {
-            entity.setCheckdate(req.getCheckdate());
-            entity.setSectordebtratio(req.getSectordebtratio());
-            entity.setCompletionstatus(req.getCompletionstatus());
-        } else if("power".equals(source)) {
-            entity.setPowersectordebtratio(req.getSectordebtratio());
-            entity.setPowercompletionstatus(req.getCompletionstatus());
-        }
+
+        entity.setCheckdate(req.getCheckdate());
+        entity.setSectordebtratio(req.getSectordebtratio());
+        entity.setCompletionstatus(req.getCompletionstatus());
 
         //只有保存才会进入下一步
         if("default".equals(req.getSaveBehavior())) {
@@ -268,6 +264,45 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         updateById(entity);
     }
 
+    /**
+     * 更新检查表
+     *
+     * @param req
+     * @return
+     */
+    private void updateCheckObjPower(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
+        ZhcxLowaltitudeDebtfreeCheckDo entity  = new ZhcxLowaltitudeDebtfreeCheckDo();
+        entity.setId(req.getId());
+        entity.setPowersectordebtratio(req.getSectordebtratio());
+        entity.setPowercompletionstatus(req.getCompletionstatus());
+
+        //只有保存才会进入下一步
+        if("default".equals(req.getSaveBehavior())) {
+            entity.setElectromechanicalstatus(getStepStatusPower(checkDo));
+        }
+        updateById(entity);
+    }
+
+    /**
+     * 获取状态
+     *
+     * @param checkDo
+     * @return
+     */
+    private String getStepStatusPower(ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
+        if(ObjectUtil.isEmpty(checkDo.getQualitystatus())) {
+            checkDo.setQualitystatus("assembling");
+        }
+
+        if("done".equals(checkDo.getElectromechanicalstatus())) {
+            return checkDo.getElectromechanicalstatus();
+        }
+
+        final int index = ConstantUtil.LOWER_STEP_STATUS.indexOf(checkDo.getElectromechanicalstatus());
+
+        return ConstantUtil.LOWER_STEP_STATUS.get(index + 1);
+    }
+
     /**
      * 获取状态
      *