Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.java

@@ -124,4 +124,17 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
 
     @ApiModelProperty (value = "下一节点可执行人")
     private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "设备移装完整详细地址")
+    private String fullAddress;
+
+    @ApiModelProperty(value = "设备名称")
+    private String productName;
+
+    @ApiModelProperty(value = "设备移装完整详细地址")
+    private String allAddress;
+
+    @ApiModelProperty(value = " 单位内部编号")
+    private String innerCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java

@@ -228,4 +228,8 @@ public class JgTransferNoticeDto extends BaseDto {
     @ApiModelProperty (value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
+    @TableField(exist = false)
+    private String equAddress;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransfer.java

@@ -239,4 +239,11 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
     @TableField(value = "next_execute_user_ids")
     private String nextExecuteUserIds;
 
+    /**
+     * 设备移装完整详细地址
+     */
+    @TableField(value = "full_address")
+    private String fullAddress;
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgReformNotice.java

@@ -336,4 +336,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(value = "next_execute_user_ids")
     private String nextExecuteUserIds;
+
+    /**
+     * 地址
+     */
+    @TableField(exist = false)
+    private String fullAddress;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancel.java

@@ -96,7 +96,7 @@ public class JgScrapCancel extends BaseEntity {
     private String receiveOrgName;
 
     /**
-     * 接收机构公司代码
+     * 接收机构公司代码--暂时未用到
      */
     @TableField("receive_company_code")
     private String receiveCompanyCode;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java

@@ -319,5 +319,8 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("\"next_execute_user_ids\"")
     private String nextExecuteUserIds;
 
+    @TableField(exist = false)
+    private String equAddress;
+
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -186,4 +186,7 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField(value = "is_xixian")
     private String isXixian;
+
+    @TableField(value = "use_address")
+    private String useAddress;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
-import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
 
 /**
  * 报废注销设备关系表 Mapper 接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -21,9 +21,9 @@ import java.util.Map;
  */
 public interface IJgChangeRegistrationTransferService extends IService<JgChangeRegistrationTransfer> {
 
-    List<JgChangeRegistrationTransfer> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> updateTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
-    List<JgChangeRegistrationTransfer> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
+    List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams);
 
     boolean deleteBatchBySequenceNbrs(Long[] sequenceNbrs);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java

@@ -65,4 +65,6 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
      * @return pdf文件路径
      */
     String generateMaintainNoticeReport(Long sequenceNbr);
+
+    boolean deleteBySequenceNbr(Long[] sequenceNbr);
 }

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

@@ -20,7 +20,7 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
         ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -154,7 +154,7 @@
             jri.PRODUCT_NAME as productName,
             jri.EQU_CODE as equCode,
             use.USE_INNER_CODE as innerCode,
-            concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+            concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME,use.STREET_NAME,use.ADDRESS) as place,
             ifnull(ur.instance_id, '') as instanceId,
             re.equ_id as equipId,
             ur.apply_no as applyNo,

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

@@ -22,12 +22,12 @@
         crt.use_registration_code as useRegistrationCode,
         crt.next_execute_user_ids as nextExecuteUserIds,
         crt.create_user_id as createUserId,
+        crt.full_address as allAddress,
         use.USE_UNIT_NAME as useUnitName,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as allAddress,
         crteq.equ_id as equipId
         from tzs_jg_change_registration_transfer crt
         LEFT JOIN tzs_jg_change_registration_transfer_eq crteq  on crt.sequence_nbr = crteq.equip_transfer_id

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

@@ -22,14 +22,16 @@
         isn.promoter,
         isn.next_execute_ids AS nextExecuteIds,
         isn.instance_status AS instanceStatus,
-        isn.equ_address AS equAddress,
+<!--        isn.equ_address AS equAddress,-->
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
         isn.notice_report_url AS noticeReportUrl,
         isn.create_user_id as createUserId,
-        isn.next_execute_user_ids as nextExecuteUserIds
-        FROM
-        tzs_jg_installation_notice isn
+        isn.next_execute_user_ids as nextExecuteUserIds,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
+        FROM tzs_jg_installation_notice isn
+        LEFT JOIN tzs_jg_installation_notice_eq insEq on insEq.equip_transfer_id = isn.sequence_nbr
+        LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
         <where>
             isn.is_delete = false
             <if test="param != null ">

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

@@ -8,7 +8,14 @@
     </update>
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
-        select isn.* FROM tzs_jg_maintain_notice isn
+        select
+        isn.*,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as fullAddress,
+        ibjoi.SUPERVISORY_CODE as  supervisoryCode
+        FROM tzs_jg_maintain_notice isn
+        left join tzs_jg_maintain_notice_eq isneq on isn.sequence_nbr = isneq.equip_transfer_id
+        LEFT JOIN idx_biz_jg_use_info ibjui on isneq.equ_id = ibjui.RECORD
+        LEFT JOIN idx_biz_jg_other_info ibjoi on isneq.equ_id = ibjoi.RECORD
         <where>
             isn.is_delete = 0
             <if test="param != null ">

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

@@ -192,6 +192,7 @@
                jui.USE_INNER_CODE,
                jfi.FACTORY_NUM,
                jui.ADDRESS as ADDRESS,
+               jui.RECORD record,
                jri.EQU_DEFINE,
                jri.PRODUCT_NAME,
                jri.EQU_CODE,

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

@@ -26,12 +26,16 @@
         ec."name" AS equipCateName,
         tjtn.handle_date AS handleDate,
         tjtn.create_user_id as createUserId,
-        tjtn.next_execute_user_ids as nextExecuteUserIds
+        tjtn.next_execute_user_ids as nextExecuteUserIds,
+        oi.SUPERVISORY_CODE as supervisoryCode,
+        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME", '', ibjui."ADDRESS") as equAddress
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
             LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
             LEFT JOIN tz_equipment_category ec ON ec.code = ri.equ_category
+            LEFT JOIN idx_biz_jg_use_info ibjui on re.equ_id = ibjui.RECORD
+            left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
         <where>
             tjtn.is_delete = false
             <if test="param != null ">

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

@@ -19,7 +19,8 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+--         concat(use.PROVINCE_NAME,use.CITY_NAME,use.COUNTY_NAME) as place,
+        ur.use_address as place,
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
@@ -125,7 +126,9 @@
                PROVINCE as province,
                CITY as city,
                COUNTY as county,
-               USE_INNER_CODE as useInnerCode
+               USE_INNER_CODE as useInnerCode,
+               LONGITUDE_LATITUDE as longitudeLatitude,
+               FACTORY_USE_SITE_STREET as factoryUseSiteStreet
         FROM "idx_biz_jg_use_info"  where RECORD = #{id}
     </select>
     <select id="getEquipListPage" resultType="java.util.Map">
@@ -178,7 +181,8 @@
                jri.PRODUCT_NAME                                                       as productName,
                jri.EQU_CODE                                                           as equCode,
                use.USE_INNER_CODE                                                     as innerCode,
-               concat(use.PROVINCE_NAME, use.CITY_NAME, use.COUNTY_NAME)    as place,
+--                concat(use.PROVINCE_NAME, use.CITY_NAME, use.COUNTY_NAME)    as place,
+               ur.use_address                                                         as place,
                ur.instance_id                                                         as instanceId,
                re.equ_id                                                              as equipId,
                ur.apply_no                                                            as applyNo,
@@ -188,7 +192,8 @@
                ur.use_registration_code                                               as useRegistrationCode,
                date_format(ur.audit_pass_date, '%Y-%m-%d')                            as auditPassDate,
                ur.receive_org_name                                                    as receiveOrgName,
-               ur.next_execute_user_ids                                               as nextExecuteUserIds
+               ur.next_execute_user_ids                                               as nextExecuteUserIds,
+               ur.is_xixian                                               as isXixian
         from tzs_jg_use_registration ur
                  LEFT JOIN tzs_jg_use_registration_eq re on ur.sequence_nbr = re.equip_transfer_id
                  LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD

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

@@ -193,4 +193,17 @@ public class CommonController extends BaseController {
 		return ResponseHelper.buildResponse(result);
 	}
 
+
+
+
+	/**
+	 * 获取当前登录人企业类型
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getCompanyType")
+	@ApiOperation(httpMethod = "GET", value = "获取当前登录人企业类型", notes = "获取当前登录人企业类型")
+	public ResponseModel<Object> getCompanyType() {
+		return ResponseHelper.buildResponse(iJgInstallationNoticeService.getCompanyType());
+	}
+
 }

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

@@ -81,7 +81,7 @@ public class JgMaintainNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维修告知", notes = "根据sequenceNbr删除维修告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
-        return ResponseHelper.buildResponse(iJgMaintainNoticeService.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(iJgMaintainNoticeService.deleteBySequenceNbr(sequenceNbr));
     }
 
     /**

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

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 
+import java.util.List;
+
 /**
  * 使用信息表接口类
  *
@@ -14,4 +16,6 @@ public interface IIdxBizJgUseInfoService {
     boolean saveOrUpdateData(IdxBizJgUseInfo useInfo);
 
     IdxBizJgUseInfo getOneData(String record);
+
+    List<IdxBizJgUseInfo> getUseInfoListByEquIds(List<String> equIds);
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -12,9 +11,8 @@ 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.entity.JgInstallationNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
@@ -142,8 +140,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private JgInstallationNoticeEqServiceImpl jgInstallationNoticeEqServiceImpl;
     @Autowired
     private JgUseRegistrationEqServiceImpl jgUseRegistrationEqServiceImpl;
-
-
+    @Autowired
+    private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
 
     /**
      * 设备注册信息
@@ -1072,18 +1070,50 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     String status = ConstructionEnum.getName.get(integer);
                     dto2.put(CONSTRUCTIONTYPE, status);
                 }
+                dto2.put("record",dto2.get("SEQUENCE_NBR"));
+                list.add(dto2);
+            }
+            // 获取所有设备的Id
+            List<String> equIds = null;
+            if(!ValidationUtil.isEmpty(list)){
+                equIds = list.stream().map(item -> item.get("SEQUENCE_NBR").toString()).collect(Collectors.toList());
+            }
+            if(!ValidationUtil.isEmpty(equIds)){
                 //查询设备是否正在使用
                 //设备的使用标识是，安装告知和使用登记中有使用记录。
-                String equId = (String) dto2.get("SEQUENCE_NBR");
-                dto2.put("record",equId);
-                List<JgInstallationNoticeEq> installationNoticeEqList = jgInstallationNoticeEqServiceImpl.getListByEquId(equId);
-                List<JgUseRegistrationEq> useRegistrationEqList = jgUseRegistrationEqServiceImpl.getListByEquId(equId);
-                if(!ValidationUtil.isEmpty(installationNoticeEqList) || !ValidationUtil.isEmpty(useRegistrationEqList)){
-                    dto2.put("IS_USE", true);
-                }else {
-                    dto2.put("IS_USE", false);
+                List<JgInstallationNoticeEq> installationNoticeEqList = jgInstallationNoticeEqServiceImpl.getListByEquIds(equIds);
+                List<JgUseRegistrationEq> useRegistrationEqList = jgUseRegistrationEqServiceImpl.getListByEquIds(equIds);
+                Map<String, Boolean> equIsUseMap = new HashMap<>();
+                if(!ValidationUtil.isEmpty(installationNoticeEqList) ){
+                    equIsUseMap.putAll(installationNoticeEqList.stream().collect(Collectors.toMap(JgInstallationNoticeEq::getEquId, obj -> true, (oldValue, newValue) -> oldValue)));
+                }
+                if(!ValidationUtil.isEmpty(useRegistrationEqList)){
+                    equIsUseMap.putAll(useRegistrationEqList.stream().collect(Collectors.toMap(JgUseRegistrationEq::getEquId, obj -> true, (oldValue, newValue) -> oldValue)));
+                }
+                // 查询设备地址
+                List<IdxBizJgUseInfo> useInfoListByEquIds = idxBizJgUseInfoService.getUseInfoListByEquIds(equIds);
+                Map<String, String> equAddressMap = new HashMap<>();
+                if(!ValidationUtil.isEmpty(useInfoListByEquIds)){
+                    equAddressMap = useInfoListByEquIds.stream().collect(Collectors.toMap(IdxBizJgUseInfo::getRecord,
+                                    useInfo -> {
+                                        String fulladdress="";
+                                        if(!ValidationUtil.isEmpty(useInfo.getProvinceName())) fulladdress += useInfo.getProvinceName();
+                                        if(!ValidationUtil.isEmpty(useInfo.getCityName())) fulladdress += useInfo.getCityName();
+                                        if(!ValidationUtil.isEmpty(useInfo.getCountyName())) fulladdress += useInfo.getCountyName();
+                                        if(!ValidationUtil.isEmpty(useInfo.getStreetName())) fulladdress += useInfo.getStreetName();
+                                        if(!ValidationUtil.isEmpty(useInfo.getAddress())) fulladdress += useInfo.getAddress();
+                                        return fulladdress;
+                                    }
+                            )
+                    );
+                }
+                // 更新设备使用情况和设备地址
+                for(JSONObject item : list){
+                    Boolean isUse = equIsUseMap.get(item.getString("SEQUENCE_NBR"));
+                    String fullAddress = equAddressMap.get(item.getString("SEQUENCE_NBR"));
+                    item.put("IS_USE", !ValidationUtil.isEmpty(isUse) ? isUse ? isUse : false : false);
+                    item.put("ADDRESS", !ValidationUtil.isEmpty(fullAddress) ? fullAddress : "");
                 }
-                list.add(dto2);
             }
             totle = response.getInternalResponse().hits().getTotalHits().value;
             result.setRecords(list);
@@ -1129,11 +1159,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String operateType = ValidationUtil.isEmpty(equipmentInfoForm.get("SEQUENCE_NBR")) ? OPERATESAVE : OPERATEEDIT;
         record = OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : equipmentInfoForm.get("RECORD").toString();
 
+        // 单位类型
+        Map<String, Object> companyType = jgInstallationNoticeService.getCompanyType();
+        String companyTypeStr = companyType.get("companyType").toString();
+
         //使用信息
         IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
         useInfo.setRecord(record);
         useInfo.setRecDate(date);
         useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
+
+        if(companyTypeStr.contains(CompanyTypeEnum.USE.getCode())) {
+            useInfo.setUseUnitCreditCode(companyType.get("creditCode").toString());
+            useInfo.setUseUnitName(companyType.get("companyTypeName").toString());
+        }
+
         idxBizJgUseInfoService.saveOrUpdateData(useInfo);
 
         //设计制造
@@ -1158,8 +1198,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
         constructionInfo.setRecord(record);
         constructionInfo.setRecDate(date);
-        constructionInfo.setUscUnitCreditCode(companyCode);
-        constructionInfo.setUscUnitName(companyName);
+
+        if(companyTypeStr.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
+            constructionInfo.setUscUnitCreditCode(companyCode);
+            constructionInfo.setUscUnitName(companyName);
+        }
+
         constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
         iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
 

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

@@ -3,12 +3,13 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgUseInfoDto;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.List;
+
 /**
  * 使用信息表服务实现类
  *
@@ -26,4 +27,11 @@ public class IdxBizJgUseInfoServiceImpl extends BaseService<IdxBizJgUseInfoDto,I
     public IdxBizJgUseInfo getOneData(String record) {
         return this.getOne(new QueryWrapper<IdxBizJgUseInfo>().eq("RECORD", record));
     }
+
+    @Override
+    public List<IdxBizJgUseInfo> getUseInfoListByEquIds(List<String> equIds) {
+        QueryWrapper<IdxBizJgUseInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(IdxBizJgUseInfo::getRecord, equIds);
+        return list(queryWrapper);
+    }
 }
\ No newline at end of file

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

@@ -792,7 +792,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
+        return String.format(result, Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), Optional.ofNullable(jgChangeRegistrationReform.getSupervisoryCode()).orElse("无"), jgChangeRegistrationReform.getApplyNo());
     }
 
     /**

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

@@ -589,6 +589,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         LambdaQueryWrapper<JgEnableDisableEq> lambda = new QueryWrapper<JgEnableDisableEq>().lambda();
         lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr);
         jgEnableDisableEqService.getBaseMapper().delete(lambda);
+        // 删除暂存时生成的待办
+        commonService.deleteTaskModel(sequenceNbr + "");
     }
 
     public Map<String, Object> getDetail(Long sequenceNbr) {

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

@@ -96,14 +96,15 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             JgEquipTransferEq jgEquipTransferEq = buildJgEquipTransferEq(obj, applyNo);
             JgEquipTransfer transfer = buildJgEquipTransfer(model, applyNo, reginParams, submitType, workflowResultList, i);
             transfer.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            transfer.setEquList(String.valueOf(obj.get("EQU_LIST")));
-            transfer.setEquDefine(String.valueOf(obj.get("EQU_DEFINE")));
-            transfer.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            transfer.setProductName(String.valueOf(obj.get("PRODUCT_NAME")));
-            transfer.setUseRegistCode(String.valueOf(obj.get("USE_ORG_CODE")));
-            transfer.setUseInnerCode(String.valueOf(obj.get("USE_INNER_CODE")));
-            transfer.setEquAddress(String.valueOf(obj.get("ADDRESS")));
-            transfer.setEquCode(String.valueOf(obj.get("EQU_CODE")));
+            transfer.setEquList(Objects.toString(obj.get("EQU_LIST"),""));
+            transfer.setEquDefine(Objects.toString(obj.get("EQU_DEFINE"),""));
+            transfer.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"),""));
+            transfer.setProductName(Objects.toString(obj.get("PRODUCT_NAME"),""));
+            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"),""));
+            transfer.setUseRegistCode(Objects.toString(obj.get("USE_ORG_CODE"), ""));
+            transfer.setUseInnerCode(Objects.toString(obj.get("USE_INNER_CODE"),""));
+            transfer.setEquAddress(Objects.toString(obj.get("ADDRESS"),""));
+            transfer.setEquCode(Objects.toString(obj.get("EQU_CODE"),""));
             transferList.add(transfer);
             equipTransferEqList.add(jgEquipTransferEq);
         });
@@ -137,7 +138,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     private TaskModelDto buildTempTaskModelDto(JgEquipTransfer item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
                 .relationId(item.getSequenceNbr()+"")
@@ -183,8 +184,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 .taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
                 .flowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
                 .flowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .startUserId(item.getCreateUserId())
                 .startUser(item.getCreateUserName())
                 .startUserCompanyName(item.getCreateUserCompanyName())

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

@@ -32,9 +32,9 @@ public class JgInstallationNoticeEqServiceImpl extends BaseService<JgInstallatio
         return this.queryForList("" , false);
     }
 
-    public List<JgInstallationNoticeEq> getListByEquId(String equId) {
+    public List<JgInstallationNoticeEq> getListByEquIds(List<String> equIds) {
         QueryWrapper<JgInstallationNoticeEq> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(JgInstallationNoticeEq::getEquId,equId);
+        queryWrapper.lambda().in(JgInstallationNoticeEq::getEquId, equIds);
         queryWrapper.lambda().eq(JgInstallationNoticeEq::getIsDelete,false);
         return list(queryWrapper);
     }

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

@@ -19,8 +19,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
@@ -38,17 +36,15 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.*;
-import fr.opensagres.xdocreport.core.io.IOUtils;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +55,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -71,8 +65,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
@@ -625,6 +617,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             }
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
+            dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -739,9 +732,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 model.setInstallLeaderName(leaderList[1]);
             }
         }
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(model.getProvinceName()).append(model.getCityName()).append(model.getCountyName()).append(model.getStreetName()).append(model.getAddress());
-        model.setEquAddress(buffer.toString());
+//        StringBuffer buffer = new StringBuffer();
+//        buffer.append(model.getProvinceName()).append(model.getCityName()).append(model.getCountyName()).append(model.getStreetName()).append(model.getAddress());
+//        model.setEquAddress(buffer.toString());
     }
 
 
@@ -979,7 +972,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             return result;
         }
         CompanyModel currentCompany = companyModels.get(0);
-        result.put("creditCode", currentCompany.getCompanyCode());
+        result.put("creditCode", currentCompany.getCompanyCode().contains("_") ? currentCompany.getCompanyCode().split("_")[1] : currentCompany.getCompanyCode());
         String companyLevel = CompanyTypeEnum.decideCompanyLevel(currentCompany.getCompanyType());
         String companyType = CompanyTypeEnum.decideCompanyCode(currentCompany.getCompanyType());
         String companyTypeName = CompanyTypeEnum.decideCompanyType(currentCompany.getCompanyType());

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -293,7 +295,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (Objects.nonNull(notice.getMaintainType())) {
                 noticeDto.setMaintainTypeDesc(dictionaries.stream().filter(d -> notice.getMaintainType().equals(d.getCode())).map(DataDictionary::getName).collect(Collectors.joining()));
             }
-            noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
             return noticeDto;
         }).collect(java.util.stream.Collectors.toList());
         noticeDtoPage.setRecords(records);
@@ -400,6 +401,17 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
     @Override
+    public boolean deleteBySequenceNbr(Long[] sequenceNbr) {
+        this.baseMapper.deleteById(sequenceNbr);
+        LambdaQueryWrapper<JgMaintainNoticeEq> lambda = new QueryWrapper<JgMaintainNoticeEq>().lambda();
+        lambda.eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr);
+        jgMaintainNoticeEqMapper.delete(lambda);
+        // 删除暂存时生成的待办
+        commonService.deleteTaskModel(sequenceNbr + "");
+        return true;
+    }
+
+    @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public List<JgMaintainNotice> saveNotice(String submitType, Map<String, Object> jgMaintainNoticeDtoMap, ReginParams reginParams) {

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

@@ -586,6 +586,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 supervisoryCode = map.get("SUPERVISORY_CODE").toString();
             }
         }
+        supervisoryCode = StringUtils.isEmpty(supervisoryCode) ? "无" : supervisoryCode;
         String format = String.format("来自%s【%s】等的业务办理，【申请单号：%s】等", equList, supervisoryCode, dto.getApplyNo());
         return format;
     }

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

@@ -420,10 +420,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
             dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            dto.setEquListCode(String.valueOf(obj.get("EQU_DEFINE")));
-            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+            dto.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"),""));
+            dto.setEquListCode(Objects.toString(obj.get("EQU_DEFINE"),""));
+            dto.setSupervisoryCode(Objects.toString(obj.get("SUPERVISORY_CODE"),""));
+            dto.setEquList(Objects.toString(obj.get("EQU_LIST"),""));
+            dto.setFullAddress(Objects.toString(obj.get("ADDRESS"),""));
 
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 WorkflowResultDto workflowResult = workflowResultList.get(i);
@@ -487,7 +488,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
         return TaskModelDto.builder()
                 .model(item)
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), Objects.toString(item.getSupervisoryCode(), ""), item.getApplyNo()))
                 .taskCode(item.getApplyNo())
                 .taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
                 .relationId(item.getSequenceNbr()+"")
@@ -812,8 +813,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 .taskStatusLabel(statusEnum.getName())
                 .flowStatus(statusEnum.getCode())
                 .flowStatusLabel(statusEnum.getName())
-                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
-                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), transfer.getSupervisoryCode(), transfer.getApplyNo()))
+                .taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
+                .taskDesc(String.format("来自%s【%s】的业务办理，【申请单号：%s】", transfer.getEquList(), Objects.toString(transfer.getSupervisoryCode(), ""), transfer.getApplyNo()))
                 .startUserCompanyName(transfer.getCreateUserCompanyName())
                 .startUserId(taskV2Model.getStartUserId())
                 .startUser(taskV2Model.getStartUser())

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

@@ -193,7 +193,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             dto.setProcessDefinitionKey("scrapCancelNew");
             dto.setBusinessKey(applyNoList.get(0));
             dto.setCompleteFirstTask(Boolean.TRUE);
-            //下一节点执行人单位（下节点接收机构code）
+            // 下一节点执行人单位（下节点接收机构code）
             dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
             list.add(dto);
 
@@ -314,9 +314,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
                 lambda.eq(JgScrapCancel::getSequenceNbr, id);
                 JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
-                //删除代办消息
+                // 删除代办消息
                 commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()));
-                //更新jgScrapCancel数据
+                // 更新jgScrapCancel数据
                 jgScrapCancel.setIsDelete(true);
                 this.updateById(jgScrapCancel);
             }
@@ -324,6 +324,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
     public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
+
         if (Objects.isNull(jgScrapCancelDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -335,7 +336,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             // 更新并提交
             // 发起流程
             if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
-                //未进流程直接发起并执行
+                // 未进流程直接发起并执行
 
                 List<ProcessTaskDTO> processTasks;
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -367,7 +368,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 createTaskModel(bean, taskName, "1", nextUserIds);
             } else {
                 // 已经在流程中，执行一步
-                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto.getNextTaskId());
+                ProcessTaskDTO processTaskDTO = submit(jgScrapCancelDto);
                 String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
                 String taskName = processTaskDTO.getNextTask().get(0).getName();
                 this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
@@ -408,7 +409,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 String supervisoryCode = otherInfo.getSupervisoryCode();
                 jgScrapCancelDto.setSupervisoryCode(supervisoryCode);
             }
-            //更新操作
+            // 更新操作
             JgScrapCancel bean = new JgScrapCancel();
             BeanUtils.copyProperties(jgScrapCancelDto, bean);
             bean.setCancelCertificate(JSON.toJSONString(jgScrapCancelDto.getCancelCertificateList()));
@@ -428,9 +429,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         taskV2Model.setTaskDesc("");
         taskV2Model.setTaskContent(this.buildTaskContent(jgScrapCancelDto.getEquList(), jgScrapCancelDto.getSupervisoryCode(), jgScrapCancelDto.getCancelType(), jgScrapCancelDto.getApplyNo()));
         taskV2Model.setTaskName(taskName);
-        taskV2Model.setTaskDesc("");
         taskV2Model.setTaskCode(jgScrapCancelDto.getApplyNo());
-        taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setRelationId(jgScrapCancelDto.getInstanceId());
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
         taskV2Model.setTaskStatus(flowStatusEnum.getCode());
@@ -449,6 +448,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
+        taskMessageDto.setNextExecuteUserIds(null);
         modelDto.setModel(taskMessageDto);
         modelDto.setPageType(this.getPageTypeForReject(operate, jgScrapCancelDto.getAuditStatus()));
         commonService.buildTaskModel(Collections.singletonList(modelDto));
@@ -490,15 +490,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         }
     }
 
-    public ProcessTaskDTO submit(String taskId) {
-        //组装信息
+    public ProcessTaskDTO submit(JgScrapCancelDto jgScrapCancelDto) {
+        JgScrapCancel model = this.getById(jgScrapCancelDto.getSequenceNbr());
+        // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
-        dto.setTaskId(taskId);
+        dto.setTaskId(jgScrapCancelDto.getNextTaskId());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", "提交");
+        dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
         dto.setVariable(map);
-        return cmWorkflowService.complete(taskId, dto);
+        return cmWorkflowService.complete(jgScrapCancelDto.getNextTaskId(), dto);
     }
 
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
@@ -585,7 +587,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     public void flowExecute(String equList, Long id, String instanceId, String operate, String comment) {
         JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
         String taskId = jgScrapCancel.getNextTaskId();
-        //组装信息
+        // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
@@ -596,9 +598,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             map.put("approvalStatus", "提交");
         }
         dto.setVariable(map);
-        //下一节点执行人单位（下节点接收机构code）
+        // 下一节点执行人单位（下节点接收机构code）
         dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
-        //执行流程
+        // 执行流程
         ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
         // 更新下一步执行人、创建待办
         updateExecuteIds(equList, instanceId, id, operate, processTaskDTO);
@@ -701,8 +703,10 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         if ("0".equals(operate)) {
             code = jgScrapCancel.getReceiveOrgCode();
         } else {
-            //驳回
-            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) || WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
+            // 驳回
+            if (WorkFlowStatusEnum.CANCEL_RECEIVE.getPass().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getReject().equals(jgScrapCancel.getAuditStatus()) ||
+                    WorkFlowStatusEnum.CANCEL_RECEIVE.getRollBack().equals(jgScrapCancel.getAuditStatus())) {
                 code = jgScrapCancel.getUseUnitCode();
             }
         }

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

@@ -485,6 +485,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             } else {
                 dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             }
+            dto.setEquipCateName(obj.getOrDefault("EQU_CATEGORY", "").toString());
             dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
@@ -499,6 +500,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             }
             dto.setCreateUserName(reginParams.getUserModel().getRealName());
             dto.setCreateUserId(reginParams.getUserModel().getUserId());
+            dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });

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

@@ -33,9 +33,9 @@ public class JgUseRegistrationEqServiceImpl extends BaseService<JgUseRegistratio
     }
 
 
-    public List<JgUseRegistrationEq> getListByEquId(String equId) {
+    public List<JgUseRegistrationEq> getListByEquIds(List<String> equIds) {
         QueryWrapper<JgUseRegistrationEq> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(JgUseRegistrationEq::getEquId,equId);
+        queryWrapper.lambda().in(JgUseRegistrationEq::getEquId, equIds);
         queryWrapper.lambda().eq(JgUseRegistrationEq::getIsDelete,false);
         return list(queryWrapper);
     }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -182,4 +182,17 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField("trace_id")
     private String traceId;
+
+
+    /**
+     * 检验检测单位名称(冗余)
+     */
+    @TableField(value = "inspection_unit_name")
+    private String inspectionUnitName;
+
+    /**
+     * 报检单位名称(冗余)
+     */
+    @TableField(value = "application_unit_name")
+    private String applicationUnitName;
 }

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

@@ -95,7 +95,9 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "检验检测类型名称（冗余）")
     private String inspectionTypeName;
 
+
     @ApiModelProperty(value = "报检日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applicationDate;
 
     @ApiModelProperty("检验结果方式")
@@ -143,10 +145,10 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "设备使用地址")
     private String equUseAddress;
 
-    @ApiModelProperty(value = "检验检测单")
+    @ApiModelProperty(value = "检验检测单位名称(冗余)")
     private String inspectionUnitName;
 
-    @ApiModelProperty(value = "报检单位")
+    @ApiModelProperty(value = "报检单位名称(冗余)")
     private String applicationUnitName;
 
     @ApiModelProperty(value = "监管码")

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

@@ -61,23 +61,54 @@
 
     <select id="selectForPage"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel">
-        select res.sequence_nbr, res.inspection_unit_code, res.application_no, res.application_unit_code,
-        res.equip_unicode, res.result_status, res.license_number, res.result_no, res.inspector, res.inner_person_code,
-        res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
-        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.remark,
-        res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
-        res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
-        tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode
-        , use_org_code, res.equ_define, ibjui.ADDRESS equUseAddress, bei.use_unit inspectionUnitName, bei1.use_unit applicationUnitName, cdb.name inspectionTypeName
-        from tz_jyjc_inspection_result res
-        left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.record
-        left join idx_biz_jg_use_info ibjui on ibjui.record = res.equip_unicode
-        left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
-        left join tz_equipment_category tec on ibjri.equ_category = tec.code
-        left join tz_equipment_category tec1 on ibjri.equ_list = tec1.code
-        left join tz_base_enterprise_info bei on res.inspection_unit_code = bei.use_code
-        left join tz_base_enterprise_info bei1 on res.application_unit_code = bei1.use_code
-        left join cb_data_dictionary cdb on res.inspection_type = cdb.code
+        SELECT
+            res.sequence_nbr,
+            res.inspection_unit_code,
+            res.application_no,
+            res.application_unit_code,
+            res.equip_unicode,
+            res.result_status,
+            res.license_number,
+            res.result_no,
+            res.inspector,
+            res.inner_person_code,
+            res.inspection_conclusion,
+            res.inspection_date,
+            res.next_inspection_date,
+            res.inspection_start_date,
+            res.inspection_end_date,
+            res.inspection_result_summary,
+            res.non_conformance,
+            res.remark,
+            res.rec_user_id,
+            res.rec_date,
+            res.biz_type,
+            res.equ_category,
+            res.inspection_type,
+            res.inspection_type_name,
+            res.application_date,
+            res.inspection_unit_name,
+            res.application_unit_name,
+            res.inspection_type_name,
+            ibjui.use_unit_name,
+            ibjui.use_unit_credit_code,
+            ibjui.province_name,
+            ibjui.city_name,
+            ibjui.county_name,
+            ibjui.street_name,
+            ibjri.equ_code,
+            ibjui.use_inner_code,
+            ibjri.equ_list,
+            (SELECT NAME FROM tz_equipment_category WHERE code = res.equ_list) AS equ_list_name,
+            ibjoi.SUPERVISORY_CODE supervisoryCode,
+            ibjri.use_org_code,
+            res.equ_define,
+            ibjui.ADDRESS equUseAddress
+        FROM
+            tz_jyjc_inspection_result res
+            LEFT JOIN idx_biz_jg_other_info ibjoi ON res.equip_unicode = ibjoi.record
+            LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.record = res.equip_unicode
+            LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.record = ibjri.record
         <where>
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
                 and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
@@ -86,19 +117,19 @@
                 and res.application_unit_code = #{jyjcInspectionResultModel.applicationUnitCode}
             </if>
             <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
-                and use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
+                and ibjri.use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
-                and use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
+                and ibjui.use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
-                and equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
+                and ibjri.equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.equipUnicode != '' and jyjcInspectionResultModel.equipUnicode != null">
                 and res.equip_unicode like concat('%',#{jyjcInspectionResultModel.equipUnicode},'%')
             </if>
-            <if test="jyjcInspectionResultModel.equCategory != '' and jyjcInspectionResultModel.equCategory != null">
-                and ibjri.equ_category = #{jyjcInspectionResultModel.equCategory}
+            <if test="jyjcInspectionResultModel.equList != '' and jyjcInspectionResultModel.equList != null">
+                and ibjri.equ_list = #{jyjcInspectionResultModel.equList}
             </if>
             <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
                 and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
@@ -107,7 +138,7 @@
                 AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
             </if>
             <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
-                and use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
+                and ibjui.use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
             </if>
             <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
                 and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
@@ -130,6 +161,6 @@
                 </otherwise>
             </choose>
         </where>
-        ORDER BY application_date DESC
+        ORDER BY res.application_date DESC
     </select>
 </mapper>

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

@@ -12,7 +12,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.sun.org.apache.regexp.internal.RE;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 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;
@@ -113,6 +117,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     TaskModelServiceImpl taskModelService;
 
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
+
     public JyjcInspectionApplicationModel save(@RequestBody JSONObject obj) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
@@ -353,6 +360,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     }
 
 
+    @Override
     public Boolean deleteBatchData(List<Long> sequenceNbr) {
 
 //        List<JyjcInspectionApplication> jyjcInspectionApplications = this.getBaseMapper().selectBatchIds(sequenceNbr);
@@ -398,6 +406,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
+    @Override
     public Page<JyjcInspectionApplicationModel> queryForPageList(Page<JyjcInspectionApplication> page, JyjcInspectionApplicationModel model) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
                 RequestContext.getToken())).toString(), ReginParams.class);
@@ -581,17 +590,21 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         for (int i = 0; i < applicationEquipModels.size(); i++) {
             JyjcInspectionResult resultModel = new JyjcInspectionResult();
             resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
+            resultModel.setInspectionUnitName(inspectionApplicationModel.getInspectionUnitName());
             resultModel.setApplicationNo(inspectionApplicationModel.getApplicationNo());
             resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
+            resultModel.setApplicationUnitName(inspectionApplicationModel.getApplicationUnitName());
             resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
             resultModel.setResultType(inspectionApplicationModel.getResultType());
             //resultModel.setResultType("input");
             resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
+            resultModel.setInspectionTypeName(this.getDictNameByCode(inspectionApplicationModel.getInspectionType()));
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());
             resultModel.setResultNo(codes.get(i));
-            resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());//设备唯一标识
+            //设备唯一标识
+            resultModel.setEquipUnicode(applicationEquipModels.get(i).getEquipUnicode());
             resultModel.setEquDefine(applicationEquipModels.get(i).getEquDefine());
             resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
             resultModel.setEquList(applicationEquipModels.get(i).getEquList());
@@ -603,6 +616,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         JyjcInspectionApplicationHandlerFactory.apply(type).notifyInspectionUnit(thiryPartParams);
     }
 
+    private String getDictNameByCode(String code) {
+        DataDictionary dataDictionary = dataDictionaryService.getByCode(code,"JYJC");
+        return dataDictionary != null ? dataDictionary.getName() : "";
+    }
+
     /**
      * 退回
      *

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

@@ -143,7 +143,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
         categoryOtherInfoMapper.selectSupervisorCodeMaxValue().forEach(vo ->
                 stringRedisTemplate.opsForValue().set(vo.getName(), String.valueOf(vo.getValue())));
 
-        return Long.parseLong(Objects.requireNonNull(redisTemplate.opsForValue().get(sequenceKey)));
+        return Long.parseLong(redisTemplate.opsForValue().get(sequenceKey) == null ? "0" : redisTemplate.opsForValue().get(sequenceKey));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/json/equipCategory.json

@@ -24,7 +24,7 @@
       "type": "lifting"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png",
@@ -105,7 +105,7 @@
       "imageUrl": "upload/tzs/common/image/监管起重机械.png"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png"
@@ -156,7 +156,7 @@
       "imageUrl": "upload/tzs/common/image/监管起重机械.png"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png"
@@ -264,7 +264,7 @@
       "type": "lifting"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png",
@@ -300,7 +300,7 @@
       "type": "lifting"
     },
     {
-      "name": "场内机动车辆",
+      "name": "场（厂）内专用机动车辆",
       "code": "5000",
       "image": "upload/tzs/common/image/总览厂车.png",
       "imageUrl": "upload/tzs/common/image/监管厂车.png",