低空不欠债率-送电处理

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

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service;
 
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDo;
 import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckMainDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ZhcxProjectManageDo;
@@ -29,33 +30,33 @@ public interface ZhcxLowaltitudeDebtfreeCheckMainService extends IService<ZhcxLo
      *
      * @param req
      */
-    void saveMain(SaveCheckRequest req, String mainId);
+    void saveMain(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo check);
 
     /**
      * 保存主表数据
      *
      * @param req
      */
-    void saveMain4Power(SaveCheckRequest req, String mainId);
+    void saveMain4Power(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo check);
 
     /**
      * 更新机台不欠债率
      *
      * @param mainId
      */
-    void updateMachineById(String projectId, String machineId, String mainId);
+    void updateMachine4AddById(String projectId, String machineId, String mainId);
 
     /**
      * 统计机台不欠债率
      *
      * @param mainId
      */
-    void updateMachineById(String mainId);
+    void updateMachine4AddById(String mainId);
 
     /**
      * 更新机台不欠债率
      *
      * @param mainId
      */
-    void updatePowerMachineById(String projectId, String machineId, String mainId);
+    void updatePowerMachine4AddById(String projectId, String machineId, String mainId);
 }

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

@@ -5,13 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckDetailPowerService;
 import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckDetailService;
-import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailDo;
-import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailPowerDo;
-import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckMainDo;
+import com.rongwei.bsentity.domain.*;
 import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckMainDao;
 import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckMainService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bsentity.domain.ZhcxProjectManageDo;
 import com.rongwei.bsentity.dto.lowaltitude.AddHoistingPlanDateRequest;
 import com.rongwei.bsentity.dto.lowaltitude.SaveCheckRequest;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -85,15 +82,22 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
      * @param req
      */
     @Override
-    public void saveMain(SaveCheckRequest req, String mainId) {
+    public void saveMain(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo check) {
         ZhcxLowaltitudeDebtfreeCheckMainDo entity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
-        entity.setId(mainId);
+        entity.setId(check.getMainid());
         entity.setHoistingplandate(req.getHoistingplandate());
         entity.setAltitude(req.getAltitude());
         entity.setFinalassembledate(req.getFinalassembledate());
 
-        final ZhcxLowaltitudeDebtfreeCheckMainDo main = getById(mainId);
-        entity.setMachinedebtratio(calMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+        final ZhcxLowaltitudeDebtfreeCheckMainDo main = getById(check.getMainid());
+
+        if("assembling".equals(check.getQualitystatus())) {
+            entity.setMachinedebtratio(calMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+        } else if("powering".equals(check.getQualitystatus())) {
+            entity.setPtmachinedebtratio(calPtMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+        }
+
+
 
         updateById(entity);
     }
@@ -104,12 +108,17 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
      * @param req
      */
     @Override
-    public void saveMain4Power(SaveCheckRequest req, String mainId) {
+    public void saveMain4Power(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo check) {
         ZhcxLowaltitudeDebtfreeCheckMainDo entity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
-        entity.setId(mainId);
+        entity.setId(check.getMainid());
+
+        final ZhcxLowaltitudeDebtfreeCheckMainDo main = getById(check.getMainid());
 
-        final ZhcxLowaltitudeDebtfreeCheckMainDo main = getById(mainId);
-        entity.setPowermachinedebtratio(calPowerMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+        if("assembling".equals(check.getElectromechanicalstatus())) {
+            entity.setPowermachinedebtratio(calPowerMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+        } else if("powering".equals(check.getElectromechanicalstatus())) {
+            entity.setPtpowermachinedebtratio(calPtPowerMachineDebtRatio(main.getProjectid(), main.getMachinenoid()));
+        }
 
         updateById(entity);
     }
@@ -120,7 +129,7 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
      * @param mainId
      */
     @Override
-    public void updateMachineById(String projectId, String machineId, String mainId) {
+    public void updateMachine4AddById(String projectId, String machineId, String mainId) {
         final String machineDebtRatio = calMachineDebtRatio(projectId, machineId);
 
         ZhcxLowaltitudeDebtfreeCheckMainDo queryEntity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
@@ -135,7 +144,7 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
      * @param mainId
      */
     @Override
-    public void updateMachineById(String mainId) {
+    public void updateMachine4AddById(String mainId) {
         final LambdaQueryWrapper<ZhcxLowaltitudeDebtfreeCheckDetailDo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ZhcxLowaltitudeDebtfreeCheckDetailDo::getMainid, mainId);
         final List<ZhcxLowaltitudeDebtfreeCheckDetailDo> list = lowaltitudeDebtfreeCheckDetailService.list(queryWrapper);
@@ -153,7 +162,7 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
      * @param mainId
      */
     @Override
-    public void updatePowerMachineById(String projectId, String machineId, String mainId) {
+    public void updatePowerMachine4AddById(String projectId, String machineId, String mainId) {
         final String machineDebtRatio = calPowerMachineDebtRatio(projectId, machineId);
 
         ZhcxLowaltitudeDebtfreeCheckMainDo queryEntity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
@@ -173,6 +182,17 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         return calPowerMachineDebtRatio(list);
     }
 
+    /**
+     * 计算机台不欠债率
+     *
+     * @param projectId
+     * @return
+     */
+    private String calPtPowerMachineDebtRatio(String projectId, String machineId) {
+        final List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> list = lowaltitudeDebtfreeCheckDetailPowerService.getListByMainId(projectId, machineId);
+        return calPtPowerMachineDebtRatio(list);
+    }
+
     /**
      * 计算机台不欠债率
      *
@@ -184,6 +204,17 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         return calMachineDebtRatio(list);
     }
 
+    /**
+     * 计算机台不欠债率
+     *
+     * @param projectId
+     * @return
+     */
+    private String calPtMachineDebtRatio(String projectId, String machineId) {
+        final List<ZhcxLowaltitudeDebtfreeCheckDetailDo> list = lowaltitudeDebtfreeCheckDetailService.getListByMainId(projectId, machineId);
+        return calPtMachineDebtRatio(list);
+    }
+
     /**
      * 计算机台不欠债率
      *
@@ -219,6 +250,42 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         return machineRatio;
     }
 
+
+    /**
+     * 计算机台不欠债率
+     *
+     * @param list
+     * @return
+     */
+    private String calPtPowerMachineDebtRatio(List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> list) {
+        if(ObjectUtil.isEmpty(list)) {
+            return "0.00%";
+        }
+
+        int completeCount = 0;
+        int totalCount = 0;
+        for (ZhcxLowaltitudeDebtfreeCheckDetailPowerDo row : list) {
+            if ("✓".equals(row.getPowerrectifyesult())) {
+                completeCount++;
+            }
+
+            if (!"/".equals(row.getPowerrectifyesult())) {
+                totalCount++;
+            }
+
+        }
+        // 计算机器比率
+        String machineRatio;
+        if (totalCount == 0) {
+            machineRatio = "0.00%"; // 避免除以零
+        } else {
+            double ratio = (double) completeCount / totalCount * 100;
+            machineRatio = String.format("%.2f%%", ratio);
+        }
+
+        return machineRatio;
+    }
+
     /**
      * 计算机台不欠债率
      *
@@ -254,4 +321,39 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         return machineRatio;
     }
 
+    /**
+     * 计算机台不欠债率-送电
+     *
+     * @param list
+     * @return
+     */
+    private String calPtMachineDebtRatio(List<ZhcxLowaltitudeDebtfreeCheckDetailDo> list) {
+        if(ObjectUtil.isEmpty(list)) {
+            return "0.00%";
+        }
+
+        int completeCount = 0;
+        int totalCount = 0;
+        for (ZhcxLowaltitudeDebtfreeCheckDetailDo row : list) {
+            if ("✓".equals(row.getPowerrectifyesult())) {
+                completeCount++;
+            }
+
+            if (!"/".equals(row.getPowerrectifyesult())) {
+                totalCount++;
+            }
+
+        }
+        // 计算机器比率
+        String machineRatio;
+        if (totalCount == 0) {
+            machineRatio = "0.00%"; // 避免除以零
+        } else {
+            double ratio = (double) completeCount / totalCount * 100;
+            machineRatio = String.format("%.2f%%", ratio);
+        }
+
+        return machineRatio;
+    }
+
 }

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

@@ -143,8 +143,8 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         }
 
         //重新计算机台不欠债率
-        lowaltitudeDebtfreeCheckMainService.updateMachineById(req.getProjectId(), req.getMachineNoId(), mainId);
-        lowaltitudeDebtfreeCheckMainService.updatePowerMachineById(req.getProjectId(), req.getMachineNoId(), mainId);
+        lowaltitudeDebtfreeCheckMainService.updateMachine4AddById(req.getProjectId(), req.getMachineNoId(), mainId);
+        lowaltitudeDebtfreeCheckMainService.updatePowerMachine4AddById(req.getProjectId(), req.getMachineNoId(), mainId);
 
     }
 
@@ -215,7 +215,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         }
         //存在时需要重新计算机台不欠债率
         else {
-            lowaltitudeDebtfreeCheckMainService.updateMachineById(check.getMainid());
+            lowaltitudeDebtfreeCheckMainService.updateMachine4AddById(check.getMainid());
         }
     }
 
@@ -253,7 +253,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         }
 
         //保存主数据
-        lowaltitudeDebtfreeCheckMainService.saveMain(req, checkDo.getMainid());
+        lowaltitudeDebtfreeCheckMainService.saveMain(req, checkDo);
     }
 
     /**
@@ -279,7 +279,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         }
 
         //保存主数据
-        lowaltitudeDebtfreeCheckMainService.saveMain4Power(req, checkDo.getMainid());
+        lowaltitudeDebtfreeCheckMainService.saveMain4Power(req, checkDo);
     }
 
     /**
@@ -292,9 +292,15 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         ZhcxLowaltitudeDebtfreeCheckDo entity  = new ZhcxLowaltitudeDebtfreeCheckDo();
         entity.setId(req.getId());
 
-        entity.setCheckdate(new Date());
-        entity.setSectordebtratio(req.getSectordebtratio());
-        entity.setCompletionstatus(req.getCompletionstatus());
+        if("assembling".equals(checkDo.getQualitystatus())) {
+            entity.setSectordebtratio(req.getSectordebtratio());
+            entity.setCompletionstatus(req.getCompletionstatus());
+            entity.setCheckdate(new Date());
+        } else if("powering".equals(checkDo.getQualitystatus())) {
+            entity.setPtsectordebtratio(req.getPtSectordebtratio());
+            entity.setPtcompletionstatus(req.getPtCompletionstatus());
+            entity.setPtcheckdate(new Date());
+        }
 
         //只有保存才会进入下一步
         if("default".equals(req.getSaveBehavior())) {
@@ -312,9 +318,16 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
     private void updateCheckObjPower(SaveCheckRequest req, ZhcxLowaltitudeDebtfreeCheckDo checkDo) {
         ZhcxLowaltitudeDebtfreeCheckDo entity  = new ZhcxLowaltitudeDebtfreeCheckDo();
         entity.setId(req.getId());
-        entity.setPowercheckdate(new Date());
-        entity.setPowersectordebtratio(req.getSectordebtratio());
-        entity.setPowercompletionstatus(req.getCompletionstatus());
+
+        if("assembling".equals(checkDo.getElectromechanicalstatus())) {
+            entity.setPowersectordebtratio(req.getSectordebtratio());
+            entity.setPowercompletionstatus(req.getCompletionstatus());
+            entity.setPowercheckdate(new Date());
+        } else if("powering".equals(checkDo.getElectromechanicalstatus())) {
+            entity.setPtpowersectordebtratio(req.getPtSectordebtratio());
+            entity.setPtpowercompletionstatus(req.getPtCompletionstatus());
+            entity.setPtpowercheckdate(new Date());
+        }
 
         //只有保存才会进入下一步
         if("default".equals(req.getSaveBehavior())) {

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxLowaltitudeDebtfreeCheckDetailDo.java

@@ -160,4 +160,54 @@ public class ZhcxLowaltitudeDebtfreeCheckDetailDo extends BaseDo {
      */
     @TableField("MAINID")
     private String mainid;
+
+    /**
+     * 整改检查人id
+     */
+    @TableField("RECTIFYCHECKERID")
+    private String rectifycheckerid;
+
+    /**
+     * 整改检查人
+     */
+    @TableField("RECTIFYCHECKER")
+    private String rectifychecker;
+
+    /**
+     * 整改检查日期
+     */
+    @TableField("RECTIFYCHECKDATE")
+    private String rectifycheckdate;
+
+    /**
+     * 整改结果-送电
+     */
+    @TableField("POWERRECTIFYESULT")
+    private String powerrectifyesult;
+
+    /**
+     * 整改后图片-送电
+     */
+    @TableField("POWERAFTERRECTIFYPIC")
+    private String powerafterrectifypic;
+
+    /**
+     * 整改检查人id-送电
+     */
+    @TableField("POWERRECTIFYCHECKERID")
+    private String powerrectifycheckerid;
+
+    /**
+     * 整改检查人-送电
+     */
+    @TableField("POWERRECTIFYCHECKER")
+    private String powerrectifychecker;
+
+    /**
+     * 整改检查日期-送电
+     */
+    @TableField("POWERRECTIFYCHECKDATE")
+    private String powerrectifycheckdate;
+
+
 }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxLowaltitudeDebtfreeCheckDo.java

@@ -103,4 +103,39 @@ public class ZhcxLowaltitudeDebtfreeCheckDo extends BaseDo {
      */
     @TableField("POWERCHECKDATE")
     private Date powercheckdate;
+
+    /**
+     * 板块不欠债率-送电
+     */
+    @TableField("PTSECTORDEBTRATIO")
+    private String ptsectordebtratio;
+
+    /**
+     * 完成情况-送电
+     */
+    @TableField("PTCOMPLETIONSTATUS")
+    private String ptcompletionstatus;
+
+    /**
+     * 机电-检查日期-机电
+     */
+    @TableField("PTCHECKDATE")
+    private Date ptcheckdate;
+
+    /**
+     * 机电-板块不欠债率-送电
+     */
+    @TableField("PTPOWERSECTORDEBTRATIO")
+    private String ptpowersectordebtratio;
+    /**
+     * 机电-完成情况-送电
+     */
+    @TableField("PTPOWERCOMPLETIONSTATUS")
+    private String ptpowercompletionstatus;
+
+    /**
+     * 机电-检查日期-机电
+     */
+    @TableField("PTPOWERCHECKDATE")
+    private Date ptpowercheckdate;
 }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxLowaltitudeDebtfreeCheckMainDo.java

@@ -95,4 +95,15 @@ public class ZhcxLowaltitudeDebtfreeCheckMainDo extends BaseDo {
      */
     @TableField("POWERMACHINEDEBTRATIO")
     private String powermachinedebtratio;
+    /**
+     * 送电-机台不欠债率-机电
+     */
+    @TableField("PTMACHINEDEBTRATIO")
+    private String ptmachinedebtratio;
+
+    /**
+     * 送电-机台不欠债率-机电
+     */
+    @TableField("PTPOWERMACHINEDEBTRATIO")
+    private String ptpowermachinedebtratio;
 }

business-entity/src/main/java/com/rongwei/bsentity/dto/lowaltitude/SaveCheckRequest.java

@@ -25,11 +25,6 @@ public class SaveCheckRequest {
      */
     private String altitude;
 
-    /**
-     * 检查完成情况
-     */
-    private String completionstatus;
-
     /**
      * 计划吊装日期
      */
@@ -51,11 +46,26 @@ public class SaveCheckRequest {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date checkdate;
 
+    /**
+     * 检查完成情况
+     */
+    private String completionstatus;
+
     /**
      * 板块不欠债率
      */
     private String sectordebtratio;
 
+    /**
+     * 检查完成情况-送电
+     */
+    private String ptSectordebtratio;
+
+    /**
+     * 板块不欠债率-送电
+     */
+    private String ptCompletionstatus;
+
     /**
      * 质量状态
      */