fix:sql调整

xusd

2 days ago 067afa6387c75cc94d79ec9db9544a0b9db437a4

fix:sql调整

 dyh-service/dyh-base/src/main/java/cn/huge/module/cust/constant/UserBaseConsts.java

@@ -91,6 +91,7 @@
    public static final int UNIT_TYPE_106 = 106;
    public static final int UNIT_TYPE_107 = 107;
    public static final int UNIT_TYPE_108 = 108;
    public static final int UNIT_TYPE_109 = 109;
    public static final int UNIT_TYPE_199 = 199;
    public static final int UNIT_TYPE_201 = 201;
    public static final int UNIT_TYPE_202 = 202;

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/dao/mapper/xml/AnalysisMapper.xml

@@ -930,7 +930,6 @@

    <sql id="statisticsCirculation-wherePart">
        and t3.sync_status = 0
        and t3.input_way = 1
        <if test="terms != null">
            <if test="terms.queProv != null and terms.queProv !=''">
                and t1.prov = #{terms.queProv}
@@ -1001,7 +1000,7 @@
        ) s
        WHERE rn = 1
        group by s.case_id) t4 on t2.id = t4.case_id
        where t1.delete_status = 0 and t3.delete_status = 0
        where t3.delete_status = 0
        <include refid="statisticsCirculation-wherePart"/>
        group by
        <include refid="groupPart"/>
@@ -1594,7 +1593,7 @@
        ) s
        WHERE rn = 1
        group by s.case_id) t4 on t2.id = t4.case_id
        where t1.delete_status = 0 and t3.delete_status = 0
        where t3.delete_status = 0
        <if test="terms.caseStatus != null and terms.caseStatus == 1">
            and t3.zxsl_status = 1
        </if>

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java

@@ -902,10 +902,29 @@
                                lfdjAssist.setNodeShowName("来访登记");
                                lfdjAssist.setHandleUserName(caseInfo.getInputUserName());
                                lfdjAssist.setHandleUnitName(caseInfo.getInputUnitName());
                            } else {
                            }
                            if (CaseBaseConstsEnum.CASE_CANAL_2.getIndex().equals(caseInfo.getCanal())) {
                                lfdjAssist.setNodeShowName(caseInfo.getCanalName());
                                lfdjAssist.setHandleUnitName(caseInfo.getInputUserName() + "（当事人）");
                            }
                            if (CaseBaseConstsEnum.CASE_CANAL_3.getIndex().equals(caseInfo.getCanal())) {
                                lfdjAssist.setNodeShowName("自行排查");
                                lfdjAssist.setHandleUserName(caseInfo.getInputUserName());
                                lfdjAssist.setHandleUnitName(caseInfo.getInputUnitName());
                                if (CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex().equals(caseInfo.getCanalSecond())) {
                                    lfdjAssist.setHandleUserName("系统自动获取");
                                    lfdjAssist.setHandleUnitName(caseInfo.getCanalSecondName());
                                }
                                if (CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex().equals(caseInfo.getCanalSecond())) {
                                    lfdjAssist.setHandleUserName("系统自动获取");
                                    lfdjAssist.setHandleUnitName(caseInfo.getCanalSecondName());
                                }
                            }
                            if (CaseBaseConstsEnum.CASE_CANAL_4.getIndex().equals(caseInfo.getCanal())) {
                                lfdjAssist.setNodeShowName("协同推送");
                                lfdjAssist.setHandleUserName("系统自动获取");
                                lfdjAssist.setHandleUnitName(caseInfo.getCanalSecondName());
                            }
                            lfdjAssist.setTaskType(SHOW_TASK_TYPE_1);
                            lfdjAssist.setStatus(CaseTaskConsts.TASK_STATUS_2);
                            lfdjAssist.setHandleTime(caseInfo.getCreateTime());