Browse Source

低空不欠债改造

wangming 8 tháng trước cách đây
mục cha
commit
c76a65a399

+ 7 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxLowaltitudeDebtfreeCheckMainService.java

@@ -31,6 +31,13 @@ public interface ZhcxLowaltitudeDebtfreeCheckMainService extends IService<ZhcxLo
      */
     void saveMain(SaveCheckRequest req, String mainId);
 
+    /**
+     * 保存主表数据
+     *
+     * @param req
+     */
+    void saveMain4Power(SaveCheckRequest req, String mainId);
+
     /**
      * 更新机台不欠债率
      *

+ 6 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxLowaltitudeDebtfreeCheckService.java

@@ -33,4 +33,10 @@ public interface ZhcxLowaltitudeDebtfreeCheckService extends IService<ZhcxLowalt
      */
     void updateCheck(SaveCheckRequest req);
 
+    /**
+     * 修改检查
+     *
+     * @param req
+     */
+    void updateCheck4Power(SaveCheckRequest req);
 }

+ 16 - 0
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxLowaltitudeDebtfreeCheckMainServiceImpl.java

@@ -98,6 +98,22 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         updateById(entity);
     }
 
+    /**
+     * 保存主表数据
+     *
+     * @param req
+     */
+    @Override
+    public void saveMain4Power(SaveCheckRequest req, String mainId) {
+        ZhcxLowaltitudeDebtfreeCheckMainDo entity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
+        entity.setId(mainId);
+
+        final ZhcxLowaltitudeDebtfreeCheckMainDo main = getById(mainId);
+        entity.setPowermachinedebtratio(calPowerMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+
+        updateById(entity);
+    }
+
     /**
      * 更新机台不欠债率
      *

+ 37 - 5
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);
+        updateCheckObj(req, checkDo, "quality");
 
         //分包商
         //明细
@@ -217,18 +217,50 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         lowaltitudeDebtfreeCheckMainService.saveMain(req, checkDo.getMainid());
     }
 
+    /**
+     * 修改检查
+     *
+     * @param req
+     */
+    @Override
+    public void updateCheck4Power(SaveCheckRequest req) {
+        final ZhcxLowaltitudeDebtfreeCheckDo checkDo = getById(req.getId());
+        //改check
+        updateCheckObj(req, checkDo, "power");
+
+        try {
+            if(ObjectUtil.isNotEmpty(req.getDetailList())) {
+                for (GeneralUpdateVo generalUpdateVo : req.getDetailList()) {
+                    generalCRUDService.generalUpdate(generalUpdateVo);
+                }
+            }
+        } catch (Exception e) {
+            log.error("保存失败: {}", e);
+            throw new CustomException("保存失败");
+        }
+
+        //保存主数据
+        lowaltitudeDebtfreeCheckMainService.saveMain4Power(req, checkDo.getMainid());
+    }
+
     /**
      * 更新检查表
      *
      * @param req
      * @return
      */
-    private void updateCheckObj(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
+    private void updateCheckObj(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo, String source) {
         ZhcxLowaltitudeDebtfreeCheckDo entity  = new ZhcxLowaltitudeDebtfreeCheckDo();
         entity.setId(req.getId());
-        entity.setCheckdate(req.getCheckdate());
-        entity.setSectordebtratio(req.getSectordebtratio());
-        entity.setCompletionstatus(req.getCompletionstatus());
+        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());
+        }
+
         //只有保存才会进入下一步
         if("default".equals(req.getSaveBehavior())) {
             entity.setQualitystatus(getStepStatus(checkDo));

+ 13 - 0
business-server/src/main/java/com/rongwei/bsserver/controller/DebtfreeController.java

@@ -45,6 +45,19 @@ public class DebtfreeController {
         return R.ok();
     }
 
+    /**
+     * 更新检查
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/updateCheck4Power")
+    @ResponseBody
+    public R updateCheck4Power(@RequestBody SaveCheckRequest req) {
+        zhcxLowaltitudeDebtfreeCheckService.updateCheck4Power(req);
+        return R.ok();
+    }
+
     /**
      * 更新检查
      *