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

@@ -156,4 +156,14 @@ public class JyjcInspectionResultModel extends BaseModel {
      * 校验检验系统唯一流水号,排查问题，跟踪问题使用
      */
     private String traceId;
+
+    /**
+     * 当前人的公司code
+     */
+    private String companyCode;
+
+    /**
+     * 身份标识（前端行内权限按钮控制用）
+     */
+    private String identity;
 }

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

@@ -85,6 +85,9 @@
             <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 use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
+            </if>
             <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
                 and use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
             </if>
@@ -108,13 +111,13 @@
             </if>
             <choose>
                 <when test="identity == 'apply'">
-                    and use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
+                    and res.application_unit_code = #{jyjcInspectionResultModel.companyCode}
                 </when>
                 <when test="identity == 'receive'">
-                    and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
+                    and res.inspection_unit_code = #{jyjcInspectionResultModel.companyCode}
                 </when>
                 <when test="identity == 'all'">
-                    and (use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%') or es.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode})
+                    and (res.application_unit_code = #{jyjcInspectionResultModel.companyCode} or es.inspection_unit_code = #{jyjcInspectionResultModel.companyCode})
                 </when>
                 <otherwise>
                     1 = 2

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

@@ -128,6 +128,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         }
         // 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
         String identity= this.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
+        model.setCompanyCode(reginParams.getCompany().getCompanyCode());
         Page<JyjcInspectionResultModel> resultPage = resultMapper.selectForPage(page, model, identity);
         resultPage.getRecords().forEach(v -> {
             if (ResultStatusEnum.NO_RESULT.getCode().equals(v.getResultStatus())) {
@@ -136,6 +137,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             if (ResultStatusEnum.YES_RESULT.getCode().equals(v.getResultStatus())) {
                 v.setResultStatusName(ResultStatusEnum.YES_RESULT.getName());
             }
+            v.setIdentity(identity);
         });
         return resultPage;
     }