修改104号模型

src/main/java/com/biutag/supervision/pojo/entity/StatisticsDepart.java

@@ -1,13 +1,10 @@
 package com.biutag.supervision.pojo.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
-
 @Setter
 @Getter
 public class StatisticsDepart {
@@ -26,7 +23,7 @@ public class StatisticsDepart {
 
     // 
     @TableField("groupId")
-    private String groupId;
+    private Long groupId;
 
     // 
     @TableField("pid")

src/main/java/com/biutag/supervision/service/ModelClueService.java

@@ -1052,7 +1052,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
         List<String> params = parseSqlForModel2(param);
         String sql = "select a.gxdwdm, a.gxdwmc, a.num anum, b.num bnum from ((SELECT gxdwdm, gxdwmc, COUNT(*) AS num from dwd_asj_zhtx_jjd where bjsj BETWEEN '" + params.get(0) + " 00:00:00' AND '" + params.get(1) + " 00:00:00' AND (ysjqxzdm LIKE '01%' OR ysjqxzdm LIKE'02%' OR ysjqxzdm LIKE'06%') AND (bjxldm  NOT LIKE '01%' AND bjxldm  NOT LIKE '02%' AND bjxldm  NOT LIKE '06%') and bjfsdm = '0101' GROUP BY gxdwdm, gxdwmc) a join (SELECT gxdwdm, gxdwmc, COUNT(*) num from dwd_asj_zhtx_jjd where bjsj BETWEEN '" + params.get(0) + " 00:00:00' AND '" + params.get(1) + " 00:00:00' AND (ysjqxzdm LIKE '01%' OR ysjqxzdm LIKE'02%' OR ysjqxzdm LIKE'06%') and bjfsdm = '0101' GROUP BY gxdwdm, gxdwmc) b on a.gxdwdm = b.gxdwdm);";
         List<Map<String, Object>> jjdmaps = modelClueDataMapper.selectByUniqueKeys(sql);
-        System.out.println("模型104查询数据库完毕");
+        System.out.println("模型104查询数据库完毕，结果数量：" + jjdmaps.size());
         if (jjdmaps.isEmpty()) {
             return;
         }
@@ -1091,7 +1091,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
                 .map(Map.Entry::getKey)
                 .toList();
         for (String department : highPercentageDepartments) {
-            if (departNumMap.get(department) < 10) {
+            if (departNumMap.get(department) < 10L) {
                 continue;
             }
             ModelClue newModelClue = new ModelClue();
@@ -1102,7 +1102,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
                 if (supExternalDepart.getInternalId() != null) {
                     newModelClue.setInvolveDepartId(supExternalDepart.getInternalId());
                     StatisticsDepart statisticsDepart = statisticsDepartMapper.selectOne(new QueryWrapper<StatisticsDepart>().eq("departId", supExternalDepart.getInternalId()).last("LIMIT 1"));
-                    if (statisticsDepart == null || statisticsDepart.getLevel() == null || statisticsDepart.getLevel() != 10L) {
+                    if (statisticsDepart == null || statisticsDepart.getGroupId() == null || statisticsDepart.getGroupId() != 10L) {
                         continue;
                     }
                 }