Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/constants/AppConstants.java

@@ -25,4 +25,8 @@ public class AppConstants {
 
     public static final String SIGN_RETURN_ACTION_NAME = "已退回";
 
+    public static final String UN_DEL = "0";
+
+    public static final String DEL = "1";
+
 }

src/main/java/com/biutag/supervision/controller/sensitivePerception/RiskPersonalController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.pojo.Result;
 import com.biutag.supervision.pojo.domain.RiskPersonalDetail;
 import com.biutag.supervision.pojo.entity.*;
@@ -45,11 +46,22 @@ public class RiskPersonalController {
     @GetMapping
     public Result<Page<RiskPersonalVo>> list(RiskPersonalQueryParam param) {
         LambdaQueryWrapper<RiskPersonal> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(StrUtil.isNotBlank(param.getName()), RiskPersonal::getName, param.getName())
+        queryWrapper
+                .eq(RiskPersonal::getDel, AppConstants.UN_DEL)
+                .like(StrUtil.isNotBlank(param.getName()), RiskPersonal::getName, param.getName())
                 .like(StrUtil.isNotBlank(param.getMobileNumber()), RiskPersonal::getMobileNumber, param.getMobileNumber())
                 .like(StrUtil.isNotBlank(param.getIdCode()), RiskPersonal::getIdCode, param.getIdCode())
                 .eq(Objects.nonNull(param.getAge()), RiskPersonal::getAge, param.getAge())
-                .eq(StrUtil.isNotBlank(param.getControlDepartId()), RiskPersonal::getControlDepartId, param.getControlDepartId());
+                .like(StrUtil.isNotBlank(param.getTags()), RiskPersonal::getTags, param.getTags());
+        if (StrUtil.isNotBlank(param.getTags())) {
+            LambdaQueryWrapper<RiskPersonalTag> qw = new LambdaQueryWrapper<RiskPersonalTag>()
+                    .like(RiskPersonalTag::getSmallTag, param.getTags());
+            List<RiskPersonalTag> personalTags = riskPersonalTagService.list(qw);
+            if (personalTags.isEmpty()) {
+                return Result.success(new Page<RiskPersonalVo>().setTotal(0).setRecords(new ArrayList<>()));
+            }
+            queryWrapper.in(RiskPersonal::getIdCode, personalTags.stream().map(RiskPersonalTag::getIdCode).collect(Collectors.toSet()));
+        }
         queryWrapper.orderByDesc(RiskPersonal::getRiskScore).orderByDesc(RiskPersonal::getCreateTime);
         Page<RiskPersonal> page = riskPersonalService.page(Page.of(param.getCurrent(), param.getSize()), queryWrapper);
         if (page.getRecords().isEmpty()) {
@@ -86,7 +98,7 @@ public class RiskPersonalController {
             List<RiskModelTaskClue> records = models.isEmpty() ? new ArrayList<>() : riskModelTaskClueService.page(Page.of(1, 100), new LambdaQueryWrapper<RiskModelTaskClue>()
                     .eq(RiskModelTaskClue::getIdCode, riskPersonal.getIdCode())
                     .in(RiskModelTaskClue::getModelId, models.stream().map(Model::getId).toList())
-                    .eq(RiskModelTaskClue::getDel, "0")
+                    .eq(RiskModelTaskClue::getDel, AppConstants.UN_DEL)
                     .orderByDesc(RiskModelTaskClue::getScore)
                     .orderByAsc(RiskModelTaskClue::getCreateTime)).getRecords();
             riskRule.setClues(records);

src/main/java/com/biutag/supervision/controller/sensitivePerception/ScoreController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.biutag.supervision.constants.AppConstants;
 import com.biutag.supervision.mapper.DepartScoreMapper;
 import com.biutag.supervision.mapper.PoliceScoreMapper;
 import com.biutag.supervision.pojo.Result;
@@ -93,7 +94,7 @@ public class ScoreController {
         if (Objects.isNull(size)) {
             size = 1000000;
         }
-        List<RiskPersonal> riskPersonals = riskPersonalService.page(Page.of(1, size), new LambdaQueryWrapper<RiskPersonal>().eq(RiskPersonal::getDel, "0")
+        List<RiskPersonal> riskPersonals = riskPersonalService.page(Page.of(1, size), new LambdaQueryWrapper<RiskPersonal>().eq(RiskPersonal::getDel, AppConstants.UN_DEL)
                 ).getRecords();
         log.info("{}条数据正在打分", riskPersonals.size());
         List<RiskScoreRule> rules1 = riskScoreRuleService.list(new LambdaQueryWrapper<RiskScoreRule>().eq(RiskScoreRule::getLevel, 1));
@@ -111,7 +112,7 @@ public class ScoreController {
                     double score3 = riskModelTaskClueService.list(new LambdaQueryWrapper<RiskModelTaskClue>()
                                     .eq(RiskModelTaskClue::getModelId, model.getId())
                                     .eq(RiskModelTaskClue::getIdCode, personal.getIdCode())
-                                    .eq(RiskModelTaskClue::getDel, "0"))
+                                    .eq(RiskModelTaskClue::getDel, AppConstants.UN_DEL))
                             .stream().mapToDouble(RiskModelTaskClue::getScore).sum();
                     score3 = Math.min(rule2.getScore(), score3);
                     log.info("{} 分值 = {}", rule2.getRiskName(), score3);

src/main/java/com/biutag/supervision/flow/action/SaveAction.java

@@ -73,6 +73,7 @@ public class SaveAction implements Action {
          * 如果涉及不为空，则先删除原有数据，再新增
          */
         negativeBlameService.remove(negativeId);
+        negativeProblemRelationService.remove(negativeId);
         if (!verifyData.getBlames().isEmpty()) {
             List<NegativeProblemRelation> problemRelations = new ArrayList<>();
             List<NegativeBlame> negativeBlames = verifyData.getBlames().stream().map(item -> {
@@ -101,7 +102,6 @@ public class SaveAction implements Action {
             negativeBlameService.saveBatch(negativeBlames);
             // 新增涉及人员问题类型
             if (!problemRelations.isEmpty()) {
-                negativeProblemRelationService.remove(negativeId);
                 negativeProblemRelationService.saveBatch(problemRelations);
             }
         }

src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java

@@ -223,6 +223,8 @@ public class VerifyData {
         @NotBlank
         private String threeLevelContent;
 
+        private String threeLevelContentOther;
+
     }
 
 }

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

@@ -93,4 +93,8 @@ public class Model {
     private String modelSql;
 
     private Integer riskScoreRuleId;
+
+    // 预警问题处置
+    private String warningHandling;
+
 }

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

@@ -270,7 +270,7 @@ public class Negative {
     // 单位会签ID
     private Integer countersignApplyId;
 
-    // 下发的单位层级
+    // 创建单位层级 （默认为市局）
     private Integer crtDepartLevel;
 
 }

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

@@ -43,4 +43,8 @@ public class NegativeProblemRelation {
     @TableField("threeLevelContent")
     private String threeLevelContent;
 
+    // 其他内容
+    @TableField("threeLevelContent")
+    private String threeLevelContentOther;
+
 }

src/main/java/com/biutag/supervision/pojo/param/NegativeQueryParam.java

@@ -64,4 +64,6 @@ public class NegativeQueryParam extends BasePage {
 
     private String reportNumber;
 
+    private Integer crtDepartLevel;
+
 }

src/main/java/com/biutag/supervision/pojo/param/RiskPersonalQueryParam.java

@@ -20,6 +20,8 @@ public class RiskPersonalQueryParam extends BasePage {
 
     private String idCode;
 
-    private String controlDepartId;
+    private String tags;
+
+    private String smallTags;
 
 }

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

@@ -57,7 +57,8 @@ public class NegativeQueryService {
                 .in(!param.getCheckStatusList().isEmpty(), Negative::getCheckStatus, param.getCheckStatusList())
                 .eq(StrUtil.isNotBlank(param.getIsRectifyCode()), Negative::getIsRectifyCode, param.getIsRectifyCode())
                 .eq(StrUtil.isNotBlank(param.getSpecialSupervision()), Negative::getSpecialSupervision, param.getSpecialSupervision())
-                .like(StrUtil.isNotBlank(param.getReportNumber()), Negative::getReportNumber, param.getReportNumber());
+                .like(StrUtil.isNotBlank(param.getReportNumber()), Negative::getReportNumber, param.getReportNumber())
+                .eq(Objects.nonNull(param.getCrtDepartLevel()), Negative::getCrtDepartLevel, param.getCrtDepartLevel());
         if (param.getHappenTime().size() == 2) {
             queryWrapper.between(Negative::getHappenTime, param.getHappenTime().get(0), param.getHappenTime().get(1));
         }