低空不欠债改造

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxLowaltitudeDebtfreeCheckDetailPowerDao.java

@@ -0,0 +1,73 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailPowerDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDo;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckMainDo;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 低空不欠债检查-检查内容-机电 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+public interface ZhcxLowaltitudeDebtfreeCheckDetailPowerDao extends BaseMapper<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> {
+
+    @Insert("INSERT " +
+            " INTO " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL_POWER( " +
+            " ID, " +
+            " CHECKID, " +
+            " MAINID, " +
+            " CLASSIFY, " +
+            " PART, " +
+            " CONTENT, " +
+            " RESUME, " +
+            " STANDART, " +
+            " SQUNO, " +
+            " DELETED) " +
+            " " +
+            "SELECT " +
+            " guid(), " +
+            " #{id}, " +
+            " #{mainid}, " +
+            " CLASSIFY, " +
+            " PART, " +
+            " CONTENT, " +
+            " RESUME, " +
+            " STANDART, " +
+            " SQUNO, " +
+            " '0' " +
+            "FROM " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_BASE_INFO_DETAIL " +
+            "WHERE " +
+            " PID = #{standardlibid} " +
+            " AND STATUS = '有效' " +
+            " AND DELETED = '0'")
+    void saveByCheck(ZhcxLowaltitudeDebtfreeCheckDo check);
+
+    @Select("SELECT " +
+            " zldcd.* " +
+            "FROM " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL_POWER zldcd " +
+            "WHERE " +
+            " zldcd.DELETED = '0' " +
+            " AND  " +
+            " EXISTS ( " +
+            " SELECT " +
+            "  * " +
+            " FROM " +
+            "  ZHCX_LOWALTITUDE_DEBTFREE_CHECK_MAIN zldcm " +
+            " WHERE " +
+            "  zldcm.ID = zldcd.MAINID " +
+            "  AND zldcm.PROJECTID = #{projectid} " +
+            "  AND zldcm.MACHINENOID = #{machinenoid} " +
+            "  AND zldcm.DELETED = '0')")
+    List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> getList(ZhcxLowaltitudeDebtfreeCheckMainDo main);
+}

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 低空不欠债检查-分包商-机电 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+public interface ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao extends BaseMapper<ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo> {
+
+}

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

@@ -0,0 +1,33 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailPowerDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.dto.lowaltitude.SaveCheckDetailDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 低空不欠债检查-检查内容-机电 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+public interface ZhcxLowaltitudeDebtfreeCheckDetailPowerService extends IService<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> {
+
+    /**
+     * 保存检查明细
+     *
+     * @param dto
+     */
+    void saveCheckDetail(SaveCheckDetailDto dto);
+
+    /**
+     * 获取机台不欠债率
+     *
+     * @param projectId
+     * @return
+     */
+    List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> getListByMainId(String projectId, String machineId);
+}

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

@@ -32,9 +32,16 @@ public interface ZhcxLowaltitudeDebtfreeCheckMainService extends IService<ZhcxLo
     void saveMain(SaveCheckRequest req, String mainId);
 
     /**
-     * 更新板块不欠债率
+     * 更新机台不欠债率
      *
      * @param mainId
      */
     void updateMachineById(String projectId, String machineId, String mainId);
+
+    /**
+     * 更新机台不欠债率
+     *
+     * @param mainId
+     */
+    void updatePowerMachineById(String projectId, String machineId, String mainId);
 }

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

@@ -0,0 +1,25 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Set;
+
+/**
+ * <p>
+ * 低空不欠债检查-分包商-机电 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+public interface ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerService extends IService<ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo> {
+
+    /**
+     * 保存分包商
+     *
+     * @param checkId
+     * @param plate
+     */
+    void saveSubcontractor(String checkId, String plate, Set<String> classfySet);
+}

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

@@ -0,0 +1,58 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailPowerDo;
+import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckDetailPowerDao;
+import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckDetailPowerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDo;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckMainDo;
+import com.rongwei.bsentity.dto.lowaltitude.SaveCheckDetailDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 低空不欠债检查-检查内容-机电 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+@Service
+public class ZhcxLowaltitudeDebtfreeCheckDetailPowerServiceImpl extends ServiceImpl<ZhcxLowaltitudeDebtfreeCheckDetailPowerDao, ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> implements ZhcxLowaltitudeDebtfreeCheckDetailPowerService {
+
+    @Autowired
+    private ZhcxLowaltitudeDebtfreeCheckDetailPowerDao dao;
+
+    /**
+     * 保存检查明细
+     *
+     * @param dto
+     */
+    @Override
+    public void saveCheckDetail(SaveCheckDetailDto dto) {
+
+        ZhcxLowaltitudeDebtfreeCheckDo checkDo = new ZhcxLowaltitudeDebtfreeCheckDo();
+        checkDo.setMainid(dto.getMainId());
+        checkDo.setStandardlibid(dto.getBaseId());
+        checkDo.setId(dto.getCheckId());
+        dao.saveByCheck(checkDo);
+
+    }
+
+    /**
+     * 获取机台不欠债率
+     *
+     * @param projectId
+     * @return
+     */
+    @Override
+    public List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> getListByMainId(String projectId, String machineId) {
+        ZhcxLowaltitudeDebtfreeCheckMainDo entity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
+        entity.setProjectid(projectId);
+        entity.setMachinenoid(machineId);
+        return dao.getList(entity);
+    }
+}

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

@@ -3,9 +3,10 @@ package com.rongwei.bscommon.sys.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 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.bscommon.sys.service.ZhcxProjectManageService;
 import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailDo;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailPowerDo;
 import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckMainDo;
 import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckMainDao;
 import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckMainService;
@@ -33,6 +34,9 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
     @Autowired
     private ZhcxLowaltitudeDebtfreeCheckDetailService lowaltitudeDebtfreeCheckDetailService;
 
+    @Autowired
+    private ZhcxLowaltitudeDebtfreeCheckDetailPowerService lowaltitudeDebtfreeCheckDetailPowerService;
+
     /**
      * 保存主表数据
      *
@@ -95,7 +99,7 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
     }
 
     /**
-     * 更新板块不欠债率
+     * 更新机台不欠债率
      *
      * @param mainId
      */
@@ -109,6 +113,32 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         updateById(queryEntity);
     }
 
+    /**
+     * 更新机台不欠债率
+     *
+     * @param mainId
+     */
+    @Override
+    public void updatePowerMachineById(String projectId, String machineId, String mainId) {
+        final String machineDebtRatio = calPowerMachineDebtRatio(projectId, machineId);
+
+        ZhcxLowaltitudeDebtfreeCheckMainDo queryEntity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
+        queryEntity.setId(mainId);
+        queryEntity.setPowermachinedebtratio(machineDebtRatio);
+        updateById(queryEntity);
+    }
+
+    /**
+     * 计算机台不欠债率
+     *
+     * @param projectId
+     * @return
+     */
+    private String calPowerMachineDebtRatio(String projectId, String machineId) {
+        final List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> list = lowaltitudeDebtfreeCheckDetailPowerService.getListByMainId(projectId, machineId);
+        return calPowerMachineDebtRatio(list);
+    }
+
     /**
      * 计算机台不欠债率
      *
@@ -120,6 +150,41 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         return calMachineDebtRatio(list);
     }
 
+    /**
+     * 计算机台不欠债率
+     *
+     * @param list
+     * @return
+     */
+    private String calPowerMachineDebtRatio(List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> list) {
+        if(ObjectUtil.isEmpty(list)) {
+            return "0.00%";
+        }
+
+        int completeCount = 0;
+        int totalCount = 0;
+        for (ZhcxLowaltitudeDebtfreeCheckDetailPowerDo row : list) {
+            if ("✓".equals(row.getCheckresult()) || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))) {
+                completeCount++;
+            }
+
+            if (!"/".equals(row.getCheckresult()) && !"/".equals(row.getRectifyesult())) {
+                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

@@ -36,12 +36,18 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
     @Autowired
     private ZhcxProjectManageService projectManageService;
     @Autowired
-    private ZhcxLowaltitudeDebtfreeCheckDetailService zhcxLowaltitudeDebtfreeCheckDetailService;
+    private ZhcxLowaltitudeDebtfreeCheckDetailService lowaltitudeDebtfreeCheckDetailService;
+
+    @Autowired
+    private ZhcxLowaltitudeDebtfreeCheckDetailPowerService lowaltitudeDebtfreeCheckDetailPowerService;
 
     @Autowired
     private ZhcxLowaltitudeDebtfreeBaseInfoDetailService zhcxLowaltitudeDebtfreeBaseInfoDetailService;
     @Autowired
-    private ZhcxLowaltitudeDebtfreeCheckSubcontractorService zhcxLowaltitudeDebtfreeCheckSubcontractorService;
+    private ZhcxLowaltitudeDebtfreeCheckSubcontractorService lowaltitudeDebtfreeCheckSubcontractorService;
+
+    @Autowired
+    private ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerService lowaltitudeDebtfreeCheckSubcontractorPowerService;
 
     @Autowired
     private ZhcxLowaltitudeDebtfreeBaseInfoService zhcxLowaltitudeDebtfreeBaseInfoService;
@@ -101,8 +107,10 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
             newRecord.setDeleted("0");
             newRecord.setId(UUID.randomUUID().toString());
             newRecord.setSectordebtratio("0.00%");
+            newRecord.setPowersectordebtratio("0.00%");
             String completionStatus = "0/" + baseInfoDetails.size();
             newRecord.setCompletionstatus(completionStatus);
+            newRecord.setPowercompletionstatus(completionStatus);
             newRecord.setQualitystatus("assembling");
             newRecord.setElectromechanicalstatus("assembling");
 
@@ -115,7 +123,10 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
             }
 
             //分包商
-            zhcxLowaltitudeDebtfreeCheckSubcontractorService.saveSubcontractor(newRecord.getId(), plate, classfySet);
+            lowaltitudeDebtfreeCheckSubcontractorService.saveSubcontractor(newRecord.getId(), plate, classfySet);
+
+            //分包商机电
+            lowaltitudeDebtfreeCheckSubcontractorPowerService.saveSubcontractor(newRecord.getId(), plate, classfySet);
 
             // 明细
             SaveCheckDetailDto saveCheckDetailDto = SaveCheckDetailDto.builder()
@@ -123,11 +134,14 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
                     .mainId(mainId)
                     .checkId(newRecord.getId())
                     .build();
-            zhcxLowaltitudeDebtfreeCheckDetailService.saveCheckDetail(saveCheckDetailDto);
+            lowaltitudeDebtfreeCheckDetailService.saveCheckDetail(saveCheckDetailDto);
+            //明细-机电
+            lowaltitudeDebtfreeCheckDetailPowerService.saveCheckDetail(saveCheckDetailDto);
         }
 
         //重新计算机台不欠债率
         lowaltitudeDebtfreeCheckMainService.updateMachineById(req.getProjectId(), req.getMachineNoId(), mainId);
+        lowaltitudeDebtfreeCheckMainService.updatePowerMachineById(req.getProjectId(), req.getMachineNoId(), mainId);
 
     }
 

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

@@ -0,0 +1,53 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo;
+import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao;
+import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * <p>
+ * 低空不欠债检查-分包商-机电 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+@Service
+public class ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerServiceImpl extends ServiceImpl<ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao, ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo> implements ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerService {
+
+    /**
+     * 保存分包商
+     *
+     * @param checkId
+     * @param plate
+     */
+    @Override
+    public void saveSubcontractor(String checkId, String plate, Set<String> classfySet) {
+        if(ObjectUtil.isEmpty(classfySet)) {
+            return ;
+        }
+
+        // 根据板块类型新增明细数据到 ZHCX_LOWALTITUDE_DEBTFREE_CHECK_SUBCONTRACTOR_POWER 表
+        List<ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo> detailRecords = new ArrayList<>();
+        for (String classify : classfySet) {
+            ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo record = new ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo()
+                    .setCheckid(checkId)
+                    .setClassify(classify)
+                    .setId(UUID.randomUUID().toString());
+
+            record.setDeleted("0"); // 手动设置 deleted 字段
+            detailRecords.add(record);
+        }
+
+        // 批量保存明细记录
+        saveBatch(detailRecords);
+    }
+}

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

@@ -0,0 +1,229 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 低空不欠债检查-检查内容-机电
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL_POWER")
+public class ZhcxLowaltitudeDebtfreeCheckDetailPowerDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableField("ID")
+    private String id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 主表id
+     */
+    @TableField("CHECKID")
+    private String checkid;
+    /**
+     * 序号
+     */
+    @TableField("SQUNO")
+    private String squno;
+    /**
+     * 分类
+     */
+    @TableField("CLASSIFY")
+    private String classify;
+    /**
+     * 部位
+     */
+    @TableField("PART")
+    private String part;
+    /**
+     * 内容
+     */
+    @TableField("CONTENT")
+    private String content;
+    /**
+     * 简述
+     */
+    @TableField("RESUME")
+    private String resume;
+    /**
+     * 标准
+     */
+    @TableField("STANDART")
+    private String standart;
+    /**
+     * 检查结果
+     */
+    @TableField("CHECKRESULT")
+    private String checkresult;
+    /**
+     * 问题类型
+     */
+    @TableField("PROBLEMTYPE")
+    private String problemtype;
+    /**
+     * 现场图片
+     */
+    @TableField("SITEPIC")
+    private String sitepic;
+    /**
+     * 检查人id
+     */
+    @TableField("CHECKERID")
+    private String checkerid;
+    /**
+     * 检查人
+     */
+    @TableField("CHECKER")
+    private String checker;
+    /**
+     * 检查日期
+     */
+    @TableField("CHECKDATE")
+    private Date checkdate;
+    /**
+     * 整改结果
+     */
+    @TableField("RECTIFYESULT")
+    private String rectifyesult;
+    /**
+     * 整改后图片
+     */
+    @TableField("AFTERRECTIFYPIC")
+    private String afterrectifypic;
+    /**
+     * 整改检查人id
+     */
+    @TableField("RECTIFYCHECKERID")
+    private String rectifycheckerid;
+    /**
+     * 整改检查人
+     */
+    @TableField("RECTIFYCHECKER")
+    private String rectifychecker;
+    /**
+     * 整改检查日期
+     */
+    @TableField("RECTIFYCHECKDATE")
+    private Date 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 Date powerrectifycheckdate;
+    /**
+     * 整改结果-最终
+     */
+    @TableField("FINALRECTIFYESULT")
+    private String finalrectifyesult;
+    /**
+     * 整改后图片-最终
+     */
+    @TableField("FINALAFTERRECTIFYPIC")
+    private String finalafterrectifypic;
+    /**
+     * 整改检查人id-最终
+     */
+    @TableField("FINALRECTIFYCHECKERID")
+    private String finalrectifycheckerid;
+    /**
+     * 整改检查人-最终
+     */
+    @TableField("FINALRECTIFYCHECKER")
+    private String finalrectifychecker;
+    /**
+     * 整改检查日期-最终
+     */
+    @TableField("FINALRECTIFYCHECKDATE")
+    private Date finalrectifycheckdate;
+    /**
+     * 一级部门id
+     */
+    @TableField("FIRSTORGID")
+    private String firstorgid;
+    /**
+     * 一级部门
+     */
+    @TableField("FIRSTORGNAME")
+    private String firstorgname;
+    /**
+     * 二级部门id
+     */
+    @TableField("SECONDORGID")
+    private String secondorgid;
+    /**
+     * 二级部门
+     */
+    @TableField("SECONDORGNAME")
+    private String secondorgname;
+    /**
+     * 分包商id
+     */
+    @TableField("SUBCONTRACTID")
+    private String subcontractid;
+    /**
+     * 分包商简称
+     */
+    @TableField("SUBCONTRACTENAME")
+    private String subcontractename;
+    /**
+     * 分包商名称
+     */
+    @TableField("SUBCONTRACTNAME")
+    private String subcontractname;
+    /**
+     * 标准库明细id
+     */
+    @TableField("STANDARDLIBDETAILID")
+    private String standardlibdetailid;
+    /**
+     * 主表mainid
+     */
+    @TableField("MAINID")
+    private String mainid;
+
+
+}

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

@@ -86,4 +86,15 @@ public class ZhcxLowaltitudeDebtfreeCheckDo extends BaseDo {
      */
     @TableField("ELECTROMECHANICALSTATUS")
     private String electromechanicalstatus;
+
+    /**
+     * 板块不欠债率
+     */
+    @TableField("POWERSECTORDEBTRATIO")
+    private String powersectordebtratio;
+    /**
+     * 完成情况
+     */
+    @TableField("POWERCOMPLETIONSTATUS")
+    private String powercompletionstatus;
 }

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

@@ -90,5 +90,9 @@ public class ZhcxLowaltitudeDebtfreeCheckMainDo extends BaseDo {
     @TableField("ALTITUDE")
     private String altitude;
 
-
+    /**
+     * 机台不欠债率-机电
+     */
+    @TableField("POWERMACHINEDEBTRATIO")
+    private String powermachinedebtratio;
 }

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

@@ -0,0 +1,74 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 低空不欠债检查-分包商-机电
+ * </p>
+ *
+ * @author wm
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("ZHCX_LOWALTITUDE_DEBTFREE_CHECK_SUBCONTRACTOR_POWER")
+public class ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableField("ID")
+    private String id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 主表id
+     */
+    @TableField("CHECKID")
+    private String checkid;
+    /**
+     * 分类
+     */
+    @TableField("CLASSIFY")
+    private String classify;
+    /**
+     * 分包商id
+     */
+    @TableField("SUBCONTRACTID")
+    private String subcontractid;
+    /**
+     * 分包商简称
+     */
+    @TableField("SUBCONTRACTENAME")
+    private String subcontractename;
+    /**
+     * 分包商名称
+     */
+    @TableField("SUBCONTRACTNAME")
+    private String subcontractname;
+    /**
+     * 主表mainid
+     */
+    @TableField("MAINID")
+    private String mainid;
+
+
+}