dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
@@ -388,7 +388,7 @@ public Object userChoose(@CurrentUser String userId) { try { String roleCode = request.getParameter("roleCode"); List<SelectTermDTO> unitSelectTerms = service.userChoose(userId, roleCode); SelectTermDTO unitSelectTerms = service.userChoose(userId, roleCode); return ReturnSucUtils.getRepInfo(unitSelectTerms); } catch (Exception e) { return ReturnFailUtils.getRepInfo(e.getMessage()); dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/CtUserMapper.java
@@ -78,10 +78,10 @@ /** * 根据部门和角色查询 * @param deptIdList 部门编号 * @param unitId 组织编号 * @param roleCode 角色代码 * @return List<SelectTermDTO> */ List<CtUser> listUserByDeptRoleList(@Param("deptIdList") List<String> deptIdList, @Param("roleCode") String roleCode); List<CtUser> listUserByUnitRoleList(@Param("unitId") String unitId, @Param("roleCode") String roleCode); } dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
@@ -409,18 +409,13 @@ </select> <!-- 根据部门和角色查询 --> <select id="listUserByDeptRoleList" resultMap="dataResult"> <select id="listUserByUnitRoleList" resultMap="dataResult"> SELECT t1.id, t1.true_name, t1.dept_id FROM dyh_ct_user t1 LEFT JOIN dyh_ct_userole t2 ON t1.id = t2.user_id WHERE t1.delete_status = '0' AND t2.role_code = #{roleCode} AND t1.status = '1' <if test="deptIdList != null and deptIdList != ''"> and t1.dept_id in <foreach collection="deptIdList" item="deptIdList" index="index" open="(" separator="," close=")"> #{deptIdList} </foreach> </if> AND t1.unit_id = #{unitId} </select> </mapper> dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -315,12 +315,10 @@ List<CtUnit> ctUnitList = mapper.listAllChild(loginUser.getUnitId()); List<SelectTermDTO> unitSelectTerms = new ArrayList<>(); List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList()); // 部门条件 QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>(); ctDeptQueryWrapper.in("unit_id", unitIdList).select("id", "unit_id", "name", "parent_id"); ctDeptQueryWrapper.eq("unit_id", loginUser.getUnitId()).select("id", "unit_id", "name", "parent_id"); List<CtDept> ctDeptList = ctDeptService.list(ctDeptQueryWrapper); List<String> deptIdList = ctDeptList.stream().map(CtDept::getId).collect(Collectors.toList()); for(CtUnit ctUnit: ctUnitList){ SelectTermDTO unitSelectTerm = new SelectTermDTO(); @@ -329,18 +327,20 @@ unitSelectTerm.setParentId(ctUnit.getParentId()); unitSelectTerm.setCheckable(true); List<SelectTermDTO> deptSelectTerms = new ArrayList<>(); for(CtDept ctDept : ctDeptList){ if(ctUnit.getId().equals(ctDept.getUnitId())){ SelectTermDTO deptSelectTerm = new SelectTermDTO(); deptSelectTerm.setValue(ctDept.getId()); deptSelectTerm.setLabel(ctDept.getName()); deptSelectTerm.setParentId(ctDept.getParentId()); deptSelectTerm.setCheckable(true); if(loginUser.getUnitId().equals(ctUnit.getId())){ for(CtDept ctDept : ctDeptList){ if(ctUnit.getId().equals(ctDept.getUnitId())){ SelectTermDTO deptSelectTerm = new SelectTermDTO(); deptSelectTerm.setValue(ctDept.getId()); deptSelectTerm.setLabel(ctDept.getName()); deptSelectTerm.setParentId(ctDept.getParentId()); deptSelectTerm.setCheckable(true); deptSelectTerms.add(deptSelectTerm); deptSelectTerms.add(deptSelectTerm); } List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms); unitSelectTerm.setChildren(depts); } List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms); unitSelectTerm.setChildren(depts); } unitSelectTerms.add(unitSelectTerm); } dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
@@ -594,12 +594,12 @@ /** * 根据部门和角色查询 * @param deptIdList 部门编号 * @param unitId 组织编号 * @param roleCode 角色代码 * @return List<SelectTermDTO> */ public List<CtUser> listUserByDeptRoleList(List<String> deptIdList, String roleCode){ return mapper.listUserByDeptRoleList(deptIdList, roleCode); public List<CtUser> listUserByDeptRoleList(String unitId, String roleCode){ return mapper.listUserByUnitRoleList(unitId, roleCode); } /** @@ -609,84 +609,55 @@ * @param roleCode 条件 * @return Page */ public List<SelectTermDTO> userChoose(String userId, String roleCode) { // 获取当前登录用户 CtUserDTO loginUser = clientGetUserAll(userId); // 组织条件 QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>(); if (RoleBaseEnum.checkAdminPower(loginUser)){ ctUnitQueryWrapper.eq("cust_id", loginUser.getCustId()).select("id", "unit_name", "parent_id"); }else { ctUnitQueryWrapper.eq("id", loginUser.getUnitId()).select("id", "unit_name", "parent_id"); } List<CtUnit> ctUnitList = ctUnitService.list(ctUnitQueryWrapper); List<SelectTermDTO> unitSelectTerms = new ArrayList<>(); public SelectTermDTO userChoose(String userId, String roleCode) { try { // 获取当前登录用户 CtUserDTO loginUser = clientGetUserAll(userId); List<SelectTermDTO> unitSelectTerms = new ArrayList<>(); List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList()); // 部门条件 QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>(); ctDeptQueryWrapper.in("unit_id", unitIdList).select("id", "unit_id", "name", "parent_id"); List<CtDept> ctDeptList = ctDeptService.list(ctDeptQueryWrapper); List<String> deptIdList = ctDeptList.stream().map(CtDept::getId).collect(Collectors.toList()); // 人员条件 List<CtUser> ctUsers = null; if (StringUtils.isNotEmpty(roleCode)){ ctUsers = listUserByDeptRoleList(loginUser.getUnitId(), roleCode); }else { QueryWrapper<CtUser> ctUserQueryWrapper = new QueryWrapper<>(); ctUserQueryWrapper.in("unit_id", loginUser.getUnitId()).select("id", "true_name", "dept_id"); ctUsers = this.list(ctUserQueryWrapper); } List<String> userIdList = ctUsers.stream().map(CtUser::getId).collect(Collectors.toList()); QueryWrapper<CtUserole> ctUserQueryWrapper = new QueryWrapper<>(); ctUserQueryWrapper.in("user_id", userIdList).select("user_id", "role_name"); List<CtUserole> roleList = ctUseroleService.list(ctUserQueryWrapper); // 人员条件 List<CtUser> ctUsers = null; if (StringUtils.isNotEmpty(roleCode)){ ctUsers = listUserByDeptRoleList(deptIdList, roleCode); }else { QueryWrapper<CtUser> ctUserQueryWrapper = new QueryWrapper<>(); ctUserQueryWrapper.in("dept_id", deptIdList).select("id", "true_name", "dept_id"); ctUsers = this.list(ctUserQueryWrapper); } List<String> userIdList = ctUsers.stream().map(CtUser::getId).collect(Collectors.toList()); QueryWrapper<CtUserole> ctUserQueryWrapper = new QueryWrapper<>(); ctUserQueryWrapper.in("user_id", userIdList).select("user_id", "role_name"); List<CtUserole> roleList = ctUseroleService.list(ctUserQueryWrapper); for(CtUnit ctUnit: ctUnitList){ SelectTermDTO unitSelectTerm = new SelectTermDTO(); unitSelectTerm.setValue(ctUnit.getId()); unitSelectTerm.setLabel(ctUnit.getUnitName()); unitSelectTerm.setParentId(ctUnit.getParentId()); unitSelectTerm.setValue(loginUser.getUnitId()); unitSelectTerm.setLabel(loginUser.getUnitName()); unitSelectTerm.setCheckable(false); List<SelectTermDTO> deptSelectTerms = new ArrayList<>(); for(CtDept ctDept : ctDeptList){ if(ctUnit.getId().equals(ctDept.getUnitId())){ SelectTermDTO deptSelectTerm = new SelectTermDTO(); deptSelectTerm.setValue(ctDept.getId()); deptSelectTerm.setLabel(ctDept.getName()); deptSelectTerm.setParentId(ctDept.getParentId()); deptSelectTerm.setCheckable(false); if (CollectionUtils.isNotEmpty(ctUsers)) { List<SelectTermDTO> userSelectTerms = new ArrayList<>(); for(CtUser ctUser : ctUsers){ if(ctUser.getDeptId().equals(ctDept.getId())){ List<CtUserole> ctUseroleList = new ArrayList<>(); for(CtUserole ctUserole: roleList){ if(ctUser.getId().equals(ctUserole.getUserId())){ ctUseroleList.add(ctUserole); } } SelectTermDTO userSelectTerm = new SelectTermDTO(); userSelectTerm.setValue(ctUser.getId()); userSelectTerm.setCheckable(true); String roleName = ctUseroleList.stream().map(CtUserole::getRoleName).collect(Collectors.joining(",")); userSelectTerm.setLabel(ctUser.getTrueName()+"（"+roleName+"）"); userSelectTerms.add(userSelectTerm); } if (CollectionUtils.isNotEmpty(ctUsers)) { List<SelectTermDTO> userSelectTerms = new ArrayList<>(); for(CtUser ctUser : ctUsers){ List<CtUserole> ctUseroleList = new ArrayList<>(); for(CtUserole ctUserole: roleList){ if(ctUser.getId().equals(ctUserole.getUserId())){ ctUseroleList.add(ctUserole); } List<SelectTermDTO> users = SelectTermUtils.createTreeByRoot(userSelectTerms); deptSelectTerm.setChildren(users); } deptSelectTerms.add(deptSelectTerm); SelectTermDTO userSelectTerm = new SelectTermDTO(); userSelectTerm.setValue(ctUser.getId()); userSelectTerm.setCheckable(true); String roleName = ctUseroleList.stream().map(CtUserole::getRoleName).collect(Collectors.joining(",")); userSelectTerm.setLabel(ctUser.getTrueName()+"（"+roleName+"）"); userSelectTerms.add(userSelectTerm); } List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms); unitSelectTerm.setChildren(depts); List<SelectTermDTO> users = SelectTermUtils.createTreeByRoot(userSelectTerms); unitSelectTerm.setChildren(users); } unitSelectTerms.add(unitSelectTerm); return unitSelectTerm; }catch (Exception e) { log.error("[CtUserService.userChoose]调用失败，异常信息：" + e, e); throw new ServiceException("CtUserService.userChoose", e); } return SelectTermUtils.createTreeByFirst(unitSelectTerms, loginUser.getUnitId()); } } dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/AiController.java
@@ -59,7 +59,7 @@ caseInfoDtoList.add(caseInfoDto); } } if (caseInfoDtoList.size() < 6) { if (caseInfoDtoList.size() < 3) { s = HttpClientUtils.httpPostForm(aiUrl + "/queryJudgmentCase", params, new HashMap<>(), "utf-8"); object = JSONObject.parseObject(s); code = object.getIntValue("code"); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -556,7 +556,7 @@ <!-- 首页-办理中分页查询 --> <select id="pageMyTaskProcessing" resultMap="MyTaskApplyReviewResult"> SELECT t1.id as ownerId, t1.case_id as caseId, t1.create_time as turnaroundTime, t1.cande_unit_name as organizingUnit, t2.case_level as caseGrade, t2.canal_name as caseSource, t1.create_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType, concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants FROM dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -372,7 +372,7 @@ <select id="pageMySubmitApplyReview" resultMap="MyTaskApplyReviewResult"> SELECT t1.id as windupId, t1.case_task_id as ownerId, t1.case_id as caseId, t2.process_name as process, t1.apply_time as turnaroundTime, t2.case_level as caseGrade, t2.canal_name as caseSource, t2.case_type_name as caseType, t1.apply_unit_name as organizingUnit, t1.medi_result_name as mediResult,t1.fail_reason as reason, t1.medi_result_name as mediResult,t1.fail_reason as reason, concat(t2.plaintiffs, t2.pagents) as plaintiffs, concat(t2.defendants, t2.dagents) as defendants FROM dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -557,14 +557,14 @@ caseIdList.add(frontPageListDTO.getCaseId()); } if(CollectionUtils.isNotEmpty(caseIdList)){ QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>(); assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1) .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex()); List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper); for(CaseAssistApply caseAssistApply: caseAssistApplyList){ QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>(); unfoldQueryWrapper.in("id", caseIdList); List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper); for(CaseInfoUnfold unfold: unfoldList){ for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){ if(frontPageListDTO.getCaseId().equals(caseAssistApply.getCaseId())){ frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName()); if(frontPageListDTO.getCaseId().equals(unfold.getId())){ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId()); frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName()); } } } @@ -591,14 +591,14 @@ List<String> caseIdList = new ArrayList<>(); caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList()); if(CollectionUtils.isNotEmpty(caseIdList)){ QueryWrapper<CaseAssistApply> assistApplyQueryWrapper = new QueryWrapper<>(); assistApplyQueryWrapper.in("case_id", caseIdList).eq("apply_status", AuditBaseConsts.AUDIT_STATUS_1) .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex()); List<CaseAssistApply> caseAssistApplyList = assistApplyService.list(assistApplyQueryWrapper); for(CaseAssistApply caseAssistApply: caseAssistApplyList){ QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>(); unfoldQueryWrapper.in("id", caseIdList); List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper); for(CaseInfoUnfold unfold: unfoldList){ for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){ if(frontPageListDTO.getCaseId().equals(caseAssistApply.getCaseId())){ frontPageListDTO.setCooperatingUnit(caseAssistApply.getApplyAssistUnitName()); if(frontPageListDTO.getCaseId().equals(unfold.getId())){ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitId()); frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName()); } } } @@ -1340,7 +1340,7 @@ caseWindupApply.setAuditUserName(loginUser.getTrueName()); caseWindupApply.setAuditTime(nowDate); caseWindupApply.setUpdateTime(nowDate); caseWindupApplyService.saveCaseWindupApply(caseWindupApply); caseWindupApplyService.updateCaseWindupApply(caseWindupApply); // 查询结案审核任务 CaseTask jashCaseTask = mapper.selectById(caseWindupApply.getCaseTaskId()); // 审核通过， dyh-service/dyh-mediate/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@ profiles: active: - dev # - test # - test # - prod devtools:
