Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -163,6 +163,9 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     private String instanceId;
 
+    @ApiModelProperty(value = "是否已经进行计划排期")
+    private Boolean isExistPlanData;
+
     public String getProcessInstanceId() {
         return this.instanceId != null ? this.instanceId : this.processInstanceId;
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -69,6 +69,9 @@
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         SELECT
         tzjia.*,
+        case
+        when tzjia.plan_data<![CDATA[<>]]> '' then TRUE
+        else false END as isExistPlanData,
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
         (SELECT name FROM "tz_equipment_category" ca where ca.code = tzjia.equip_classify)  AS equipClassify,

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

@@ -98,7 +98,7 @@ public class RuleActionHandler {
     }
 
     private String getArea(String record) {
-        UseInfo equipUseInfo = useInfoMapper.selectOne(Wrappers.<UseInfo>lambdaQuery().select(UseInfo::getCity).eq(UseInfo::getRecord, record));
+        UseInfo equipUseInfo = useInfoMapper.selectOne(Wrappers.<UseInfo>lambdaQuery().select(UseInfo::getCity,UseInfo::getCounty).eq(UseInfo::getRecord, record));
         if (equipUseInfo == null) {
             return "";
         }

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

@@ -463,8 +463,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             currentApplicationUnitCode = companyCode;
             currentInspectionUnitCode = companyCode;
         }
-        Page<JyjcInspectionApplicationModel> resultPage = this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId);
-        return resultPage;
+        return this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId);
     }
 
     private String getCompanyIdentityByType(String companyType) {