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

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

@@ -240,7 +240,7 @@
             </if>
             <choose>
                 <when test="identity == 'apply'">
-                    and res.application_unit_code = #{jyjcInspectionResultModel.companyCode}
+                    and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
                 </when>
                 <when test="identity == 'receive'">
                     and res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode}
@@ -257,7 +257,7 @@
                     and (res.biz_type in ('firstinspect','entrust', 'detection') or  res.biz_type = 'useUnitEntry')
                 </when>
                 <when test="companyType == '安装改造维修单位'">
-                    and res.biz_type = 'supervise'
+                    and res.biz_type in ('supervise','detection')
                 </when>
                 <when test="companyType == '检验机构'">
                     and res.biz_type != 'detection'

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

@@ -216,6 +216,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             if (ResultStatusEnum.YES_RESULT.getCode().equals(v.getResultStatus())) {
                 v.setResultStatusName(ResultStatusEnum.YES_RESULT.getName());
             }
+            v.setCompanyCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
             v.setSourceResult(ResultTypeEnum.getNameByCode(v.getResultType()));
             v.setIdentity(identity);
             v.setUseInnerCode("null".equals(v.getUseInnerCode()) ? "" : v.getUseInnerCode());