Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/config/InterceptorConfig.java

@@ -34,6 +34,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/login")
                 .excludePathPatterns("/auth/self")
                 .excludePathPatterns("/file/stream/**", "/templates/**")
+                .excludePathPatterns("/score/police", "/score/depart")
                 .excludePathPatterns(List.of("/doc.html", "/webjars/**", "/favicon.ico", "/v3/api-docs/**"));
 
         registry.addInterceptor(new ApiInterceptor())

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

@@ -60,12 +60,6 @@ public class ProfileDepartController {
         }
         Page<DepartNegativeModel> page = profileDepartMapper.queryDepartNegative(Page.of(param.getCurrent(), param.getSize()), beginTime, endTime,
                 param.getDepartName(), param.getDepartId(), param.getDepartGroupId());
-        long l = System.currentTimeMillis();
-        for (DepartNegativeModel item : page.getRecords()) {
-            List<Object> result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getDepartId());
-            item.setScore((BigDecimal) result.get(0));
-        }
-        log.info("风险指数计算耗时：{}s", (System.currentTimeMillis() - l) / 1000);
         return Result.success(page);
     }
 

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

@@ -63,12 +63,6 @@ public class ProfilePoliceController {
         }
         Page<PoliceNegativeModel> page = profilePoliceMapper.queryPoliceNegative(Page.of(param.getCurrent(), param.getSize()), beginTime, endTime,
                 param.getName(),param.getEmpNo(), param.getDepartId(), param.getDepartGroupId());
-        long l = System.currentTimeMillis();
-        for (PoliceNegativeModel item : page.getRecords()) {
-            List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode());
-            item.setScore((BigDecimal) result.get(0));
-        }
-        log.info("风险指数计算耗时：{}s", (System.currentTimeMillis() - l) / 1000);
         return Result.success(page);
     }
 
@@ -154,8 +148,7 @@ public class ProfilePoliceController {
         List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, idCode);
         profilePolice.setScore((BigDecimal) result.get(0));
         profilePolice.setExpression(result.get(1).toString());
-
+        profilePolice.setRemarks(result.get(2).toString());
-
         return Result.success(profilePolice);
     }
 

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

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -44,7 +45,7 @@ public class ScoreController {
             List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode());
             PoliceScore score = new PoliceScore();
             score.setIdCode(item.getIdCode());
-            score.setScore((Double) result.get(0));
+            score.setScore((BigDecimal) result.get(0));
             score.setExpression((String) result.get(1));
             score.setBeginTime(beginTime);
             score.setEndTime(endTime);
@@ -64,7 +65,7 @@ public class ScoreController {
             List<Object> result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getId());
             DepartScore score = new DepartScore();
             score.setDepartId(item.getId());
-            score.setScore((Double) result.get(0));
+            score.setScore((BigDecimal) result.get(0));
             score.setExpression((String) result.get(1));
             score.setBeginTime(beginTime);
             score.setEndTime(endTime);

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

@@ -49,7 +49,7 @@ public class ApplyCompletionAction implements Action {
         //validator.validate(verifyData);
         // 新增审批数据
         Negative negative = negativeService.getById(actionDto.getNegativeId());
-        updateNegative(actionDto.getNegativeId(), actionDto.getNextFlowKey(), verifyData, negative);
+        updateNegative(actionDto.getNegativeId(), verifyData, negative);
         doneWork(actionDto.getWorkId());
         addWork(actionDto.getNegativeId(), actionDto.getWorkId(),
                 // 是否是本级办理
@@ -57,11 +57,11 @@ public class ApplyCompletionAction implements Action {
                 negative);
     }
 
-    public void updateNegative(String negativeId, String nextFlowKey, VerifyData verifyData, Negative negative) {
+    public void updateNegative(String negativeId, VerifyData verifyData, Negative negative) {
         LocalDateTime now = LocalDateTime.now();
         LambdaUpdateWrapper<Negative> updateWrapper = new LambdaUpdateWrapper<Negative>()
                 .eq(Negative::getId, negativeId)
-                .set(Negative::getFlowKey, nextFlowKey)
+                .set(Negative::getFlowKey, negative.getIsSecondHandle() ? FlowNodeEnum.FIRST_APPROVE.getKey() : FlowNodeEnum.SECOND_APPROVE.getKey())
                 .set(Negative::getUpdTime, now)
                 .set(Negative::getProcessingStatus, ProcessingStatusEnum.approval.name())
                 .set(Negative::getCheckStatus, verifyData.getCheckStatus())

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Setter
@@ -17,7 +18,7 @@ public class DepartScore {
 
     // 
     @TableField("score")
-    private Double score;
+    private BigDecimal score;
 
     // 
     @TableField("expression")

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Setter
@@ -17,7 +18,7 @@ public class PoliceScore {
 
     // 
     @TableField("score")
-    private Double score;
+    private BigDecimal score;
 
     // 
     @TableField("expression")

src/main/resources/mapper/ProfileDepartMapper.xml

@@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryDepartNegative" resultType="com.biutag.supervision.pojo.model.DepartNegativeModel">
         SELECT
             d.*,
-            count( DISTINCT nb.blameIdCode ) verify_police_size,
+            count( DISTINCT nb.blameIdCode  ) verify_police_size,
-            count( n.id ) verify_size,
+            count( n.negative_id ) verify_size,
             dc.score
         FROM
             (
@@ -17,7 +17,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 d1.short_name parent_depart_name,
                 d.short_name depart_name,
                 p.police_size,
-
                 p.aux_size
             FROM
                 sup_depart d
@@ -25,15 +24,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN sup_depart_police_size p ON p.depart_id = d.id
             WHERE
                 d.LEVEL = 3
-                and d.statistics_group_id = #{departGroupId}
+                <if test="departGroupId != null and departGroupId != ''">
+                    and d.statistics_group_id = #{departGroupId}
+                </if>
+
             ) d
-            LEFT JOIN negative n ON n.involveDepartId = d.depart_id
+            LEFT JOIN negative_score_depart n ON d.depart_id = n.depart_id
-            AND n.checkStatus IN ( '1', '2' )
+            LEFT JOIN negative_blame nb ON n.negative_id = nb.blameId
-            AND n.discoveryTime BETWEEN #{beginTime} AND #{endTime}
-            LEFT JOIN negative_blame nb ON n.id = nb.negativeId
             left join depart_score dc on d.depart_id = dc.depart_id
         WHERE
-            1 = 1
+            n.depart_id is not null
+            AND n.discovery_time BETWEEN #{beginTime} AND #{endTime}
             <if test="departName != null and departName != ''">
                 AND d.short_name like concat('%', #{departName}, '%')
             </if>

src/main/resources/mapper/ProfilePoliceMapper.xml

@@ -25,7 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             n.id_code is not null
             AND n.discovery_time BETWEEN #{beginTime} AND #{endTime}
-            AND d.statistics_group_id = #{departGroupId}
+            <if test="departGroupId != null and departGroupId != ''">
+                AND d.statistics_group_id = #{departGroupId}
+            </if>
             AND pc.score > 0
             <if test="name != null and name != ''">
                 AND p.name like concat('%', #{name}, '%')