1.测试bug修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/CommonConstants.java

@@ -15,4 +15,10 @@ public class CommonConstants {
     public static final String OPEN_APPLICATION_SEQ_KEY = "OPEN_APPLICATION_SEQ";
 
     public static final String APPLICATION_SEQ_PREFIX = "JY";
+
+    /**
+     * 无默认机构时字符串-规则必须
+     */
+    public static final String NONE_DEFAULT_CODE = "none";
+
 }

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

@@ -107,10 +107,10 @@
             </if>
 
             <if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
-                and tzjia.inspection_unit_name like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+                and tzjia.inspection_unit_name like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%')
             </if>
             <if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
-                and tzjia.application_unit_name like concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%'))
+                and tzjia.application_unit_name like concat('%',#{jyjcInspectionApplicationModel.applicationUnitName},'%')
             </if>
             <if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
                 and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'

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

@@ -113,38 +113,32 @@
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
                 and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
             </if>
-            <if test="jyjcInspectionResultModel.applicationUnitCode != '' and jyjcInspectionResultModel.applicationUnitCode != null">
-                and res.application_unit_code = #{jyjcInspectionResultModel.applicationUnitCode}
-            </if>
-            <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
-                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
-            </if>
-            <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
-                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
+            <if test="jyjcInspectionResultModel.applicationDate!=null">
+                AND res.application_date = #{jyjcInspectionResultModel.applicationDate}
             </if>
-            <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
-                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
+            <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
+                and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
             </if>
-            <if test="jyjcInspectionResultModel.equipUnicode != '' and jyjcInspectionResultModel.equipUnicode != null">
-                and res.equip_unicode like concat('%',#{jyjcInspectionResultModel.equipUnicode},'%')
+            <if test="jyjcInspectionResultModel.applicationUnitName != '' and jyjcInspectionResultModel.applicationUnitName != null">
+                and res.application_unit_name like concat('%',#{jyjcInspectionResultModel.applicationUnitName},'%')
             </if>
             <if test="jyjcInspectionResultModel.equList != '' and jyjcInspectionResultModel.equList != null">
                 and ibjri.equ_list = #{jyjcInspectionResultModel.equList}
             </if>
-            <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
-                and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
+            <if test="jyjcInspectionResultModel.supervisoryCode != '' and jyjcInspectionResultModel.supervisoryCode != null">
+                and res.supervisory_code like concat('%',#{jyjcInspectionResultModel.supervisoryCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.applicationDate!=null">
-                AND res.application_date = #{jyjcInspectionResultModel.applicationDate}
+            <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
+                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
-                and ibjui.use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
+            <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
+                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
-                and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
+            <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
+                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.applicationUnitName != '' and jyjcInspectionResultModel.applicationUnitName != null">
-                and bei1.use_unit like concat('%',#{jyjcInspectionResultModel.applicationUnitName},'%')
+            <if test="jyjcInspectionResultModel.inspectionUnitName != '' and jyjcInspectionResultModel.inspectionUnitName != null">
+                and res.inspection_unit_name like concat('%',#{jyjcInspectionResultModel.inspectionUnitName},'%')
             </if>
             <choose>
                 <when test="identity == 'apply'">

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.action;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jyjc.api.common.CommonConstants;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationNoAcceptLog;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.InspectionCompanyType;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.LicenceTypeEnum;
@@ -159,22 +160,20 @@ public class RuleActionHandler {
 
     private List<TzBaseEnterpriseInfoDto> getInspectionUnitListForNoAccept2(List<TzBaseUnitLicence> unitLicenceList, Boolean isMatchArea, InspectionEquipInfo inspectionEquipInfo, String openBizType, String defaultInspectionCode, String legalInspectionCodes, String inspectionCompanyType, Boolean isCanNoAccept) {
         List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
-        if(inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())){
+        if (inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())) {
             // 是否进行属地过滤
             String areaCode = isMatchArea ? inspectionEquipInfo.getAreaCode() : "";
             // 所有符合资质的单位code
             Set<String> unitCodes = unitLicenceList.stream().map(TzBaseUnitLicence::getUnitCode).collect(Collectors.toSet());
-            // 1.按照资质 + 开通区域，进行单位的筛选
+            // 按照资质 + 开通区域，进行单位的筛选
             if (unitCodes.size() > 0) {
                 matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType);
                 // 返回下一步是否可不予返回，供下一节点审核时显示判断是否显示不予受理按钮，在提交时数据会写入到主表：true-必须处理，false-可不予受理
                 this.setIsCanNoAccept(matchEnterpriseInfos, isCanNoAccept);
             }
-            // 2.去掉已经不予受理的机构
-            List<String> unitCodesList = getNoAcceptHistoryUnit(inspectionEquipInfo);
-            matchEnterpriseInfos = matchEnterpriseInfos.stream().filter(u-> !unitCodesList.contains(u.getUseCode())).collect(Collectors.toList());
-            // 3.未空时显示默认机构(兜底机构)，只匹配开通的业务类型（检验还是检测）且不匹配开通区域且不可不予受理操作
-            if(matchEnterpriseInfos.isEmpty()){
+            // 未空时显示默认机构(兜底机构)，只匹配开通的业务类型（检验还是检测）且不匹配开通区域且不可不予受理操作, 预留功能
+            if (matchEnterpriseInfos.isEmpty() && StringUtils.isNotEmpty(defaultInspectionCode) && !defaultInspectionCode.equals(CommonConstants.NONE_DEFAULT_CODE)) {
+                log.info("将匹配兜底机构:{}", defaultInspectionCode);
                 matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(Arrays.asList(defaultInspectionCode.split(","))), "", openBizType);
                 // 返回下一步是否可不予返回，供下一节点审核时显示判断是否显示不予受理按钮，在提交时数据会写入到主表：true-必须处理，false-可不予受理
                 this.setIsCanNoAccept(matchEnterpriseInfos, true);
@@ -232,14 +231,15 @@ public class RuleActionHandler {
 
     private List<TzBaseEnterpriseInfoDto> getInspectionUnitListForFirstCommit2(List<TzBaseUnitLicence> unitLicenceList, Boolean isMatchArea, InspectionEquipInfo inspectionEquipInfo, String openBizType, String defaultInspectionCode, String legalInspectionCodes, Boolean isMustAccept, String inspectionCompanyType) {
         List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
-        if(inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())){
+        if (inspectionCompanyType.equals(InspectionCompanyType.ALL.getCode())) {
             matchEnterpriseInfos = getInspectionUnitListForAll(unitLicenceList, isMatchArea, inspectionEquipInfo, openBizType, defaultInspectionCode, legalInspectionCodes, isMustAccept);
-        }if(inspectionCompanyType.equals(InspectionCompanyType.LEGAL.getCode())){
+        }
+        if (inspectionCompanyType.equals(InspectionCompanyType.LEGAL.getCode())) {
             // 目前未使用到可替换 firstInspectionOrgMatchAction 业务
             matchEnterpriseInfos = getInspectionUnitListForLegal(unitLicenceList, isMatchArea, inspectionEquipInfo, openBizType, defaultInspectionCode, legalInspectionCodes, isMustAccept);
-        } else if(inspectionCompanyType.equals(InspectionCompanyType.THIRD.getCode())){
+        } else if (inspectionCompanyType.equals(InspectionCompanyType.THIRD.getCode())) {
             // TODO 待实现
-            log.warn("{}类型:未实现",InspectionCompanyType.THIRD.getName());
+            log.warn("{}类型:未实现", InspectionCompanyType.THIRD.getName());
         }
         return matchEnterpriseInfos;
     }
@@ -277,7 +277,7 @@ public class RuleActionHandler {
         // 所有符合单位的code
         Set<String> unitCodes = unitLicenceList.stream().map(TzBaseUnitLicence::getUnitCode).collect(Collectors.toSet());
         List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
-        if(unitCodes.size() > 0){
+        if (unitCodes.size() > 0) {
             matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType);
             // 返回下一步是否可不予返回，供下一节点审核时显示判断是否显示不予受理按钮，在提交时数据会写入到主表：true-必须处理，false-可不予受理
             this.setIsCanNoAccept(matchEnterpriseInfos, isCanNoAccept);
@@ -361,6 +361,5 @@ public class RuleActionHandler {
     }
 
 
-
 }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/TouchRuleEventListener.java

@@ -40,9 +40,6 @@ public class TouchRuleEventListener implements ApplicationListener<TouchRuleEven
     }
 
     private void touchRuleWithApi(InspectionEquipInfo inspectionEquipInfo) {
-        if (log.isInfoEnabled()) {
-            log.info("发送规则的消息对象:{}", toJSONString(inspectionEquipInfo));
-        }
         try {
             RequestContext.setToken(amosRequestContext.getToken());
             RequestContext.setAppKey(amosRequestContext.getAppKey());

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

@@ -291,7 +291,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         info.setInspectStaffCode(model.getInspector());
         info.setInspectReport(jybgFile.getAttachmentUrl());
         info.setInspectConclusion(model.getInspectionConclusion());
-        info.setProblemRemark(model.getNonConformance());
+        // json字段暂时注释
+//        info.setProblemRemark(model.getNonConformance());
         info.setNextInspectDate(model.getNextInspectionDate());
         info.setSequenceCode(model.getEquipUnicode());
         info.setInspectOrgCode(model.getInspectionUnitCode());

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

@@ -486,6 +486,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         LambdaQueryWrapper<TzsUserInfo> userInfoQueryWrapper = new LambdaQueryWrapper<>();
         userInfoQueryWrapper.eq(TzsUserInfo::getUnitCode, unitCode);
         userInfoQueryWrapper.eq(BaseEntity::getIsDelete, false);
+        this.castPersonType2Post(userInfoQueryWrapper, openBizType);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
             List<TzsUserInfoVo> tzsUserInfoVos = userInfos.stream().map(userInfo -> {