更新三单数据源分组条件

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

@@ -18,4 +18,7 @@ import java.util.Map;
 public interface ZhcxPmqManagementDao extends BaseMapper<ZhcxPmqManagementDo> {
     @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT WHERE DELETED = '0' AND ORDERNO = #{orderno}")
     List<ZhcxPmqManagementDo> getByCode(Map<String, String> map);
+
+    @Select("SELECT * FROM ZHCX_PMQ_MANAGEMENT WHERE DELETED = '0' AND CONCAT(ORDERNO, '|-_-|', PROJECTNO, '|-_-|', ORDERTYPE) = #{orderno}")
+    List<ZhcxPmqManagementDo> getByCodeUnit(Map<String, String> map);
 }

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

@@ -83,13 +83,16 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
         List<Map<String, Object>> allUser = pmqmDao.getAllUser();
 
         // 将NX系统数据写入ZHCX_PMQ_MANAGEMENT和ZHCX_PMQ_MANAGEMENT_RECORD
+        // 以Orderno|-_-|Projectno|-_-|Ordertype形式分组
         Map<String, List<ZhcxPmqManagementSourceDo>> groupedByOrderNo = nxSystemData.stream()
-                .collect(Collectors.groupingBy(ZhcxPmqManagementSourceDo::getOrderno));
+               .collect(Collectors.groupingBy(ZhcxPmqManagementSourceDo -> ZhcxPmqManagementSourceDo.getOrderno()+"|-_-|"+
+                       ZhcxPmqManagementSourceDo.getProjectno()+"|-_-|"+
+                       ZhcxPmqManagementSourceDo.getOrdertype()));
         // 按编号分组
         groupedByOrderNo.forEach((orderNo, items) -> {
             Map<String, String> queryPRowMap = new HashMap<>();
             queryPRowMap.put("orderno", orderNo);
-            List<ZhcxPmqManagementDo> queryParentRows = managementDao.getByCode(queryPRowMap);
+            List<ZhcxPmqManagementDo> queryParentRows = managementDao.getByCodeUnit(queryPRowMap);
             String pid = SecurityUtil.getUUID();
             // 搜索该编号是否已存在
             if (!queryParentRows.isEmpty()) {