diff --git a/sql/250819.sql b/sql/250819.sql new file mode 100644 index 0000000..3491ecc --- /dev/null +++ b/sql/250819.sql @@ -0,0 +1,2 @@ +ALTER TABLE `negative`.`negative` + ADD COLUMN `verified_is_leader` varchar(255) NULL COMMENT '涉及人员是否属于领导班子成员' AFTER `handle_result12337_group`; \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java b/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java index 2223ce3..82d73fe 100644 --- a/src/main/java/com/biutag/supervision/controller/books/NegativeBookController.java +++ b/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); diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java index e750dfe..3c4c5c5 100644 --- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java +++ b/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 diff --git a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java b/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java index 4742f9c..ab8d7e1 100644 --- a/src/main/java/com/biutag/supervision/pojo/dto/flow/VerifyData.java +++ b/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 { diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java index 1ec03c5..35923bc 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/Negative.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/Negative.java @@ -328,4 +328,7 @@ public class Negative { private String handleResult12337Group; + // 涉及人员是否属于领导班子成员 + private String verifiedIsLeader; + } diff --git a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java b/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java index 3f821f2..7cd755b 100644 --- a/src/main/java/com/biutag/supervision/pojo/vo/DataPetition12337ExportVo.java +++ b/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; /** * 是否核查完结 diff --git a/src/main/java/com/biutag/supervision/service/RpcApplyService.java b/src/main/java/com/biutag/supervision/service/RpcApplyService.java index fcb078e..06eefa5 100644 --- a/src/main/java/com/biutag/supervision/service/RpcApplyService.java +++ b/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 { public Page page(RpcApplyQueryParam queryParam, String type) { UserAuth user = UserContextHolder.getCurrentUser(); QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) { -// List rightPeoples = rpcRightPersonService.list(user.getUserName()); -// if (rightPeoples.isEmpty()) { -// return new Page().setTotal(0).setRecords(new ArrayList<>()); -// } -// // 是否是市局维权专干 -// if (rightPeoples.stream().noneMatch(item -> "1".equals(item.getCouncil()))) { -// Set departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet()); -// List childrenIds = departService.getAllNodeIds(departIds); -// queryWrapper.in("a.handle_depart_id", childrenIds); -// } -// } if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType())) { - List orgIds = new ArrayList<>(); - if(StrUtil.isNotBlank(user.getDepartId())){ - orgIds.add(user.getDepartId()); + List rightPeoples = rpcRightPersonService.list(user.getUserName()); + if (rightPeoples.isEmpty()) { + return new Page().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 departIds = rightPeoples.stream().map(RpcRightPerson::getDepartId).collect(Collectors.toSet()); + List childrenIds = departService.getAllNodeIds(departIds); + queryWrapper.in("a.handle_depart_id", childrenIds); } } queryWrapper.like(StrUtil.isNotBlank(queryParam.getApplicantEmpName()), "a.applicant_emp_name", queryParam.getApplicantEmpName()) diff --git a/src/main/resources/mapper/DataPetition12337Mapper.xml b/src/main/resources/mapper/DataPetition12337Mapper.xml index 0fa6549..8455d35 100644 --- a/src/main/resources/mapper/DataPetition12337Mapper.xml +++ b/src/main/resources/mapper/DataPetition12337Mapper.xml @@ -168,7 +168,7 @@