fix(统计-追溯):bug

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-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>()