refeat(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcOpeningApplicationMapper.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequestDto;
 import com.yeejoin.amos.boot.module.jyjc.api.vo.JyjcOpeningApplicationVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,7 +22,7 @@ import java.util.List;
 public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningApplication> {
 
     Page<JyjcOpeningApplicationModel> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
-                                                                       @Param("jyjcOpeningApplicationRequstDto") JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto,
+                                                                       @Param("jyjcOpeningApplicationRequestDto") JyjcOpeningApplicationRequestDto jyjcOpeningApplicationRequestDto,
                                                                        @Param("applyStartTime") String applyStartTime,
                                                                        @Param("currentUserId") String currentUserId,
                                                                        @Param("applyendTime") String applyendTime,

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

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
-import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-import java.util.List;
+import java.io.Serializable;
+
 @Data
-public class JyjcOpeningApplicationRequstDto {
+public class JyjcOpeningApplicationRequestDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "单位编码")
     private String unitCode;
 
-    @ApiModelProperty (value = "单位编码Name")
+    @ApiModelProperty(value = "单位编码Name")
     private String unitCodeName;
 
-    @ApiModelProperty (value = "检测区域名称（冗余）")
+    @ApiModelProperty(value = "检测区域名称（冗余）")
     private String detectionRegionName;
 
-    @ApiModelProperty (value = "申请单号")
+    @ApiModelProperty(value = "申请单号")
     private String applicationSeq;
 
-    @ApiModelProperty (value = "检验结果方式")
+    @ApiModelProperty(value = "检验结果方式")
     private String resultType;
 
-    @ApiModelProperty (value = "有效期至")
+    @ApiModelProperty(value = "有效期至")
     private String expiryDate;
 
-    @ApiModelProperty (value = "受理日期（接收日期）")
+    @ApiModelProperty(value = "受理日期（接收日期）")
     private String acceptDate;
 
-    @ApiModelProperty (value = "状态")
+    @ApiModelProperty(value = "状态")
     private String status;
 
-    @ApiModelProperty (value = "状态Name")
+    @ApiModelProperty(value = "状态Name")
     private String statusName;
 
-    @ApiModelProperty (value = "申请时间")
+    @ApiModelProperty(value = "申请时间")
     private String applyTime;
 
-    @ApiModelProperty (value = "supervision: 监管; enterprise: 企业")
+    @ApiModelProperty(value = "supervision: 监管; enterprise: 企业")
     private String type;
 
     @ApiModelProperty("开通业务类型")
     private String openBizType;
+
+    @ApiModelProperty("身份信息对应的开通业务类型")
+    private String openBizTypeIdentify;
 }

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

@@ -11,14 +11,14 @@
             tz_jyjc_opening_application a
         LEFT JOIN tz_base_enterprise_info tbei ON a.unit_code = tbei.use_code
         <where>
-            <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
-                and a.application_seq like concat('%',#{jyjcOpeningApplicationRequstDto.applicationSeq},'%')
+            <if test="jyjcOpeningApplicationRequestDto.applicationSeq != '' and jyjcOpeningApplicationRequestDto.applicationSeq != null">
+                and a.application_seq like concat('%',#{jyjcOpeningApplicationRequestDto.applicationSeq},'%')
             </if>
-            <if test="jyjcOpeningApplicationRequstDto.acceptDate != '' and jyjcOpeningApplicationRequstDto.acceptDate != null">
-                and a.accept_date = #{jyjcOpeningApplicationRequstDto.acceptDate}
+            <if test="jyjcOpeningApplicationRequestDto.acceptDate != '' and jyjcOpeningApplicationRequestDto.acceptDate != null">
+                and a.accept_date = #{jyjcOpeningApplicationRequestDto.acceptDate}
             </if>
-            <if test="jyjcOpeningApplicationRequstDto.status != '' and jyjcOpeningApplicationRequstDto.status != null">
-                and a.status = #{jyjcOpeningApplicationRequstDto.status}
+            <if test="jyjcOpeningApplicationRequestDto.status != '' and jyjcOpeningApplicationRequestDto.status != null">
+                and a.status = #{jyjcOpeningApplicationRequestDto.status}
             </if>
             <if test="applyendTime != '' and applyendTime != null">
                 and a.apply_time &lt;= #{applyendTime}
@@ -26,17 +26,18 @@
             <if test="applyStartTime != '' and applyStartTime != null">
                 and a.apply_time &gt;=#{applyStartTime}
             </if>
-            <if test="jyjcOpeningApplicationRequstDto.type == 'supervision'">
+            <if test="jyjcOpeningApplicationRequestDto.type == 'supervision'">
                 and (a.workflow_prostance_id <![CDATA[<>]]> '' OR a.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%' ))
             </if>
-            <if test="jyjcOpeningApplicationRequstDto.unitCode != '' and jyjcOpeningApplicationRequstDto.unitCode != null">
-                and (a.unit_code = #{jyjcOpeningApplicationRequstDto.unitCode} OR a.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) )
+            <if test="jyjcOpeningApplicationRequestDto.unitCode != '' and jyjcOpeningApplicationRequestDto.unitCode != null">
+                and (a.unit_code = #{jyjcOpeningApplicationRequestDto.unitCode} OR a.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) )
+                and a.open_biz_type = #{jyjcOpeningApplicationRequestDto.openBizTypeIdentify}
             </if>
-            <if test="jyjcOpeningApplicationRequstDto.openBizType != '' and jyjcOpeningApplicationRequstDto.openBizType != null">
-                and a.open_biz_type = #{jyjcOpeningApplicationRequstDto.openBizType}
+            <if test="jyjcOpeningApplicationRequestDto.openBizType != '' and jyjcOpeningApplicationRequestDto.openBizType != null">
+                and a.open_biz_type = #{jyjcOpeningApplicationRequestDto.openBizType}
             </if>
-            <if test="jyjcOpeningApplicationRequstDto.unitCodeName != '' and jyjcOpeningApplicationRequstDto.unitCodeName != null">
-                and a.unit_code_name like concat('%',#{jyjcOpeningApplicationRequstDto.unitCodeName},'%')
+            <if test="jyjcOpeningApplicationRequestDto.unitCodeName != '' and jyjcOpeningApplicationRequestDto.unitCodeName != null">
+                and a.unit_code_name like concat('%',#{jyjcOpeningApplicationRequestDto.unitCodeName},'%')
             </if>
             <if test="orgCode != '' and orgCode != null">
                 and tbei.supervise_org_code like concat(#{orgCode},'%')

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -10,7 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.BaseEnterpriseCertDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionCompanyPublicityDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequestDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
@@ -153,13 +153,13 @@ public class JyjcOpeningApplicationController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "分页查询", notes = "分页查询")
     public ResponseModel<Page<JyjcOpeningApplicationModel>> queryForPage(@RequestParam(value = "current") int current,
                                                                          @RequestParam(value = "size") int size,
-                                                                         @RequestBody JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto,
+                                                                         @RequestBody JyjcOpeningApplicationRequestDto jyjcOpeningApplicationRequestDto,
                                                                          @ApiParam(value = "客户端类型: jgAudit-监管审核;jgLook-监管查看") @RequestParam(value = "client", required = false, defaultValue = "jgAudit") String client
     ) {
         Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page, jyjcOpeningApplicationRequstDto, client));
+        return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page, jyjcOpeningApplicationRequestDto, client));
     }
 
     /**

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

@@ -450,13 +450,15 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return this.queryForList("", false);
     }
 
-    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto dto,String client) {
+    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequestDto dto, String client) {
         ReginParams reginParams = commonService.getReginParamsOfCurrentUser();
         String companyLevel = CommonServiceImpl.getCompanyLevel(reginParams.getCompany());
         String currentUserId = RequestContext.getExeUserId();
         String level = reginParams.getCompany().getLevel();
         if (BaseController.COMPANY_TYPE_COMPANY.equals(level)) {
             dto.setType("enterprise");
+            // 按照登录人身份过滤开通单据，如检验机构身份登录只能看到检验开通的单据
+            dto.setOpenBizTypeIdentify(OpenBizTypeEnumV2.getOneByUnitType(reginParams.getCompany().getCompanyType()).getCode());
             dto.setUnitCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
         } else {
             dto.setType("supervision");