修复三单管理bug

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

@@ -18,4 +18,7 @@ import java.util.Map;
 public interface ZhcxPmqManagementRecoredDao extends BaseMapper<ZhcxPmqManagementRecoredDo> {
     @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT_RECORED WHERE DELETED = '0' AND PMQMID = #{pid}")
     List<ZhcxPmqManagementRecoredDo> getByPid(Map<String, String> map);
+
+    @Select("SELECT MAX(DISTRIBUTETIME) AS DISTRIBUTETIME FROM ZHCX_PMQ_MANAGEMENT_RECORED WHERE DELETED = '0'")
+    List<ZhcxPmqManagementRecoredDo> getMaxDatetime();
 }

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,11 +17,9 @@ import java.util.List;
  * @since 2024-10-30
  */
 public interface ZhcxPmqManagementSourceDao extends BaseMapper<ZhcxPmqManagementSourceDo> {
-    @Select("SELECT MAX(DISTRIBUTETIME) AS DISTRIBUTETIME FROM ZHCX_PMQ_MANAGEMENT_SOURCE WHERE DELETED = '0'")
-    List<ZhcxPmqManagementSourceDo> getMaxDatetime();
 
-    @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT_SOURCE WHERE DELETED = '0' AND CURRENTTIMES > 0 AND TOTALTIMES > 0 ORDER BY ORDERNO ASC LIMIT 0, 100")
-    List<ZhcxPmqManagementSourceDo> getMockData();
+    @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT_SOURCE WHERE DELETED = '0' AND DISTRIBUTETIME > #{maxtime} ORDER BY ORDERNO ASC")
+    List<ZhcxPmqManagementSourceDo> getMockData(Map<String, String> map);
 
     @Update("UPDATE ZHCX_PMQ_MANAGEMENT t1 SET t1.PROJECTID = (SELECT t2.ID FROM ZHCX_PROJECT_MANAGE t2 WHERE t2.PROJECT_CODE = t1.PROJECTNO) WHERE t1.PROJECTID IS NULL")
     void updateProjectId();

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

@@ -42,14 +42,15 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
         List<Map<String, Object>> res = new ArrayList<>();
         Date currentDate = new Date();
         // 获取当前抽取的最大的下发日期
-        List<ZhcxPmqManagementSourceDo> tempList1 = sourceDao.getMaxDatetime();
+        List<ZhcxPmqManagementRecoredDo> tempList1 = recoredDao.getMaxDatetime();
         String maxTime = "2000-01-01 00:00:00";
-        if (!tempList1.isEmpty()) {
+        if (!tempList1.isEmpty() && tempList1.get(0) != null && tempList1.get(0).getDistributetime() != null) {
             maxTime = DateFormatUtils.format(tempList1.get(0).getDistributetime(), "yyyy-MM-dd HH:mm:ss");
         }
-
+        Map<String, String> queryMap01 = new HashMap<>();
+        queryMap01.put("maxtime", maxTime);
         // 抽取NX系统数据
-        List<ZhcxPmqManagementSourceDo> nxSystemData = sourceDao.getMockData();
+        List<ZhcxPmqManagementSourceDo> nxSystemData = sourceDao.getMockData(queryMap01);
         newMapData(nxSystemData);
 
         for (ZhcxPmqManagementSourceDo row : nxSystemData) {