Merge branch 'develop_tzs_register' of…

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

@@ -7,8 +7,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -27,4 +25,6 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
    JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);
 
    void updatePromoter(@org.apache.ibatis.annotations.Param ("id") Long id);
+
+   Page<JyjcInspectionApplicationModel> selectForPage(@Param("page") Page<JyjcInspectionApplication> page,  @Param("jyjcInspectionApplicationModel") JyjcInspectionApplicationModel jyjcInspectionApplicationModel,  @Param("identity") String identity, @Param("currentApplicationUnitCode") String currentApplicationUnitCode, @Param("currentInspectionUnitCode") String currentInspectionUnitCode);
 }

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

@@ -68,6 +68,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String originalApplicationNo;
 
     @ApiModelProperty(value = "受理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date acceptDate;
 
     @ApiModelProperty(value = "报检单位编号")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 
 import java.util.List;
 
@@ -13,4 +15,5 @@ import java.util.List;
 public interface IJyjcInspectionApplicationService {
     Boolean deleteBatchData(List<Long> sequenceNbr);
 
+    Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model);
 }

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

@@ -79,6 +79,99 @@
         </where>
         order by tzjia.application_no desc
     </select>
+
+    <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
+        DISTINCT(tzjia.sequence_nbr),
+        tzjia.process_instance_id,
+        tzjia.workflow_node,
+        tzjia.biz_type,
+        tzjia.application_no,
+        cdd1.NAME AS inspectionClassify,
+        cdd3.NAME AS inspectionType,
+        tzjia.inspection_unit_code,
+        cdd.NAME AS equipClassify,
+        tzjia.number_of_equip,
+        tzjia.inspection_unit_code,
+        tzjia.application_date,
+        tzjia.accept_date,
+        tzjia.inspection_charge_phone,
+        tbei.use_unit AS applicationUnitName,
+        tbei1.use_unit AS inspectionUnitName,
+        tzjia.status,
+        cdd2.NAME AS statusName,
+        tzjia.next_execute_ids as nextExecuteIds,
+        tzjia.promoter,
+        tzjia.create_user_id,
+        tzjia.next_execute_user_ids as nextExecuteUserIds,
+        tzjia.inspection_charge_person as  inspectionChargePerson
+        FROM
+        tz_jyjc_inspection_application AS tzjia
+        LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
+        LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
+        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
+        LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
+        LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
+        LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
+        <where>
+            <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
+                and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
+            </if>
+            <if test="jyjcInspectionApplicationModel.inspectionClassify != null and jyjcInspectionApplicationModel.inspectionClassify != ''">
+                and tzjia.inspection_classify = #{jyjcInspectionApplicationModel.inspectionClassify}
+            </if>
+
+            <if test="jyjcInspectionApplicationModel.equipClassify != null and jyjcInspectionApplicationModel.equipClassify != ''">
+                and tzjia.equip_classify = #{jyjcInspectionApplicationModel.equipClassify}
+            </if>
+            <if test="jyjcInspectionApplicationModel.applicationDate != null and jyjcInspectionApplicationModel.applicationDate != ''">
+                and tzjia.application_date = #{jyjcInspectionApplicationModel.applicationDate}
+            </if>
+            <if test="jyjcInspectionApplicationModel.acceptDate != null and jyjcInspectionApplicationModel.acceptDate != ''">
+                and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
+            </if>
+            <if test="jyjcInspectionApplicationModel.inspectionChargePerson != null and jyjcInspectionApplicationModel.inspectionChargePerson != ''">
+                and tzjia.inspection_charge_person like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePerson},'%')
+            </if>
+            <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
+                and tzjia.status = #{jyjcInspectionApplicationModel.status}
+            </if>
+            <if test="jyjcInspectionApplicationModel.bizType != null and jyjcInspectionApplicationModel.bizType != ''">
+                and tzjia.biz_type = #{jyjcInspectionApplicationModel.bizType}
+            </if>
+
+            <if test="jyjcInspectionApplicationModel.inspectionUnitName != null and jyjcInspectionApplicationModel.inspectionUnitName != ''">
+                and tzjia.inspection_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+            </if>
+            <if test="jyjcInspectionApplicationModel.applicationUnitName != null and jyjcInspectionApplicationModel.applicationUnitName != ''">
+                and tzjia.application_unit_code = (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{jyjcInspectionApplicationModel.inspectionUnitName},'%'))
+            </if>
+            <if test="jyjcInspectionApplicationModel.inspectionUnitCode != null and jyjcInspectionApplicationModel.inspectionUnitCode != ''">
+                and tzjia.inspection_unit_code = #{jyjcInspectionApplicationModel.inspectionUnitCode} and tzjia.status != '6610'
+            </if>
+            <if test="jyjcInspectionApplicationModel.applicationUnitCode != null and jyjcInspectionApplicationModel.applicationUnitCode != ''">
+                and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
+            </if>
+
+            <choose>
+                <when test="identity == 'apply'">
+                    and tzjia.application_unit_code = #{currentApplicationUnitCode}
+                </when>
+                <when test="identity == 'receive'">
+                    and tzjia.inspection_unit_code = #{currentInspectionUnitCode}
+                </when>
+                <when test="identity == 'all'">
+                    and (tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentInspectionUnitCode})
+                </when>
+                <otherwise>
+                1=2
+                </otherwise>
+            </choose>
+        </where>
+        order by tzjia.application_no desc
+    </select>
+
+
     <select id="listByCategory"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel">
         select

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

@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BusinessTypeEnum;
@@ -33,8 +32,6 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspection
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.component.feign.utils.FeignUtil;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
@@ -53,7 +50,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -382,6 +378,57 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
+    public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model) {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
+                RequestContext.getToken())).toString(), ReginParams.class);
+        String companyType = reginParams.getCompany().getCompanyType();
+        String companyCode = reginParams.getCompany().getCompanyCode();
+        String currentApplicationUnitCode = null;
+        String currentInspectionUnitCode = null;
+        if(ValidationUtil.isEmpty(companyType)){
+            return new Page<>(0,10, 0);
+        }
+        // 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
+        String identity= this.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
+        if(ValidationUtil.equals("apply", identity)){
+            currentApplicationUnitCode = companyCode;
+        }
+        if(ValidationUtil.equals("receive", identity)){
+            currentInspectionUnitCode = companyCode;
+        }
+        if(ValidationUtil.equals("all", identity)){
+            currentApplicationUnitCode = companyCode;
+            currentInspectionUnitCode = companyCode;
+        }
+        Page<JyjcInspectionApplicationModel> resultPage = this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode);
+        return resultPage;
+    }
+
+    private String getCompanyIdentityByType(String companyType){
+        // 可发起单位的单位类型（角色与单位类型已绑定，在业务系统增加的账号不会出现角色与的单位类型不匹配场景）
+        String[] applyIdentityDefine = {"使用单位", "安装改造维修单位"};
+        // 可进行检验检测申请接收的单位类型，在业务系统增加的账号不会出现角色与的单位类型不匹配场景
+        String[] receiveIdentityDefine = {"检验检测机构"};
+        boolean isApplyIdentityMatch = false;
+        boolean isReceiveIdentityMatch = false;
+        if(Arrays.stream(applyIdentityDefine).anyMatch(companyType::contains)){
+            isApplyIdentityMatch = true;
+        }
+        if(Arrays.stream(receiveIdentityDefine).anyMatch(companyType::contains)){
+            isReceiveIdentityMatch = true;
+        }
+        if(isApplyIdentityMatch && !isReceiveIdentityMatch){
+            return "apply";
+        }
+        if(!isApplyIdentityMatch && isReceiveIdentityMatch){
+            return "receive";
+        }
+        if(isApplyIdentityMatch){
+            return "all";
+        }
+        return "no";
+    }
+
     /**
      * 列表查询 示例
      */