1.使用登记检验信息检验类型限制

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -21,7 +21,7 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Map<String, Object> getDetail(@Param("id")String id);
 
-    Map<String, Object> getInspectDetail(@Param("id")String id);
+    Map<String, Object> getInspectDetail(@Param("id") String id, @Param("permissionInspectTypes") List<String> permissionInspectTypes);
 
     Map<String, Object> getUseDetail(@Param("id")String id);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -147,7 +147,14 @@
                INSPECT_REPORT     as inspectReport,
                INSPECT_ORG_CODE     as inspectOrgCode
         from idx_biz_jg_inspection_detection_info
-        where RECORD = #{id}
+        where
+        RECORD = #{id}
+        <if test="permissionInspectTypes != null and permissionInspectTypes.size() > 0">
+            and
+            <foreach collection="permissionInspectTypes" item="inspectType" open="(" close=")" separator="or">
+                INSPECT_TYPE = #{inspectType}
+            </foreach>
+        </if>
         ORDER BY INSPECT_DATE desc LIMIT 1
     </select>
     <select id="getUseDetail" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -110,7 +110,16 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @GetMapping(value = "/category/list")
     @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
     public ResponseModel<List<DictionarieValueModel>> equCategoryListByCompanyType() {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo()));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null));
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/equ-category/listByPersonAndEquList")
+    @ApiOperation(httpMethod = "GET", value = "按照人员身份、设备种类查询设备类别", notes = "按照人员身份、设备种类查询设备类别")
+    public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList));
+    }
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -4,7 +4,6 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -31,5 +30,5 @@ public interface IIdxBizJgRegisterInfoService {
 
     Map<String, Object> getDetailFieldCamelCaseByRecord(String record);
 
-    List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo);
+    List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -49,6 +49,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
 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;
@@ -378,9 +379,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo) {
+    public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList) {
         String companyType = selectedOrgInfo.getCompany().getCompanyType();
-        String dictCodePrefix = getDictCodePrefix(companyType);
+        String dictCodePrefix = getDictCodePrefix(companyType, equList);
         if(StringUtils.isEmpty(dictCodePrefix)){
             return new ArrayList<>();
         }
@@ -388,7 +389,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return FeignUtil.remoteCall(()->Systemctl.dictionarieClient.dictValues(dictCode));
     }
 
-    private String getDictCodePrefix(String companyType) {
+    private String getDictCodePrefix(String companyType, String equList) {
         String dictCodePrefix = "";
         if ((companyType.contains(USE_TYPE_NAME) || companyType.contains(INDIVIDUAL_TYPE_NAME)) && !companyType.contains(MAINTENANCE_TYPE_NAME)) { // 使用单位
             dictCodePrefix = "USE";
@@ -399,7 +400,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (companyType.contains(MAINTENANCE_TYPE_NAME) && companyType.contains(USE_TYPE_NAME)) { // 所有单位
             dictCodePrefix = "ALL";
         }
-        return dictCodePrefix;
+        return StringUtils.isNotEmpty(equList) ? equList + "_" + dictCodePrefix : dictCodePrefix;
     }
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -847,7 +847,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 基本信息 + 制造信息
         Map<String, Object> detail = this.baseMapper.getDetail(record);
         // 检验信息
-        Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(record);
+        Map<String, Object> inspectDetail = this.getInspectDetail(record);
         // 使用信息
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(record);
         // 设计信息
@@ -878,6 +878,48 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return detail;
     }
 
+    public Map<String, Object> getInspectDetail(String record){
+        LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
+        IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
+        List<String> permissionInspectTypes = getInspectInfoByEquDefine(registerInfo.getEquList(), registerInfo.getEquCategory(), registerInfo.getEquDefine());
+        if(permissionInspectTypes.size() >0){
+            return this.baseMapper.getInspectDetail(record, permissionInspectTypes);
+        } else {
+            return null;
+        }
+    }
+
+    private List<String> getInspectInfoByEquDefine(String equList, String equCategory, String equDefine){
+        List<String> permissionInspectTypes = new ArrayList<>();
+        // 使用登记时：需要《首次检验》类型检验信息的设备种类、设备类别、设备品种
+        String[] FIRST_INSPECT_EQULIST = {"3000", "4170"};
+        String[] FIRST_INSPECT_EQUCATEGORY = {"4400", "4900","4A00"};
+        String[] FIRST_INSPECT_EQUDEFINE = {"4170"};
+        // 使用登记时：需要《安装监督验》类型检验信息的设备种类、设备类别、设备品种
+        String[] AZJDJY_INSPECT_EQULIST = {"6000","9000","8000","1000"};
+        String[] AZJDJY_INSPECT_EQUCATEGORY = {"4800","4300","4700","4D00","2100","2400"};
+        String[] AZJDJY_INSPECT_EQUDEFINE = {"4110","4130","4140","4150","4190","4220","4210","4260","4270","4290"};
+        // 使用登记时：需要《首次检验》或者《安装监督验检验》信息的设备种类、设备类别、设备品种
+        String[] SCJY_OR_AZJDJY_EQULIST = {};
+        String[] SCJY_OR_AZJDJY_EQUCATEGORY = {};
+        String[] SCJY_OR_AZJDJY_INSPECT_EQUDEFINE = {"4230","4240","4250","4280"};
+        if(Arrays.asList(FIRST_INSPECT_EQULIST).contains(equList) || Arrays.asList(FIRST_INSPECT_EQUCATEGORY).contains(equCategory) || Arrays.asList(FIRST_INSPECT_EQUDEFINE).contains(equDefine)){
+            permissionInspectTypes.add("SCJY");
+            return permissionInspectTypes;
+        }
+        if(Arrays.asList(AZJDJY_INSPECT_EQULIST).contains(equList) || Arrays.asList(AZJDJY_INSPECT_EQUCATEGORY).contains(equCategory) || Arrays.asList(AZJDJY_INSPECT_EQUDEFINE).contains(equDefine)){
+            permissionInspectTypes.add("AZJDJY");
+            return permissionInspectTypes;
+        }
+        if(Arrays.asList(SCJY_OR_AZJDJY_EQULIST).contains(equList) || Arrays.asList(SCJY_OR_AZJDJY_EQUCATEGORY).contains(equCategory) || Arrays.asList(SCJY_OR_AZJDJY_INSPECT_EQUDEFINE).contains(equDefine)){
+            permissionInspectTypes.add("SCJY");
+            permissionInspectTypes.add("AZJDJY");
+            return permissionInspectTypes;
+        }
+        // 为空时不需要检验信息，不返回检验信息
+        return permissionInspectTypes;
+    }
+
     /**
      * 填充设备最新的数据至历史json
      *
@@ -1063,7 +1105,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useFlagParamDto.setCarNumber(registerInfo.getCarNumber());
         useFlagParamDto.setApplyNo(useRegistration.getApplyNo());
         // 检验信息字段设置
-        setInspectFidld(registerInfo, useFlagParamDto);
+        setInspectField(registerInfo, useFlagParamDto);
         // 电梯维保信息字段设置
         setMainInfoField(registerInfo, useFlagParamDto);
         // 车用气瓶专用字段 暂无数据源 需车用气瓶功能开发完成后进行
@@ -1072,8 +1114,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return useFlagParamDto;
     }
 
-    private void setInspectFidld(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
-        Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord());
+    private void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+        Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord(), null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }