低空不欠债改造

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

@@ -5,6 +5,7 @@ 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.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -70,4 +71,109 @@ public interface ZhcxLowaltitudeDebtfreeCheckDetailPowerDao extends BaseMapper<Z
             "  AND zldcm.MACHINENOID = #{machinenoid} " +
             "  AND zldcm.DELETED = '0')")
     List<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> getList(ZhcxLowaltitudeDebtfreeCheckMainDo main);
+
+    @Insert("INSERT " +
+            " INTO " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL_POWER (ID, " +
+            " TENANTID, " +
+            " ROPTION, " +
+            " DELETED, " +
+            " REMARK, " +
+            " CREATEUSERID, " +
+            " CREATEUSERNAME, " +
+            " CREATEDATE, " +
+            " MODIFYUSERID, " +
+            " MODIFYUSERNAME, " +
+            " MODIFYDATE, " +
+            " CHECKID, " +
+            " SQUNO, " +
+            " CLASSIFY, " +
+            " PART, " +
+            " CONTENT, " +
+            " RESUME, " +
+            " STANDART, " +
+            " CHECKRESULT, " +
+            " PROBLEMTYPE, " +
+            " SITEPIC, " +
+            " CHECKERID, " +
+            " CHECKER, " +
+            " CHECKDATE, " +
+            " RECTIFYESULT, " +
+            " AFTERRECTIFYPIC, " +
+            " RECTIFYCHECKERID, " +
+            " RECTIFYCHECKER, " +
+            " RECTIFYCHECKDATE, " +
+            " POWERRECTIFYESULT, " +
+            " POWERAFTERRECTIFYPIC, " +
+            " POWERRECTIFYCHECKERID, " +
+            " POWERRECTIFYCHECKER, " +
+            " POWERRECTIFYCHECKDATE, " +
+            " FINALRECTIFYESULT, " +
+            " FINALAFTERRECTIFYPIC, " +
+            " FINALRECTIFYCHECKERID, " +
+            " FINALRECTIFYCHECKER, " +
+            " FINALRECTIFYCHECKDATE, " +
+            " FIRSTORGID, " +
+            " FIRSTORGNAME, " +
+            " SECONDORGID, " +
+            " SECONDORGNAME, " +
+            " SUBCONTRACTID, " +
+            " SUBCONTRACTENAME, " +
+            " SUBCONTRACTNAME, " +
+            " STANDARDLIBDETAILID, " +
+            " MAINID) " +
+            "SELECT " +
+            " ID, " +
+            " TENANTID, " +
+            " ROPTION, " +
+            " DELETED, " +
+            " REMARK, " +
+            " CREATEUSERID, " +
+            " CREATEUSERNAME, " +
+            " CREATEDATE, " +
+            " MODIFYUSERID, " +
+            " MODIFYUSERNAME, " +
+            " MODIFYDATE, " +
+            " CHECKID, " +
+            " SQUNO, " +
+            " CLASSIFY, " +
+            " PART, " +
+            " CONTENT, " +
+            " RESUME, " +
+            " STANDART, " +
+            " CHECKRESULT, " +
+            " PROBLEMTYPE, " +
+            " SITEPIC, " +
+            " CHECKERID, " +
+            " CHECKER, " +
+            " CHECKDATE, " +
+            " RECTIFYESULT, " +
+            " AFTERRECTIFYPIC, " +
+            " RECTIFYCHECKERID, " +
+            " RECTIFYCHECKER, " +
+            " RECTIFYCHECKDATE, " +
+            " POWERRECTIFYESULT, " +
+            " POWERAFTERRECTIFYPIC, " +
+            " POWERRECTIFYCHECKERID, " +
+            " POWERRECTIFYCHECKER, " +
+            " POWERRECTIFYCHECKDATE, " +
+            " FINALRECTIFYESULT, " +
+            " FINALAFTERRECTIFYPIC, " +
+            " FINALRECTIFYCHECKERID, " +
+            " FINALRECTIFYCHECKER, " +
+            " FINALRECTIFYCHECKDATE, " +
+            " FIRSTORGID, " +
+            " FIRSTORGNAME, " +
+            " SECONDORGID, " +
+            " SECONDORGNAME, " +
+            " SUBCONTRACTID, " +
+            " SUBCONTRACTENAME, " +
+            " SUBCONTRACTNAME, " +
+            " STANDARDLIBDETAILID, " +
+            " MAINID " +
+            "FROM " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL " +
+            "WHERE " +
+            " CHECKID = #{checkId}")
+    void copyByCheckId(@Param("checkId") String checkId);
 }

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

@@ -2,6 +2,8 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +15,45 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao extends BaseMapper<ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo> {
 
+    @Insert("INSERT " +
+            " INTO " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_CHECK_SUBCONTRACTOR_POWER (ID, " +
+            " TENANTID, " +
+            " ROPTION, " +
+            " DELETED, " +
+            " REMARK, " +
+            " CREATEUSERID, " +
+            " CREATEUSERNAME, " +
+            " CREATEDATE, " +
+            " MODIFYUSERID, " +
+            " MODIFYUSERNAME, " +
+            " MODIFYDATE, " +
+            " CHECKID, " +
+            " CLASSIFY, " +
+            " SUBCONTRACTID, " +
+            " SUBCONTRACTENAME, " +
+            " SUBCONTRACTNAME, " +
+            " MAINID) " +
+            "SELECT " +
+            " TENANTID, " +
+            " ROPTION, " +
+            " DELETED, " +
+            " REMARK, " +
+            " CREATEUSERID, " +
+            " CREATEUSERNAME, " +
+            " CREATEDATE, " +
+            " MODIFYUSERID, " +
+            " MODIFYUSERNAME, " +
+            " MODIFYDATE, " +
+            " CHECKID, " +
+            " CLASSIFY, " +
+            " SUBCONTRACTID, " +
+            " SUBCONTRACTENAME, " +
+            " SUBCONTRACTNAME, " +
+            " MAINID " +
+            "FROM " +
+            " ZHCX_LOWALTITUDE_DEBTFREE_CHECK_SUBCONTRACTOR " +
+            "WHERE " +
+            " CHECKID = #{checkId}")
+    void copyByCheckId(@Param("checkId") String checkId);
 }

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

@@ -19,9 +19,9 @@ public interface ZhcxLowaltitudeDebtfreeCheckDetailPowerService extends IService
     /**
      * 保存检查明细
      *
-     * @param dto
+     * @param checkId
      */
-    void saveCheckDetail(SaveCheckDetailDto dto);
+    void copyByCheckId(String checkId);
 
     /**
      * 获取机台不欠债率

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

@@ -45,6 +45,13 @@ public interface ZhcxLowaltitudeDebtfreeCheckMainService extends IService<ZhcxLo
      */
     void updateMachineById(String projectId, String machineId, String mainId);
 
+    /**
+     * 统计机台不欠债率
+     *
+     * @param mainId
+     */
+    void updateMachineById(String mainId);
+
     /**
      * 更新机台不欠债率
      *

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.service;
 import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.dto.lowaltitude.AddHoistingPlanDateRequest;
+import com.rongwei.bsentity.dto.lowaltitude.DeleteCheckRequest;
 import com.rongwei.bsentity.dto.lowaltitude.SaveCheckRequest;
 
 import java.util.Map;
@@ -26,6 +27,13 @@ public interface ZhcxLowaltitudeDebtfreeCheckService extends IService<ZhcxLowalt
 
     void liftingBatchAdd(Map<String, Object> map);
 
+    /**
+     * 删除
+     *
+     * @param req
+     */
+    void delete(DeleteCheckRequest req);
+
     /**
      * 修改检查
      *

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

@@ -19,7 +19,6 @@ public interface ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerService extends I
      * 保存分包商
      *
      * @param checkId
-     * @param plate
      */
-    void saveSubcontractor(String checkId, String plate, Set<String> classfySet);
+    void copyByCheckId(String checkId);
 }

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

@@ -29,16 +29,11 @@ public class ZhcxLowaltitudeDebtfreeCheckDetailPowerServiceImpl extends ServiceI
     /**
      * 保存检查明细
      *
-     * @param dto
+     * @param checkId
      */
     @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);
+    public void copyByCheckId(String checkId) {
+        dao.copyByCheckId(checkId);
 
     }
 

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

@@ -129,6 +129,24 @@ public class ZhcxLowaltitudeDebtfreeCheckMainServiceImpl extends ServiceImpl<Zhc
         updateById(queryEntity);
     }
 
+    /**
+     * 统计机台不欠债率
+     *
+     * @param mainId
+     */
+    @Override
+    public void updateMachineById(String mainId) {
+        final LambdaQueryWrapper<ZhcxLowaltitudeDebtfreeCheckDetailDo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ZhcxLowaltitudeDebtfreeCheckDetailDo::getMainid, mainId);
+        final List<ZhcxLowaltitudeDebtfreeCheckDetailDo> list = lowaltitudeDebtfreeCheckDetailService.list(queryWrapper);
+        final String machineDebtRatio = calMachineDebtRatio(list);
+
+        ZhcxLowaltitudeDebtfreeCheckMainDo queryEntity = new ZhcxLowaltitudeDebtfreeCheckMainDo();
+        queryEntity.setId(mainId);
+        queryEntity.setMachinedebtratio(machineDebtRatio);
+        updateById(queryEntity);
+    }
+
     /**
      * 更新机台不欠债率
      *

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ConstantUtil;
@@ -11,6 +12,7 @@ import com.rongwei.bsentity.domain.*;
 import com.rongwei.bscommon.sys.dao.ZhcxLowaltitudeDebtfreeCheckDao;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.dto.lowaltitude.AddHoistingPlanDateRequest;
+import com.rongwei.bsentity.dto.lowaltitude.DeleteCheckRequest;
 import com.rongwei.bsentity.dto.lowaltitude.SaveCheckDetailDto;
 import com.rongwei.bsentity.dto.lowaltitude.SaveCheckRequest;
 import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
@@ -124,9 +126,8 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
 
             //分包商
             lowaltitudeDebtfreeCheckSubcontractorService.saveSubcontractor(newRecord.getId(), plate, classfySet);
-
             //分包商机电
-            lowaltitudeDebtfreeCheckSubcontractorPowerService.saveSubcontractor(newRecord.getId(), plate, classfySet);
+            lowaltitudeDebtfreeCheckSubcontractorPowerService.copyByCheckId(newRecord.getId());
 
             // 明细
             SaveCheckDetailDto saveCheckDetailDto = SaveCheckDetailDto.builder()
@@ -136,7 +137,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
                     .build();
             lowaltitudeDebtfreeCheckDetailService.saveCheckDetail(saveCheckDetailDto);
             //明细-机电
-            lowaltitudeDebtfreeCheckDetailPowerService.saveCheckDetail(saveCheckDetailDto);
+            lowaltitudeDebtfreeCheckDetailPowerService.copyByCheckId(newRecord.getId());
         }
 
         //重新计算机台不欠债率
@@ -180,6 +181,42 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
         }
     }
 
+    /**
+     * 删除
+     *
+     * @param req
+     */
+    @Override
+    public void delete(DeleteCheckRequest req) {
+        final ZhcxLowaltitudeDebtfreeCheckDo check = getById(req.getId());
+
+        //删除check
+        removeById(req.getId());
+
+        //删除明细
+        LambdaUpdateWrapper<ZhcxLowaltitudeDebtfreeCheckDetailDo> delDetailWrapper = Wrappers.lambdaUpdate();
+        delDetailWrapper.eq(ZhcxLowaltitudeDebtfreeCheckDetailDo::getCheckerid, req.getId());
+        lowaltitudeDebtfreeCheckDetailService.remove(delDetailWrapper);
+
+        //删除明细机电
+        LambdaUpdateWrapper<ZhcxLowaltitudeDebtfreeCheckDetailPowerDo> delDetailPowerWrapper = Wrappers.lambdaUpdate();
+        delDetailPowerWrapper.eq(ZhcxLowaltitudeDebtfreeCheckDetailPowerDo::getCheckerid, req.getId());
+        lowaltitudeDebtfreeCheckDetailPowerService.remove(delDetailPowerWrapper);
+
+        //主表
+        //主表下不存在check，需要删除主表数据
+        final LambdaQueryWrapper<ZhcxLowaltitudeDebtfreeCheckDo> query = Wrappers.lambdaQuery();
+        query.eq(ZhcxLowaltitudeDebtfreeCheckDo::getMainid, check.getId());
+        final int count = count(query);
+        if(count == 0) {
+            lowaltitudeDebtfreeCheckMainService.removeById(check.getId());
+        }
+        //存在时需要重新计算机台不欠债率
+        else {
+            lowaltitudeDebtfreeCheckMainService.updateMachineById(check.getMainid());
+        }
+    }
+
     /**
      * 修改检查
      *

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

@@ -1,10 +1,12 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDo;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -23,31 +25,16 @@ import java.util.UUID;
 @Service
 public class ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerServiceImpl extends ServiceImpl<ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao, ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDo> implements ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerService {
 
+    @Autowired
+    private ZhcxLowaltitudeDebtfreeCheckSubcontractorPowerDao dao;
+
     /**
      * 保存分包商
      *
      * @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);
+    public void copyByCheckId(String checkId) {
+        dao.copyByCheckId(checkId);
     }
 }

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

@@ -0,0 +1,15 @@
+package com.rongwei.bsentity.dto.lowaltitude;
+
+import lombok.*;
+
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class DeleteCheckRequest {
+    /**
+     * 检查id
+     */
+    private String id;
+}

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

@@ -3,6 +3,7 @@ package com.rongwei.bsserver.controller;
 import com.rongwei.bscommon.sys.service.DebtfreeService;
 import com.rongwei.bscommon.sys.service.ZhcxLowaltitudeDebtfreeCheckService;
 import com.rongwei.bsentity.dto.lowaltitude.AddHoistingPlanDateRequest;
+import com.rongwei.bsentity.dto.lowaltitude.DeleteCheckRequest;
 import com.rongwei.bsentity.dto.lowaltitude.SaveCheckRequest;
 import com.rongwei.rwcommon.base.R;
 import lombok.extern.slf4j.Slf4j;
@@ -71,6 +72,19 @@ public class DebtfreeController {
         return R.ok();
     }
 
+    /**
+     * 删除
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/del")
+    @ResponseBody
+    public R addHoistingPlanDate(@RequestBody DeleteCheckRequest req) {
+        zhcxLowaltitudeDebtfreeCheckService.delete(req);
+        return R.ok();
+    }
+
 
 
 }