fix(检验检测): 使用单位自行录入检验结果

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

@@ -55,4 +55,9 @@ public interface BizCommonConstant {
     String JS_YFP_YQR = "66192";
 
     String FACTORY_NUM = "FACTORY_NUM";
+
+    /**
+     * 检验类型：制造监督检验
+     */
+    String INSPECT_TYPE_ZZ = "ZZJDJY";
 }

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

@@ -254,10 +254,10 @@
             </choose>
             <choose>
                 <when test="companyType == '使用单位'">
-                    and res.biz_type in ('firstinspect','entrust', 'detection')
+                    and (res.biz_type in ('firstinspect','entrust', 'detection') or  res.result_type = 'useUnitEntry')
                 </when>
                 <when test="companyType == '安装改造维修单位'">
-                    and res.biz_type = 'supervise'
+                    and res.biz_type in 'supervise'
                 </when>
                 <when test="companyType == '检验机构'">
                     and res.biz_type != 'detection'
@@ -317,7 +317,7 @@
             </choose>
             <choose>
                 <when test="companyType == '使用单位'">
-                    and res.biz_type in ('firstinspect','entrust', 'detection')
+                    and (res.biz_type in ('firstinspect','entrust', 'detection') or  res.result_type = 'useUnitEntry')
                 </when>
                 <when test="companyType == '安装改造维修单位'">
                     and res.biz_type = 'supervise'

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

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.dto.DynamicColumnDto;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jyjc.api.common.BizCommonConstant;
 import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PipelineInspectionResultDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PipelineResultItemDto;
@@ -767,6 +768,8 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                         .setIsExistNc(null)
                         .setSafetyLevel(Objects.toString(equ.getOrDefault("safetyLevel", "")))
                         .setManageType("single");
+                // 制造监督检验系统没管,归到监督检验
+                jyjcInspectionResult.setBizType(BizCommonConstant.INSPECT_TYPE_ZZ.equals(jyjcInspectionResult.getInspectionType()) ? "supervise" : jyjcInspectionResult.getBizType());
                 jyjcInspectionResult.setSequenceNbr(resSeq);
                 jyjcInspectionResult.setRecDate(new Date());
                 jyjcInspectionResult.setRecUserId(RequestContext.getExeUserId());