fix(jg)：历史平台登记功能修改

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

@@ -26,6 +26,7 @@
         ur.create_user_id as createUserId,
         ur.rec_date as recDate,
         ur.manage_type as manageType,
+        ur.reg_type as regType,
         GROUP_CONCAT(DISTINCT other.CODE96333) AS code96333,
         GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY)) as equCategory,
         GROUP_CONCAT(DISTINCT (SELECT name from tz_equipment_category  where  code = jri.EQU_DEFINE)) as equDefine,
@@ -268,7 +269,8 @@
                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.is_xixian                                                           as isXixian
+               ur.is_xixian                                                           as isXixian,
+               ur.reg_type                                                            as regType
         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-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -69,7 +69,8 @@
                tjvi.vehicle_attribute as vehicleAttribute,
                tjvi.gas_num as gasNum,
                tjvi.create_date as createDate,
-               tjvi.cancel_reason as cancelReason
+               tjvi.cancel_reason as cancelReason,
+               tjvi.reg_type as regType
         from tzs_jg_vehicle_information tjvi
     </sql>
 

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jg.api.dto.EquipInfoCylinderExcelDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;

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

@@ -2137,6 +2137,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Long changeRecordId= sequence.nextId();
         List<EquipInfoCylinderExcelDto> equipInfoCylinderExcelDtoList =JSON.parseArray(JSON.toJSONString(attachmentUpload.get(EQU_LISTS)), EquipInfoCylinderExcelDto.class);
         equipInfoCylinderExcelDtoList.forEach(data->{
+            if ("his".equals(equipInfoDto.getDataSource())&& "1".equals(data.getWhetherVehicleCylinder())) {
+                throw new BadRequest("车用气瓶历史设备不能批量导入!");
+            }
             String record = UUID.randomUUID().toString();
             List<Map<String, Object>> fileDataList = (List<Map<String, Object>>)(data.getFileData());
             String productPhoto = getUrlByKey(fileDataList,"PRODUCT_PHOTO");
@@ -2325,7 +2328,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
         jgUseRegistrationManage.setReceiveOrgName(equipInfoDto.getReceiveOrgName());
         jgUseRegistrationManage.setAuditPassDate(new Date());
-        jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName());
+        jgUseRegistrationManage.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
         jgUseRegistrationManage.setRegDate(new Date());
         jgUseRegistrationManage.setEquList(equipInfoDto.getEquList());
         jgUseRegistrationManage.setEquListCode(equipInfoDto.getEquListCode());
@@ -2351,7 +2354,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         changeRecord.setApplyNo(registrationManage.getApplyNo());
         changeRecord.setReceiveOrgName(registrationManage.getReceiveOrgName());
         changeRecord.setAuditPassDate(new Date());
-        changeRecord.setRegType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName());
+        changeRecord.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
         changeRecord.setRegDate(registrationManage.getCreateDate());
         changeRecord.setChangeContent(this.buildRecordContent(registrationManage));//变更内容
         changeRecord.setUseRegistrationCode(registrationManage.getUseRegistrationCode());//使用登记编号

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

@@ -2550,6 +2550,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setAuditPassDate(new Date());
                 jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
                 jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+                jgUseRegistration.setRegType("1");//历史登记
                 this.save(jgUseRegistration);
                 jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
                 jgRelationEquipMapper.insert(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/JgVehicleInformationServiceImpl.java

@@ -1754,6 +1754,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             String applyNo = listResponseModel.getResult().get(0);
             vehicleInformation.setApplyNo(applyNo);
             vehicleInformation.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+            vehicleInformation.setRegType("1");//历史登记
             this.save(vehicleInformation);
         } else {
             // 删除以前设备关联关系

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/SuperviseInfoMapper.java

@@ -18,6 +18,8 @@ public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
 
 	void updateRecordBatch(@Param("recordList") List<String> recordList);
 
+	void batchUpdateRecordOrgBranch(@Param("recordList") List<String> recordList);
+
 	List<Map<String,Object>> selectUnitCodeList(@Param("records") List<String> records);
 	List<String> selectSuperviseCodeList(@Param("records") List<String> records);
 

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

@@ -9,6 +9,14 @@
         </foreach>
     </update>
 
+    <update id="batchUpdateRecordOrgBranch">
+        UPDATE idx_biz_jg_use_info SET "ORG_BRANCH_CODE" = "", "ORG_BRANCH_NAME" = ""
+        WHERE "RECORD" IN
+        <foreach collection="recordList" separator="," item="record" open="(" close=")">
+            #{record}
+        </foreach>
+    </update>
+
     <update id="updateEsRecordBatch">
         UPDATE idx_biz_jg_use_info SET "IS_NOT_ES" = 1 WHERE "RECORD" IN
         <foreach collection="recordList" separator="," item="record" open="(" close=")">