dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUnitWebController.java
@@ -389,7 +389,7 @@ /** * 联合处置申请-选择组织 * @url {ctx}/api/web/ctUnit/unitChoose * @url {ctx}/api/web/ctUnit/assistApplyUnitChoose * @param userId 组织编号 * @return Object */ dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -472,7 +472,7 @@ } /** * 交办-选择组织 * 联合处置申请-选择组织 * @param userId * @return */ @@ -483,11 +483,11 @@ CtUnit loginUnit = mapper.selectById(loginUser.getUnitId()); QueryWrapper<CtUnit> ctUnitQueryWrapper1 = new QueryWrapper<>(); ctUnitQueryWrapper1.eq("id", loginUnit.getParentId()); CtUnit superiorUnit = mapper.selectOne(ctUnitQueryWrapper1); CtUnit superiorUnit = mapper.selectById(loginUnit.getParentId()); // 市级 if (UserBaseConsts.UNIT_GRADE_1 == loginUnit.getUnitGrade()){ if (UserBaseConsts.UNIT_GRADE_1 == superiorUnit.getUnitGrade()){ QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>(); ctUnitQueryWrapper.eq("parent_id", loginUnit.getId()); ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId()); List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper); // 定义市直部门数组 List<SelectTermDTO> szbmList = new ArrayList<>(); @@ -532,10 +532,10 @@ firstSelectTermDTO.setChildren(firstChildren); result.add(firstSelectTermDTO); return result; }else if (UserBaseConsts.UNIT_GRADE_2 == loginUnit.getUnitGrade()){ }else if (UserBaseConsts.UNIT_GRADE_2 == superiorUnit.getUnitGrade()){ // 区级 QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>(); ctUnitQueryWrapper.eq("parent_id", loginUnit.getId()); ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId()); List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper); // 定义市区直部门数组 List<SelectTermDTO> qzbmList = new ArrayList<>(); @@ -580,24 +580,24 @@ firstSelectTermDTO.setChildren(firstChildren); result.add(firstSelectTermDTO); return result; }else if (UserBaseConsts.UNIT_GRADE_3 == loginUnit.getUnitGrade()){ }else if (UserBaseConsts.UNIT_GRADE_3 == superiorUnit.getUnitGrade()){ // 镇街 // 查询镇街部门数组 QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>(); ctDeptQueryWrapper.eq("unit_id", loginUnit.getId()); ctDeptQueryWrapper.eq("unit_id", superiorUnit.getId()); List<CtDept> deptList = ctDeptService.list(ctDeptQueryWrapper); List<SelectTermDTO> zjbmList = new ArrayList<>(); for (CtDept ctDept: deptList){ SelectTermDTO unitSelectTerm = new SelectTermDTO(); unitSelectTerm.setValue(ctDept.getId()); unitSelectTerm.setLabel(ctDept.getName()); unitSelectTerm.setParentId(loginUnit.getId()); unitSelectTerm.setParentId(superiorUnit.getId()); unitSelectTerm.setCheckable(true); zjbmList.add(unitSelectTerm); } // 查询村社数组 QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>(); ctUnitQueryWrapper.eq("parent_id", loginUnit.getId()); ctUnitQueryWrapper.eq("parent_id", superiorUnit.getId()); List<CtUnit> ctUnitList = mapper.selectList(ctUnitQueryWrapper); List<SelectTermDTO> csList = new ArrayList<>(); for (CtUnit ctUnit: ctUnitList){ @@ -611,10 +611,6 @@ // 封装返回数据 List<SelectTermDTO> result = new ArrayList<>(); // 创建第一级 SelectTermDTO firstSelectTermDTO = new SelectTermDTO(); firstSelectTermDTO.setValue(loginUser.getUnitId()); firstSelectTermDTO.setLabel(loginUser.getUnitName()); firstSelectTermDTO.setCheckable(false); List<SelectTermDTO> firstChildren = new ArrayList<>(); // 村社 SelectTermDTO zjbmSelectTermDTO = new SelectTermDTO(); @@ -631,8 +627,7 @@ csSelectTermDTO.setChildren(csList); firstChildren.add(csSelectTermDTO); // 第一级子级 firstSelectTermDTO.setChildren(firstChildren); result.add(firstSelectTermDTO); result.addAll(firstChildren); return result; }else { return new ArrayList<>(); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -363,7 +363,7 @@ <!-- 查询任务数量 --> <select id="countTaskList" resultMap="FrontPageCountResult"> select count(case when node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP' then id end) as waitDisp, count(case when (node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP') and sign_status != 1 then id end) as waitDisp, count(case when sign_status = 1 then id end) as waitSign, count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL') and sign_status != 1 then id end) as waitAccept, count(case when node_id = 'BLFK' then id end) as Processing @@ -407,6 +407,7 @@ where cande_unit_id = #{terms.candeUnitId} and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP') and sign_status != 1 and t1.delete_status = 0 and t1.status = #{terms.status} <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''"> @@ -427,6 +428,7 @@ where t1.cande_unit_id = #{terms.candeUnitId} and (t1.node_id = 'ZJ_DFP' or t1.node_id = 'QJ_DFP' or t1.node_id = 'SJ_DFP') and sign_status != 1 and t1.delete_status = 0 and t1.status = #{terms.status} <if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''"> dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/SortUtilDTO.java
@@ -1,8 +1,10 @@ package cn.huge.module.cases.domain.dto; import cn.huge.module.sys.dto.FileTypeInfoBaseDTO; import lombok.Data; import java.util.Date; import java.util.List; @Data public class SortUtilDTO { @@ -18,4 +20,8 @@ * 类型（用于前端识别） */ private String type; /** * 根据类型分类的附件信息 */ private List<FileTypeInfoBaseDTO> fileList; } dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -227,6 +227,11 @@ caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1); caseInfo.setCreateTime(nowDate); caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0); //默认添加省市 caseInfo.setQueProv("19"); caseInfo.setQueProvName("广东省"); caseInfo.setQueCity("1601"); caseInfo.setQueCityName("广州市"); // 删除草稿案件 if(1 == registerSaveDTO.getIsDraft() ){ draftInfoService.removeDraftInfo(registerSaveDTO.getId()); @@ -561,6 +566,12 @@ caseInfo.setInputUserId(loginUser.getId()); caseInfo.setInputUserName(loginUser.getTrueName()); caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1); //默认添加省市 caseInfo.setQueProv("19"); caseInfo.setQueProvName("广东省"); caseInfo.setQueCity("1601"); caseInfo.setQueCityName("广州市"); caseInfo.setCreateTime(nowDate); caseInfo.setUpdateTime(nowDate); caseInfo.setVisitTime(nowDate); dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -34,6 +34,7 @@ import cn.huge.module.flow.service.FlowInfoService; import cn.huge.module.mediate.constant.*; import cn.huge.module.sys.constant.SyTimeEnum; import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -644,6 +645,7 @@ if(frontPageListDTO.getCaseId().equals(unfold.getId())){ frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName()); frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName()); frontPageListDTO.setManager(unfold.getMediator()); } } } @@ -742,12 +744,31 @@ caseAssistApplyQueryWrapper.eq("case_id", caseId); List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper); List<SortUtilDTO> sortUtilDTOList = new ArrayList<>(); String ids = new String(); ids += caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.joining(",")); ids += caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.joining(",")); ids += caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.joining(",")); ids += caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.joining(",")); List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = new ArrayList<>(); if(StringUtils.isNotBlank(ids)){ Map terms = new HashMap(); terms.put("mainId", caseId); terms.put("ownerIds", "," + ids + ","); fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms); } for(CaseReturn caseReturn: caseReturnList){ SortUtilDTO sortUtilDTO = new SortUtilDTO(); sortUtilDTO.setObject(caseReturn); sortUtilDTO.setDate(caseReturn.getCreateTime()); sortUtilDTO.setType("回退申请"); sortUtilDTOList.add(sortUtilDTO); for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){ if(caseReturn.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList()); } } } for(CaseAppear caseAppear: caseAppearList){ SortUtilDTO sortUtilDTO = new SortUtilDTO(); @@ -755,6 +776,11 @@ sortUtilDTO.setDate(caseAppear.getCreateTime()); sortUtilDTO.setType("上报申请"); sortUtilDTOList.add(sortUtilDTO); for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){ if(caseAppear.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList()); } } } for(CaseWindupApply caseWindupApply: caseWindupApplyList){ SortUtilDTO sortUtilDTO = new SortUtilDTO(); @@ -762,6 +788,11 @@ sortUtilDTO.setDate(caseWindupApply.getCreateTime()); sortUtilDTO.setType("结案申请"); sortUtilDTOList.add(sortUtilDTO); for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){ if(caseWindupApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList()); } } } for(CaseAssistApply caseAssistApply: caseAssistApplyList){ SortUtilDTO sortUtilDTO = new SortUtilDTO(); @@ -769,6 +800,11 @@ sortUtilDTO.setDate(caseAssistApply.getCreateTime()); sortUtilDTO.setType("联合处置申请"); sortUtilDTOList.add(sortUtilDTO); for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){ if(caseAssistApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList()); } } } sortUtilDTOList.sort(Comparator.comparing(SortUtilDTO::getDate)); List<Object> resultList = new ArrayList<>(); @@ -777,8 +813,8 @@ } return resultList; }catch (Exception e) { log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e); throw new ServiceException("CaseTaskService.pageMyTaskQs", e); log.error("[CaseTaskService.listMyApplyRecord]调用失败，异常信息：" + e, e); throw new ServiceException("CaseTaskService.listMyApplyRecord", e); } }
@@ -180,6 +180,11 @@ CasedraftInfo casedraftInfo = new CasedraftInfo(); BeanUtils.copyProperties(draftRegisterSaveDTO, casedraftInfo); //默认添加省市 casedraftInfo.setQueProv("19"); casedraftInfo.setQueProvName("广东省"); casedraftInfo.setQueCity("1601"); casedraftInfo.setQueCityName("广州市"); casedraftInfo.setCustId(loginUser.getCustId()); casedraftInfo.setUpdateTime(nowDate); // 常规登记-保存当事人
