评定列表

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyMapper.java

@@ -23,7 +23,6 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * 查询待遇申请管理列表
      *
      * @param organIds     机构代码集合
-     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param provincial   省
      * @param city         市
      * @param area         区

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -20,7 +20,7 @@
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
-        (select DISTRICT_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet,
+        (select STREET_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet,
         disable.end_time endTime,
         emp.real_name empRealName,
         emp.tel empTel,
@@ -86,17 +86,17 @@
         SELECT report.REPORT_ID                                                                                       reportId,
                task.APR_ORGAN_ID                                                                                      organId,
                organ.ORGAN_NAME                                                                                       organName,
-               (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
-               (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_CITY = dis.DISTRICT_CODE)       districPity,
-               (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE)       districtArea,
+               (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
+               (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_CITY = dis.DISTRICT_CODE)       districPity,
+               (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE)       districtArea,
                info.REAL_NAME                                                                                         realName,
                info.CERTI_CODE                                                                                        certiCode,
                (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID)                 diseTypeF,
                (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID)                 diseTypeS,
                info.tel                                                                                               tel,
-               (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_PROVINCIAL = dis.DISTRICT_CODE)     acptProvincial,
-               (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_CITY = dis.DISTRICT_CODE)           acptCity,
-               (SELECT DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_AREA = dis.DISTRICT_CODE)           acptArea,
+               (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_PROVINCIAL = dis.DISTRICT_CODE)     acptProvincial,
+               (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_CITY = dis.DISTRICT_CODE)           acptCity,
+               (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_AREA = dis.DISTRICT_CODE)           acptArea,
                lev.RISK_LEVEL                                                                                         riskLevel,
                report.EFF_TIME                                                                                        effTime
         FROM ch_apr_report report