Merge branch 'master' of http://gitea.biutag.com/supervision/supervision-boot

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

@@ -318,7 +318,8 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
             }
         }
         // 案件基本信息表
-        if (modelId == 10 || modelId == 11 || modelId == 12 || modelId == 13 || modelId == 14 || modelId == 15 || modelId == 19) {
+        if (modelId == 10 || modelId == 11 || modelId == 12 || modelId == 13 || modelId == 14
+                || modelId == 15 || modelId == 19 || modelId == 31) {
             String bar1Id = (String) data.get("BAR1ID");
             String bar2Id = (String) data.get("BAR2ID");
             Map<String, Object> bar1 = bar1Id != null && !bar1Id.isEmpty() ? modelClueDataMapper.selectBAR(bar1Id) : null;
@@ -338,7 +339,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
             }
         }
         // 反馈单
-        if (modelId == 24 || modelId == 27 || modelId == 28 || modelId == 30 ) {
+        if (modelId == 24 || modelId == 27 || modelId == 28 || modelId == 29 || modelId == 30 ) {
             String fkrbh = (String) data.get("fkrbh");
             String fkrxm = (String) data.get("fkrxm");
             if (fkrbh != null && !fkrbh.isEmpty()) {
@@ -464,6 +465,10 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
                             + "，身份证号码：" + data.get("sfzhm") + "，联系电话：" + data.get("lxdh")
                             + "，" + data.get("ryztmc") + "），预警内容为：" + data.get("result")
                             + "，请予以重点关注。");
+        } else if (modelId == 24) { // 24号模型：警情未录入反馈人员信息
+            modelClue.setThingDesc("发现" + modelClue.getInvolveDepartName() + "受理的接警单"
+                    + modelClue.getUniqueKey() + "，报警日期为" + getDateMinuteString(data.get("bjsj"))
+                    + "，未录入反馈人员身份证信息。");
         } else if (modelId == 26) { // 26号模型：执法办案场所进出时间过短
             if (data.get("lksj") != null && !data.get("lksj").equals("")) {
                 modelClue.setThingDesc("发现执法场所人员“" + data.get("xm")
@@ -484,11 +489,20 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
                     + modelClue.getUniqueKey() + "，报警日期为" + getDateMinuteString(data.get("bjsj"))
                     + "，接警性质为“" + data.get("ysjqxzmc") + "”，金额超过5000元。报警内容为：“" + data.get("bjnr")
                     + "”。");
+        } else if (modelId == 29) { // 29号模型：案件降格处理的异常数据
+            modelClue.setThingDesc("发现" + modelClue.getInvolveDepartName() + "受理的接警单"
+                    + modelClue.getUniqueKey() + "，报警日期为" + getDateMinuteString(data.get("bjsj"))
+                    + "，派警、结警均定性为“刑事案件”，但办案单位却受理为“行政案件”办理，存在疑似案件降格处理的问题。");
         } else if (modelId == 30) { // 30号模型：接警结警性质不一致的异常数据
             modelClue.setThingDesc("发现" + modelClue.getInvolveDepartName() + "受理的接警单"
                     + modelClue.getUniqueKey() + "，报警日期为" + getDateMinuteString(data.get("bjsj"))
                     + "，接警性质为“" + data.get("ysjqxzmc") + "”，结警性质为“" + data.get("jqxzmc")
                     + "，存在接警结警性质不一致的异常数据的异常情况。");
+        } else if (modelId == 31) { // 31号模型：涉赌、涉黄案件未录入涉案财物
+            modelClue.setThingDesc(
+                    "发现" + modelClue.getInvolveDepartName() + "受理的“" + data.get("AJMC")
+                            + "”（【" + data.get("AJBZmc") + "】编号：" + getAjbh(data)
+                            + "），未扣押任何财物，存在疑似涉案财物未按要求录入的问题。");
         }
     }
 
@@ -1135,7 +1149,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
         }
         String originalFieldName = getKeyFieldName(originalSql);
         // 接警单关联反馈单警员
-        if (modelId == 24 || modelId == 27 || modelId == 28 || modelId == 30) {
+        if (modelId == 24 || modelId == 27 || modelId == 28 || modelId == 29 || modelId == 30) {
             return "SELECT a.*, b.fkrbh, b.fkrxm FROM " + tableName + " a left join dwd_asj_zhtx_fkd b on a.jjdbh = b.jjdbh " + "WHERE a." + originalFieldName + " IN " + "(" + uniqueKeys.stream().map(k -> "'" + k + "'").collect(Collectors.joining(",")) + ");";
         }
         return "SELECT * FROM " + tableName + " " + "WHERE " + originalFieldName + " IN " + "(" + uniqueKeys.stream().map(k -> "'" + k + "'").collect(Collectors.joining(",")) + ");";