dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/controller/AnalysisWebController.java
@@ -13,6 +13,7 @@ import cn.huge.module.cust.dto.CtUserDTO; import com.google.common.collect.Maps; import dm.jdbc.util.StringUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -22,10 +23,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; /** @@ -573,12 +571,32 @@ terms.put("caseStatus", caseStatus); } if(StringUtils.isNotBlank(regionCode) && StringUtils.isNotBlank(regionName)){ if(regionName.matches(".*市")){ terms.put("queCity", regionCode); if(regionName.matches(".*社区") || regionName.matches(".*村")){ terms.put("queVillage", regionCode); }else if(regionName.matches(".*街道") || regionName.matches(".*街") || regionName.matches(".*镇")){ terms.put("queRoad", regionCode); }else if(regionName.matches(".*区")){ terms.put("queArea", regionCode); }else if(regionName.contains("街道") || regionName.matches(".*街") || regionName.matches(".*镇")){ terms.put("queRoad", regionCode); }else if(regionName.matches(".*市")){ terms.put("queCity", regionCode); }else if(regionName.matches("本级")){ //把regionCode根据#分割成数组 String[] regionCodeArr = regionCode.split("#"); if(CollectionUtils.isNotEmpty(Arrays.asList(regionCodeArr))){ terms.put(regionCodeArr[0], regionCodeArr[1]); if(StringUtils.isNotBlank(regionName)){ if(terms.containsKey("queRoad")){ terms.put("unitGrade", "3"); }else if(terms.containsKey("queArea")){ terms.put("unitGrade", "2"); }else if(terms.containsKey("queCity")){ terms.put("unitGrade", "1"); } } } } } Sort sort = Sort.by(Sort.Direction.DESC, "t3.create_time"); dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml
@@ -1368,6 +1368,10 @@ level = 3 and parent_id = #{terms.queArea} </if> <if test="terms.queRoad != null and terms.queRoad !=''"> level = 4 and parent_id = #{terms.queRoad} </if> ORDER BY level ASC,create_time ASC </select> @@ -1451,6 +1455,9 @@ and t4.handle_result = 3 and t4.node_id in ('ZJ_DFP', 'QJ_DFP', 'SJ_DFP', 'DFP', 'QJ_DSL', 'SJ_DSL', 'DSL', 'ZJ_DSL') </if> <if test="terms.unitGrade != null and terms.unitGrade !=''"> and t1.unit_grade = #{terms.unitGrade} </if> <include refid="statisticsCirculation-wherePart"/> </select> @@ -1497,6 +1504,9 @@ and t4.handle_result = 3 and t4.node_id in ('ZJ_DFP', 'QJ_DFP', 'SJ_DFP', 'DFP', 'QJ_DSL', 'SJ_DSL', 'DSL', 'ZJ_DSL') </if> <if test="terms.unitGrade != null and terms.unitGrade !=''"> and t1.unit_grade = #{terms.unitGrade} </if> <include refid="statisticsCirculation-wherePart"/> <if test="page.sort != null"> <foreach collection="page.sort" item="s" index="index" separator="," open="order by "> dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/service/AnalysisService.java
@@ -927,6 +927,17 @@ statisticsCirculationDTO.setLzl(Double.parseDouble(df.format(lzl))); statisticsCirculationDTO.setLzz((int) lzz); BeanUtils.copyProperties(statisticsCirculationDTO, statisticsCirculationDTONew); if("本级".equals(region)){ if(terms.containsKey("queRoad")){ statisticsCirculationDTO.setGroupCode("queRoad#"+terms.get("queRoad").toString()); }else if(terms.containsKey("queArea")){ statisticsCirculationDTO.setGroupCode("queArea#"+terms.get("queArea").toString()); }else if(terms.containsKey("queCity")){ statisticsCirculationDTO.setGroupCode("queCity#"+terms.get("queCity").toString()); }else if(terms.containsKey("queProv")){ statisticsCirculationDTO.setGroupCode("queProv"+terms.get("queProv").toString()); } } } } statisticsCirculationDTONew.setGroupName(region); @@ -949,6 +960,17 @@ double lzl = (lzz + lzsl) / zdj * 100; statisticsCirculationDTO.setLzl(Double.parseDouble(df.format(lzl))); statisticsCirculationDTO.setLzz((int) lzz); if("本级".equals(region)){ if(terms.containsKey("queRoad")){ statisticsCirculationDTO.setGroupCode("queRoad#"+terms.get("queRoad").toString()); }else if(terms.containsKey("queArea")){ statisticsCirculationDTO.setGroupCode("queArea#"+terms.get("queArea").toString()); }else if(terms.containsKey("queCity")){ statisticsCirculationDTO.setGroupCode("queCity#"+terms.get("queCity").toString()); }else if(terms.containsKey("queProv")){ statisticsCirculationDTO.setGroupCode("queProv#"+terms.get("queProv").toString()); } } } } if (flag) { dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -846,7 +846,7 @@ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex()) || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex()) || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex())) { webCaseFlowDTO.setStatusName("待受理"); webCaseFlowDTO.setStatusName("待分派"); } // 受理节点 if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex()) dyh-service/dyh-sys/src/main/java/cn/huge/module/kind/service/SyRegionService.java
@@ -449,7 +449,7 @@ } } } else if (unitGrade.equals(3)) { SyRegion roadSyRegion = mapper.selectById(ctUnitDTO.getArea()); SyRegion roadSyRegion = mapper.selectById(ctUnitDTO.getRoad()); AreaBO roadaBO = new AreaBO(); roadaBO.setParentId("root"); roadaBO.setLabel(roadSyRegion.getName());
