Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/SafetyProblemTracingDto.java

@@ -76,6 +76,9 @@ public class SafetyProblemTracingDto extends BaseDto {
     @ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
     private String regionCode;
 
+    @ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
+    private String cityCode;
+
     @ApiModelProperty(value = "问题状态（0未处理、1已处理）")
     private String problemStatus;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -1208,7 +1208,7 @@
         SELECT
         a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as
         receiveOrgName,application_date as createDate,accept_date as handleDate,
-        CASE when a.notice_status = 0 then '已完成'
+        CASE when a.status = 0 then '已完成'
         ELSE '进行中'
         END as status
         FROM
@@ -1264,7 +1264,7 @@
         union all
         SELECT
             a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
-        CASE when a.notice_status = 0 then '已完成'
+        CASE when a.status = 0 then '已完成'
         ELSE '进行中'
         END as status
         FROM
@@ -1273,7 +1273,7 @@
         where
             a.inspection_unit_code= b.use_unit_code
           and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
-          a.inspection_type = 'DQJY'
+          AND a.inspection_type = 'DQJY'
           <if test="dto.beginDate != null and dto.beginDate != ''">
             and date_ge(CAST(a.accept_date as date),#{dto.beginDate})
           </if>
@@ -1627,7 +1627,7 @@
     <select id="countBizFinishedNumForDPListJDJY" resultType="java.util.Map">
         SELECT
         a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
-        CASE when a.notice_status = 0 then '已完成'
+        CASE when a.status = 0 then '已完成'
         ELSE '进行中'
         END as status
         FROM
@@ -1683,7 +1683,7 @@
     <select id="countBizFinishedNumForDPListDQJY" resultType="java.util.Map">
         SELECT
         a.sequence_nbr as sequenceNbr,application_unit_name as unitName,inspection_unit_name as receiveOrgName,application_date as createDate,accept_date as handleDate,
-        CASE when a.notice_status = 0 then '已完成'
+        CASE when a.status = 0 then '已完成'
         ELSE '进行中'
         END as status
         FROM

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingServiceImpl.java

@@ -65,13 +65,12 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
     }
 
     public Page<SafetyProblemTracingDto> getProblemRecords(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
-        String orgCode = getAndSetOrgCode(problemModel.getRegionCode());
+        String orgCode = getAndSetOrgCode(problemModel.getCityCode());
         if (ObjectUtils.isEmpty(orgCode)){
             return new Page<>();
         }
         problemModel.setGoverningBodyOrgCode(orgCode);
         // 使用orgCode过滤
-        problemModel.setRegionCode(null);
         // 将单位类型从code转化为value
         if (!ValidationUtil.isEmpty(problemModel.getPrincipalUnitType())){
             Collection<DataDictionary> unitTypeList = iDataDictionaryService.list(new QueryWrapper<DataDictionary>()