低空不欠债

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

@@ -1,7 +1,12 @@
 package com.rongwei.bscommon.sys.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDetailDo;
 import com.rongwei.bsentity.domain.ZhcxLowaltitudeDebtfreeCheckDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZhcxLowaltitudeDebtfreeCheckDao extends BaseMapper<ZhcxLowaltitudeDebtfreeCheckDo> {
 
+
+    @Select("SELECT\n" +
+            "    *\n" +
+            "    FROM\n" +
+            "    ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL cd\n" +
+            "    WHERE\n" +
+            "    EXISTS (\n" +
+            "            SELECT\n" +
+            "      *\n" +
+            "              FROM\n" +
+            "              ZHCX_LOWALTITUDE_DEBTFREE_CHECK\n" +
+            "              WHERE\n" +
+            "              cd.CHECKID = ID AND DELETED = '0' AND PROJECTID = #{projectid} AND MACHINENO = #{machineno})  and cd.DELETED = '0'")
+    List<ZhcxLowaltitudeDebtfreeCheckDetailDo> getListHistory(ZhcxLowaltitudeDebtfreeCheckDo entity);
+
 }

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wm
- * @since 2024-10-29
+ * @since 2024-11-04
  */
 public interface ZhcxLowaltitudeDebtfreeCheckSubcontractorDao extends BaseMapper<ZhcxLowaltitudeDebtfreeCheckSubcontractorDo> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wm
- * @since 2024-10-29
+ * @since 2024-11-04
  */
 public interface ZhcxLowaltitudeDebtfreeCheckSubcontractorService extends IService<ZhcxLowaltitudeDebtfreeCheckSubcontractorDo> {
 

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

@@ -1,5 +1,8 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+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.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -44,6 +47,10 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
 //    private ZhcxLowaltitudeDebtfreeBaseInfoDo ZhcxLowaltitudeDebtfreeBaseInfo;
     @Autowired
     private ZhcxLowaltitudeDebtfreeBaseInfoService zhcxLowaltitudeDebtfreeBaseInfoService;
+
+    @Autowired
+    private ZhcxLowaltitudeDebtfreeCheckDao dao;
+
 //    @Autowired
 //    private ZhcxLowaltitudeDebtfreeBaseInfoDetailDo zhcxLowaltitudeDebtfreeBaseInfoDetailDo;
     private static final HashMap<String, List<String>> PLATE_CLASSIFICATION_MAP = new HashMap<String, List<String>>() {{
@@ -74,10 +81,17 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
                 AddHoistingPlanDateRequest req = new AddHoistingPlanDateRequest();
 
                 // 从 record 中获取各个字段，并赋值给 req 对象
-                req.setProjectId((String) record.get("projectId"));
-                req.setMachineNoId((String) record.get("machineNoId"));
-                req.setHoistingPlanDate((Date) record.get("hoistingPlanDate"));
-                req.setMachineNo((String) record.get("MachineNo"));
+                req.setProjectId((String) record.get("PROJECTID"));
+                req.setMachineNoId((String) record.get("MACHINENOID"));
+                if(ObjectUtil.isNotNull(record.get("HOISTINGPLANDATE"))) {
+                    final DateTime dateTime = DateUtil.parse(record.get("HOISTINGPLANDATE").toString(), "yyyy-MM-dd HH:mm:ss");
+                    req.setHoistingPlanDate(dateTime);
+                }
+
+                req.setMachineNo((String) record.get("MACHINENO"));
+                req.setAltitude((String) record.get("ALTITUDE"));
+
+
                 addHoistingPlanDate(req);
             }
         }
@@ -129,8 +143,13 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
                 // 创建新的记录
                 ZhcxLowaltitudeDebtfreeCheckDo newRecord = new ZhcxLowaltitudeDebtfreeCheckDo();
                 newRecord.setProjectid(req.getProjectId());
+                newRecord.setProjectcode(project.getProjectCode());
+                newRecord.setProjectname(project.getProjectName());
+                newRecord.setProjectename(project.getProjectEname());
                 newRecord.setMachinenoid(req.getMachineNoId());
                 newRecord.setMachineno(req.getMachineNo());
+                newRecord.setHoistingplandate(req.getHoistingPlanDate());
+
                 newRecord.setPlate(plate);
                 newRecord.setDeleted("0");
                 newRecord.setFinalassembledate(req.getHoistingPlanDate());
@@ -145,14 +164,17 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
 
 
 
-                QueryWrapper<ZhcxLowaltitudeDebtfreeCheckDetailDo> wrapper = new QueryWrapper<>();
-                wrapper.eq("cd.DELETED", "0")
-                        .exists("SELECT * FROM ZHCX_LOWALTITUDE_DEBTFREE_CHECK WHERE cd.CHECKID = ID AND DELETED = '0' AND PROJECTID = " + req.getProjectId() + " AND MACHINENO = " + req.getMachineNo());
-                List<ZhcxLowaltitudeDebtfreeCheckDetailDo> baseInfoDetails1 = zhcxLowaltitudeDebtfreeCheckDetailService.list(wrapper);
-
-                int completeCount = 0;
+//                QueryWrapper<ZhcxLowaltitudeDebtfreeCheckDetailDo> wrapper = new QueryWrapper<>();
+//                wrapper.eq("ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL.DELETED", "0")
+//                        .exists("SELECT * FROM ZHCX_LOWALTITUDE_DEBTFREE_CHECK WHERE ZHCX_LOWALTITUDE_DEBTFREE_CHECK_DETAIL.CHECKID = ID AND DELETED = '0' AND PROJECTID = " + req.getProjectId() + " AND MACHINENO = " + req.getMachineNo());
+//                List<ZhcxLowaltitudeDebtfreeCheckDetailDo> baseInfoDetails1 = zhcxLowaltitudeDebtfreeCheckDetailService.list(wrapper);
 
+                ZhcxLowaltitudeDebtfreeCheckDo queryEntity  = new ZhcxLowaltitudeDebtfreeCheckDo();
+                queryEntity.setProjectid(req.getProjectId());
+                queryEntity.setMachineno(req.getMachineNo());
+                List<ZhcxLowaltitudeDebtfreeCheckDetailDo> baseInfoDetails1 = dao.getListHistory(queryEntity);
 
+                int completeCount = 0;
 
                 for (ZhcxLowaltitudeDebtfreeCheckDetailDo row : baseInfoDetails1) {
                     if ("✓".equals(row.getCheckresult()) || ("✕".equals(row.getCheckresult()) && "✓".equals(row.getRectifyesult()))) {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wm
- * @since 2024-10-29
+ * @since 2024-11-04
  */
 @Service
 public class ZhcxLowaltitudeDebtfreeCheckSubcontractorServiceImpl extends ServiceImpl<ZhcxLowaltitudeDebtfreeCheckSubcontractorDao, ZhcxLowaltitudeDebtfreeCheckSubcontractorDo> implements ZhcxLowaltitudeDebtfreeCheckSubcontractorService {

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

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author wm
- * @since 2024-10-29
+ * @since 2024-11-04
  */
 @Data
 @EqualsAndHashCode(callSuper = true)