Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -40,7 +40,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     Map<String, Object> getUserPhone(String name ,String companyCode);
 
 
-    Map<String, Object> equOnJgServiceOperationRecords(String record);
+    List<Map<String, Object>> equOnJgServiceOperationRecords(String record);
 
     /**
      * 统计指定设备流程中的引用次数（12个流程中，非待提交、非已撤回、非已驳回）

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -439,7 +439,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equOnJgServiceOperationRecords")
     @ApiOperation(httpMethod = "GET", value = "查询设备在jg业务中的记录", notes = "查询设备在jg业务中的记录")
-    public ResponseModel<Map<String, Object>> equOnJgServiceOperationRecords(@RequestParam(value = "record") String record) {
+    public ResponseModel<List<Map<String, Object>>> equOnJgServiceOperationRecords(@RequestParam(value = "record") String record) {
         return ResponseHelper.buildResponse(commonService.equOnJgServiceOperationRecords(record));
     }
 

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

@@ -91,7 +91,7 @@ public interface ICommonService {
     Map<String, Object> getUserPhone(String name);
 
 
-    Map<String, Object> equOnJgServiceOperationRecords(String record);
+    List<Map<String, Object>> equOnJgServiceOperationRecords(String record);
 
     /**
      * 执行流程时前置校验

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/CommonServiceImpl.java

@@ -540,7 +540,7 @@ public class CommonServiceImpl implements ICommonService {
      * @return
      */
     @Override
-    public Map<String, Object> equOnJgServiceOperationRecords(String record) {
+    public List<Map<String, Object>> equOnJgServiceOperationRecords(String record) {
         return commonMapper.equOnJgServiceOperationRecords(record);
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/action/RuleActionHandler.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.enums.LicenceTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.OpenBizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.TopicEnum;
 import com.yeejoin.amos.boot.module.jyjc.biz.rule.InspectionEquipInfo;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonserviceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseUnitLicence;
 import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
@@ -37,7 +36,6 @@ public class RuleActionHandler {
     private final EmqKeeper emqKeeper;
     private final TzBaseUnitLicenceMapper baseUnitLicenceMapper;
     private final TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
-    private final CommonserviceImpl commonserviceImpl;
     private final UseInfoMapper useInfoMapper;
     /**
      * 特殊独立的区县
@@ -46,12 +44,11 @@ public class RuleActionHandler {
 
 
     public RuleActionHandler(EmqKeeper emqKeeper, TzBaseUnitLicenceMapper baseUnitLicenceMapper,
-                             TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper, CommonserviceImpl commonserviceImpl,
+                             TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
                              UseInfoMapper useInfoMapper) {
         this.emqKeeper = emqKeeper;
         this.baseUnitLicenceMapper = baseUnitLicenceMapper;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
-        this.commonserviceImpl = commonserviceImpl;
         this.useInfoMapper = useInfoMapper;
     }
 
@@ -95,7 +92,7 @@ public class RuleActionHandler {
         List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(unitCodes, areaCode, openBizType);
         if (matchEnterpriseInfos.isEmpty()) {
             log.info("按照资质、区域未匹配到对应的单位、按照地市未匹配到单位，将返回全部单位");
-            return commonserviceImpl.getInspectionUnitList();
+            return tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(null, null, openBizType);
         }
         return matchEnterpriseInfos;
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -165,7 +165,7 @@
 		FROM
 			tz_base_enterprise_info info
 				inner JOIN tz_jyjc_opening_application tjoa ON info.use_code = tjoa.unit_code
-				AND status = '6616'
+				AND tjoa.status = '6616'
 		group by info.use_code
 	</select>
 
@@ -182,13 +182,13 @@
 			AND tjoa.status = '6616'
 			and tjoa.open_biz_type = #{openBizType}
 			<if test="list !=null and list.size()>0">
-				AND use_code in
+				AND info.use_code in
 				<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
 					#{item}
 				</foreach>
 			</if>
 			<if test="city != null and city != ''">
-				and detection_region like concat('%',#{city},'%')
+				and tjoa.detection_region like concat('%',#{city},'%')
 			</if>
 		group by info.use_code
 	</select>