Merge branch 'develop_tzs_register' of…

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

@@ -193,7 +193,7 @@
                     <if test="contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
                         and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
                             or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
-                        and (tjmc.status <![CDATA[<>]]> '使用单位待提交' and tjmc.status <![CDATA[<>]]> '待提交')
+                        and (tjmc.instance_id  <![CDATA[<>]]>  '')
                     </if>
 <!--                </otherwise>-->
 <!--            </choose>-->
@@ -201,7 +201,7 @@
             <if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
                 and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter}
                     or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
-                and (tjmc.status <![CDATA[<>]]> '使用单位待提交' and tjmc.status <![CDATA[<>]]> '待提交')
+                and (tjmc.instance_id  <![CDATA[<>]]>  '')
             </if>
             -- 数据过滤结束 ----------------------------------------------------
         </where>

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

@@ -254,6 +254,20 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.superviseBusinessCategory(type));
     }
 
+    /**
+     * 查询各类型业务场景
+     * 使用单位：按照设备种类，按照应用场景
+     * 安装改造维修单位：按照设备种类
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询监管业务名称列表", notes = "查询监管业务名称列表")
+    @GetMapping(value = "/businessScenarios")
+    public ResponseModel<Object> businessScenarios(String type) {
+        return ResponseHelper.buildResponse(commonService.businessScenarios(type));
+    }
+
 
     @Autowired
     private IJgInstallationNoticeService iJgInstallationNoticeService;

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

@@ -116,15 +116,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(), null));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null, 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));
+    public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList,
+                                                                      @RequestParam(value = "businessScenarios") String businessScenarios) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -51,6 +51,8 @@ public interface ICommonService {
 
     List<Map<String, Object>> superviseBusinessCategory(String type);
 
+    List<Map<String, Object>> businessScenarios(String type);
+
     Object invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
 
     Object getCompanyUser(Long companyId);

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

@@ -30,7 +30,7 @@ public interface IIdxBizJgRegisterInfoService {
 
     Map<String, Object> getDetailFieldCamelCaseByRecord(String record);
 
-    List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList);
+    List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList,String businessScenarios);
 
     Page<JSONObject> queryForUnitEquipmentPage(JSONObject jsonObject);
 

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

@@ -27,10 +27,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
-import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.PrintingTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -137,8 +134,6 @@ public class CommonServiceImpl implements ICommonService {
     private static final String XZSB = "XZSB";
     private static final String CODE = "code";
     private static final String PL_DR = "PL_DR";
-
-    private static final String SAFETYANDMAINTENANCEUNIT = "安装改造维修单位";
     // 管辖机构
     private static final String REGULATOR_UNIT = "监管机构";
     // 行政审批局
@@ -168,6 +163,11 @@ public class CommonServiceImpl implements ICommonService {
 
     private static final String SELECTED_ROLE_SEQS = "selectRoleSeqs";
 
+    public static final String YWCJ = "YWCJ";
+
+    public static final String DICT_DATA_KEY = "dictDataKey";
+
+
 
     @Value("${redis.cache.failure.time}")
     private Long redisRegionTimeSecond;
@@ -614,7 +614,7 @@ public class CommonServiceImpl implements ICommonService {
     public List<Map<String, Object>> superviseBusinessCategory(String type) {
         ReginParams reginParams = getSelectedOrgInfo();
         Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(superviseBusinessCategory);
-        if (XZSB.equals(type) && SAFETYANDMAINTENANCEUNIT.equals(reginParams.getCompany().getCompanyType())){
+        if (XZSB.equals(type) && CompanyTypeEnum.CONSTRUCTION.getName().equals(reginParams.getCompany().getCompanyType())){
             Iterator<Map<String, Object>> iterator = resourceJson.get(type).iterator();
             while (iterator.hasNext()) {
                 Map<String, Object> item = iterator.next();
@@ -627,6 +627,25 @@ public class CommonServiceImpl implements ICommonService {
         return resourceJson.get(type);
     }
 
+    @Override
+    public List<Map<String, Object>> businessScenarios(String type) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(superviseBusinessCategory);
+        //新增设备 或者 安改维单位 只有按照设备种类选择的业务
+        if (PL_DR.equals(type) || CompanyTypeEnum.CONSTRUCTION.getName().equals(reginParams.getCompany().getCompanyType())){
+            Iterator<Map<String, Object>> iterator = resourceJson.get(YWCJ).iterator();
+            while (iterator.hasNext()) {
+                Map<String, Object> item = iterator.next();
+                if (item.get(DICT_DATA_KEY).equals("1")) {
+                    iterator.remove();
+                }
+            }
+            return resourceJson.get(YWCJ);
+        }
+        return resourceJson.get(YWCJ);
+
+    }
+
     private List<LinkedHashMap> deleteTreeData(List<LinkedHashMap> result, String companyType) {
         Iterator it = result.iterator();
         while (it.hasNext()) {

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

@@ -1419,9 +1419,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (ValidationUtil.isEmpty(useRegistration.getUseUnitName())) {
             throw new BadRequest("使用登记证导出失败,使用单位名称为空!");
         }
-        exportParamsMap.put("useUnitName",useRegistration.getUseUnitName().contains("_") ?
-                        useRegistration.getUseUnitName().split("_")[1] :
-                        useRegistration.getUseUnitName());
+        exportParamsMap.put("useUnitName",useRegistration.getUseUnitName());
 
         // 监管码
         if (ValidationUtil.isEmpty(useRegistration.getSupervisoryCode())) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

 {
+  "YWCJ": [
+    {
+      "dictDataKey": "0",
+      "dictDataValue": "按设备种类",
+      "dictDataDesc": "upload/tzs/common/image/按照设备种类选择.png"
+    },
+    {
+      "dictDataKey": "1",
+      "dictDataValue": "按应用场景",
+      "dictDataDesc": "upload/tzs/common/image/按照应用场景选择.png"
+    }
+  ],
   "SGGZ": [
     {
       "name": "安装告知",
@@ -21,7 +33,7 @@
       "image": "upload/tzs/common/image/移装告知.png"
     }
   ],
-  "DJGL":[
+  "DJGL": [
     {
       "name": "使用登记",
       "code": "DJ_SY",
@@ -48,21 +60,21 @@
       "image": "upload/tzs/common/image/更名变更登记.png"
     }
   ],
-  "WBBA":[
+  "WBBA": [
     {
       "name": "维保备案",
       "code": "WB_BA",
       "image": "upload/tzs/common/image/维保备案.png"
     }
   ],
-  "SBYJ":[
+  "SBYJ": [
     {
       "name": "设备移交",
       "code": "SB_YJ",
       "image": "upload/tzs/common/image/设备移交.png"
     }
   ],
-  "QTBF":[
+  "QTBF": [
     {
       "name": "设备启用",
       "code": "SB_QY",
@@ -84,7 +96,7 @@
       "image": "upload/tzs/common/image/注销报废.png"
     }
   ],
-  "XZSB":[
+  "XZSB": [
     {
       "name": "新增设备",
       "code": "SB_XZ",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -132,4 +132,7 @@ public class ESEquipmentCategoryDto {
 
     @Field(type = FieldType.Text)
     private String WHETHER_VEHICLE_CYLINDER;
+
+    @Field(type = FieldType.Text)
+    private String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java

@@ -177,5 +177,13 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
 	@TableField("\"WHETHER_VEHICLE_CYLINDER\"")
     private String whetherVehicleCylinder;
 
+    /**
+     * 是否撬装式压力容器（压力容器用于区分普通压力容器（安装改造维修单位新增的）和撬装式压力容器（使用单位新增的））
+     *  1：是
+     *  0：不是
+     */
+    @TableField("\"WHETHER_SKID_MOUNTED_PRESSURE_VESSEL\"")
+    private String whetherSkidMountedPressureVessel;
+
 
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -102,6 +102,7 @@
                EQU_TYPE,
                DATA_SOURCE,
                WHETHER_VEHICLE_CYLINDER,
+               WHETHER_SKID_MOUNTED_PRESSURE_VESSEL,
                DATE_FORMAT(PRODUCE_DATE, '%Y-%m-%d %H:%i:%s') as PRODUCE_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}