forked from gzzfw/backEnd/gz-dyh

zhouxiantao
2024-09-23 43729e4c8fa9b1f44bdbfd2ebe33092d0b109b22
纠纷态势-优化
2 files modified
8 ■■■■ changed files
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml 2 ●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java 6 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -337,7 +337,7 @@
                    and a.que_road = #{terms.queRoad}
                </if>
                <if test="terms.isArea != null and terms.isArea !=''">
                    and a.que_city is not null
                    and a.que_city is not null and a.que_area is not null and a.que_road is not null
                </if>
            </where>
        </if>
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1009,9 +1009,15 @@
        //事项来源
        terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
        CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
        if(ObjectUtils.isEmpty(oneSource)){
            oneSource = new CaseStatisticsSourceDTO();
        }
        oneSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
        terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
        CaseStatisticsSourceDTO twoSource = mapper.statisticsSource(terms);
        if(ObjectUtils.isEmpty(twoSource)){
            twoSource = new CaseStatisticsSourceDTO();
        }
        twoSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
        Integer sourceTotalNum = dellNull(oneSource.getCaseNum()) + dellNull(oneSource.getCaseNum());