perf: 优化完善

sql/250819.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `negative`.`negative`
+    ADD COLUMN `verified_is_leader` varchar(255) NULL COMMENT '涉及人员是否属于领导班子成员' AFTER `handle_result12337_group`;

src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java

@@ -268,14 +268,6 @@ public class NegativeBookController {
                 item.setIsPunish("否");
             }
             item.setPunishDes(item.getCheckStatusDesc());
-            // 被核查人是否属于领导班子成员
-            if (StrUtil.isNotBlank(item.getAccountabilityTarget())) {
-                if (AccountabilityTargetEnum.PERSONAL.getValue().equals(item.getAccountabilityTarget())) {
-                    item.setVerifiedIsleader("非领导班子成员");
-                } else {
-                    item.setVerifiedIsleader("领导班子成员");
-                }
-            }
         });
         String headerValue = "attachment; filename=\"" + URLEncoder.encode("12337信访投诉数据台账.xlsx", "UTF-8") + "\"";
         response.setHeader("Content-Disposition", headerValue);

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

@@ -89,7 +89,10 @@ public class ApplyCompletionAction implements Action {
                 .set(Negative::getResolveSituation, verifyData.getResolveSituation())
                 .set(Negative::getResolveStatus, verifyData.getResolveStatus())
                 .set(Negative::getVisitingLeaderName, verifyData.getVisitingLeaderName())
-                .set(Negative::getVisitingLeaderEmpNo, verifyData.getVisitingLeaderEmpNo());
+                .set(Negative::getVisitingLeaderEmpNo, verifyData.getVisitingLeaderEmpNo())
+                .set(Negative::getHandleResult12337, verifyData.getHandleResult12337())
+                .set(Negative::getHandleResult12337Group, verifyData.getHandleResult12337Group())
+                .set(Negative::getVerifiedIsLeader, verifyData.getVerifiedIsLeader());
         // 属实
         if (InspectCaseEnum.isItTure(verifyData.getCheckStatus())) {
             updateWrapper

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

@@ -77,6 +77,12 @@ public class VerifyData {
 
     private String visitingLeaderEmpNo;
 
+    private String handleResult12337;
+
+    private String handleResult12337Group;
+
+    private String verifiedIsLeader;
+
     @Setter
     @Getter
     public static class Blame {

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

@@ -328,4 +328,7 @@ public class Negative {
 
     private String handleResult12337Group;
 
+    // 涉及人员是否属于领导班子成员
+    private String verifiedIsLeader;
+
 }

src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java

@@ -288,7 +288,7 @@ public class DataPetition12337ExportVo implements Serializable {
      * 被核查人是否属于领导班子成员
      */
     @ExcelProperty("被核查人是否属于领导班子成员")
-    private String verifiedIsleader;
+    private String verifiedIsLeader;
 
     /**
      * 是否核查完结

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

@@ -31,6 +31,8 @@ import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
 @Service
@@ -50,25 +52,16 @@ public class RpcApplyService extends ServiceImpl<RpcApplyMapper, RpcApply> {
     public Page<RpcApplyVo> page(RpcApplyQueryParam queryParam, String type) {
         UserAuth user = UserContextHolder.getCurrentUser();
         QueryWrapper<RpcApply> queryWrapper = new QueryWrapper<>();
-//        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) {
-//            List<RpcRightPerson> rightPeoples = rpcRightPersonService.list(user.getUserName());
-//            if (rightPeoples.isEmpty()) {
-//                return new Page<RpcApplyVo>().setTotal(0).setRecords(new ArrayList<>());
-//            }
-//            // 是否是市局维权专干
-//            if (rightPeoples.stream().noneMatch(item -> "1".equals(item.getCouncil()))) {
-//                Set<String> departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet());
-//                List<String> childrenIds = departService.getAllNodeIds(departIds);
-//                queryWrapper.in("a.handle_depart_id", childrenIds);
-//            }
-//        }
         if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) {
-            List<String> orgIds = new ArrayList<>();
-            if(StrUtil.isNotBlank(user.getDepartId())){
-                orgIds.add(user.getDepartId());
+            List<RpcRightPerson> rightPeoples = rpcRightPersonService.list(user.getUserName());
+            if (rightPeoples.isEmpty()) {
+                return new Page<RpcApplyVo>().setTotal(0).setRecords(new ArrayList<>());
             }
-            if(CollectionUtil.isNotEmpty(orgIds)){
-                orgIds.addAll(departService.getAllNodeIds(user.getAuthDepartIds()));
+            // 是否是市局维权专干
+            if (rightPeoples.stream().noneMatch(item -> "1".equals(item.getCouncil()))) {
+                Set<String> departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet());
+                List<String> childrenIds = departService.getAllNodeIds(departIds);
+                queryWrapper.in("a.handle_depart_id", childrenIds);
             }
         }
         queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName())

src/main/resources/mapper/DataPetition12337Mapper.xml

@@ -168,7 +168,7 @@
     <select id="queryPageExport" resultType="com.biutag.supervision.pojo.vo.DataPetition12337ExportVo">
         SELECT
             p.*, n.handle_second_depart_name, n.handle_polices, n.check_status_desc, n.checkStatus, n.checkStatusName, n.id, n.processing_status,
-            n.accountability_target, n.handle_result12337, n.handle_result12337_group, n.verify_time
+            n.accountability_target, n.handle_result12337, n.handle_result12337_group, n.verify_time, n.verified_is_leader
         FROM
             data_petition_12337 p left join negative n on p.only_id = n.originId
             ${ew.getCustomSqlSegment}