Skip to content

A
amos-boot-biz
Commit 41b6903e authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):单位变更-产权变更功能开发

parent 3c35a0e9
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 140 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java
View file @ 41b6903e
......@@ -138,4 +138,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
@ApiModelProperty("是否可以做业务-西安电梯导入用（0-否，1-是）")
private String isDoBusiness;
@ApiModelProperty("产权单位code_name")
private String estateUnitName;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationMapper.java
View file @ 41b6903e
......@@ -50,4 +50,6 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
Integer countUseTimesForInvalid(@Param("code") Object code);
List<JgVehicleInformation> getListOfPass();
List<Map<String, Object>> getVehicleInfoOfPassWithEquId();
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeVehicleRegistrationUnitMapper.xml
View file @ 41b6903e
......@@ -25,7 +25,8 @@
pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ri.RECORD ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate,
CONCAT(jui.ESTATE_UNIT_CREDIT_CODE, '_', jui.ESTATE_UNIT_NAME) AS estateUnitName
FROM
idx_biz_jg_register_info ri
LEFT JOIN idx_biz_jg_use_info jui on ri.RECORD = jui.RECORD
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ 41b6903e
......@@ -78,8 +78,11 @@
</where>
</select>
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
<include refid="page_list"/>
from tzs_jg_use_registration_manage tjurm
<include refid="page_list"/>,
(SELECT CONCAT(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME) from idx_biz_jg_use_info ui
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ui.record
WHERE ri.USE_ORG_CODE = tjurm.use_registration_code ORDER BY ui.REC_DATE DESC limit 1) AS estateUnitName
FROM tzs_jg_use_registration_manage tjurm
<where>
tjurm.is_delete = 0
<if test="dto.equList != null and dto.equList != ''">
......@@ -408,10 +411,12 @@
<select id="queryForUnitByProjectContraptionPage"
resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
SELECT distinct
ibjpc.*
ibjpc.*,
(SELECT CONCAT(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME) FROM idx_biz_jg_use_info
WHERE "PROJECT_CONTRAPTION_ID" = ibjpc."sequence_nbr" ORDER BY REC_DATE DESC LIMIT 1) AS estateUnitName
FROM
idx_biz_jg_project_contraption ibjpc
left join tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code
LEFT JOIN tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code
WHERE
EXISTS (
SELECT
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml
View file @ 41b6903e
......@@ -335,4 +335,17 @@
and u.status='已完成'
ORDER BY u.audit_pass_date
</select>
<select id="getVehicleInfoOfPassWithEquId" resultType="java.util.Map">
SELECT
u.estate_unit_name as estateUnitName,
u.estate_unit_credit_code as estateUnitCreditCode,
tjvie.equ_id as equId
FROM tzs_jg_vehicle_information u
LEFT JOIN tzs_jg_vehicle_information_eq tjvie ON tjvie.vehicle_id = u.sequence_nbr
WHERE u.is_delete = '0'
AND u.status = '已完成'
AND u.estate_unit_credit_code is not null
ORDER BY u.audit_pass_date
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataHandlerController.java
View file @ 41b6903e
......@@ -210,5 +210,13 @@ public class DataHandlerController extends BaseController {
return ResponseHelper.buildResponse(dataHandlerService.safeTraceabilityClosedLoop());
}
/**
* 车用气瓶登记产权单位信息刷入useInfo表
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "车用气瓶登记产权单位信息刷入useInfo表", notes = "车用气瓶登记产权单位信息刷入useInfo表")
@GetMapping(value = "/writeEstateUnitInfoInUseInfo")
public ResponseModel<String> writeEstateUnitInfoInUseInfo() {
return ResponseHelper.buildResponse(dataHandlerService.writeEstateUnitInfoInUseInfo());
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java
View file @ 41b6903e
......@@ -193,10 +193,11 @@ public class JgChangeRegistrationUnitController extends BaseController {
LinkedHashMap model1 = (LinkedHashMap) model.get("changeRegisInfo");
String opinion = (String) model.get("opinion");
LinkedHashMap installationInfo = (LinkedHashMap) model1.get("changeRegisInfo");
JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
jgInstallationNoticeDto.setProcessAdvice(opinion);
installationInfo.put("registrationList", model.get("newCarNumberList"));
JgChangeRegistrationUnitDto changeRegistrationUnitDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
changeRegistrationUnitDto.setProcessAdvice(opinion);
ReginParams reginParams = getSelectedOrgInfo();
jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto, op, reginParams);
jgChangeRegistrationUnitServiceImpl.accept(changeRegistrationUnitDto, op, reginParams);
return ResponseHelper.buildResponse(null);
}
......
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/DataHandlerServiceImpl.java
View file @ 41b6903e
......@@ -1255,4 +1255,16 @@ public class DataHandlerServiceImpl {
equipmentStrategy.handleProblem(inspectJsonArr, SafetyProblemTypeEnum.JYBJ);
return String.format("修正历史维保超期未闭环数:%s起,检验超期未闭环数：%s起。总数：%s起", mainJsonArr.size(), inspectJsonArr.size(), mainJsonArr.size() + inspectJsonArr.size());
}
public String writeEstateUnitInfoInUseInfo() {
List<Map<String, Object>> vehicleUseRegs = jgVehicleInformationService.getBaseMapper().getVehicleInfoOfPassWithEquId();
vehicleUseRegs.parallelStream().forEach(u->{
LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(IdxBizJgUseInfo::getRecord,u.get("equId"));
updateWrapper.set(IdxBizJgUseInfo::getEstateUnitName,u.get("estateUnitName"));
updateWrapper.set(IdxBizJgUseInfo::getEstateUnitCreditCode,u.get("estateUnitCreditCode"));
useInfoService.update(updateWrapper);
});
return String.format("修正车用气瓶登记未更新产权信息数据:%s条。", vehicleUseRegs.size());
}
}
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/JgChangeRegistrationUnitServiceImpl.java
View file @ 41b6903e
......@@ -187,7 +187,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 根据sequenceNbr查询：1、查询单位变更信息，2、查询使用登记证列表
*
* @param sequenceNbr 主键
* @param sequenceNbr 主键
* @param selectedOrgInfo
* @return 单位变更
*/
......@@ -204,7 +204,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (!ObjectUtils.isEmpty(notice.getNewUseUnitCreditCode())) {
TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(TzBaseEnterpriseInfo::getUseUnitCode, notice.getNewUseUnitCreditCode()));
if (useCodeResult != null) {
changeInfo.put("address",useCodeResult.getAddress());
changeInfo.put("address", useCodeResult.getAddress());
}
}
//组装下拉数据
......@@ -225,7 +225,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
.eq(JgRegistrationHistory::getIsDelete, false));
if(PipelineEnum.PRESSURE_PIPELINE.getCode().equals(notice.getEquListCode())){
if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(notice.getEquListCode())) {
//添加申请编号
JSONArray jsonArray = JSON.parseArray(historyServiceOne.getChangeData());
if (!CollectionUtils.isEmpty(jsonArray)) {
......@@ -306,9 +306,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
throw new IllegalArgumentException("参数不能为空");
}
if(PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeDto.getEquListCode())){
dealProjectContraptionToUpdate(submitType,noticeDto,op,reginParams);
}else {
if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeDto.getEquListCode())) {
dealProjectContraptionToUpdate(submitType, noticeDto, op, reginParams);
} else {
// 字段转换
this.convertField(noticeDto);
// 获取单位变更使用登记证列表
......@@ -469,6 +469,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 更新装置的单位变更
*
* @param submitType
* @param noticeDto
* @param op
......@@ -484,16 +485,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
//根据使用登记证查询设备
List<String> registrationNoList = new ArrayList<>(); //使用登记证编号
Map<String,String> useRegistrationCodeMap = new HashMap<>();
Map<String, String> useRegistrationCodeMap = new HashMap<>();
for (Map<String, Object> objectMap : projectContraptionList) {
if (objectMap.containsKey("useRegistrationCode") && ObjectUtils.isNotEmpty(objectMap.get("useRegistrationCode"))) {
registrationNoList.add(objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(),objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(), objectMap.get("useRegistrationCode").toString());
}
}
//查询装置下的管道信息
List<Map<String, Object>> deviceList = this.queryPipelineList(projectContraptionList);
if(CollUtil.isEmpty(deviceList)){
if (CollUtil.isEmpty(deviceList)) {
throw new BadRequest("工程/装置下没有管道信息");
}
if (SUBMIT_TYPE_FLOW.equals(submitType)) { //放在最后面防止前面有异常
......@@ -608,7 +609,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
deviceList.forEach(device -> {
JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
if (device.containsKey("projectContraptionId")) {
String projectContraptionId = (String)device.get("projectContraptionId");
String projectContraptionId = (String) device.get("projectContraptionId");
unitEq.setRegistrationCertificate(useRegistrationCodeMap.get(projectContraptionId));
unitEq.setProjectContraptionId(projectContraptionId);
}
......@@ -1165,9 +1166,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
registration.setStatus(taskName[0]);
registration.setAuditPassDate(new Date());
//如果是工业管道 如果工程装置对应一个证就直接变更给新单位；如果工程装置对应证下还有其他装置就变更后直接给新单位再重新生成一个登记证号；如果两个工程装置对应同一个使用登记证变更后生成两个新的登记证
if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(dto.getEquListCode())){
dealProjectContraption(dto,nextTaskId,registration,op);
}else {
if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(dto.getEquListCode())) {
this.dealProjectContraption(dto, nextTaskId, registration, op);
} else {
// 生成新的使用登记编号，使用登记证 修改设备的使用登记信息表，使用单位名称，使用单位统一信用代码，使用登记证编号，更新ES
LambdaQueryWrapper<JgChangeRegistrationUnitEq> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, dto.getSequenceNbr());
......@@ -1176,29 +1177,57 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : jgChangeRegistrationUnitEqs) {
String equipId = jgChangeRegistrationUnitEq.getEquId();
LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(OtherInfo::getRecord, equipId);
OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
if (ObjectUtils.isNotEmpty(tzsJgOtherInfo)) {
LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(UseInfo::getRecord, equipId);
UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(useInfo)) {
useInfo.setUseUnitName(registration.getNewUseUnitName());
useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
useInfoMapper.updateById(useInfo);
}
Map<String, Object> map1 = new HashMap<>();
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
resultMap.put(equipId, map1);
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(UseInfo::getRecord, equipId);
UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(useInfo)) {
useInfo.setUseUnitName(registration.getNewUseUnitName());
useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
useInfoMapper.updateById(useInfo);
}
Map<String, Object> map1 = new HashMap<>();
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间，设备筛选时排在前面 bug-21476
resultMap.put(equipId, map1);
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
}
//更新产权信息
dto.getRegistrationList().forEach(v -> {
String useCode = String.valueOf(v.get("useRegistrationCode"));
String newCarNumber = String.valueOf(v.get("newCarNumber"));
String[] estateData = String.valueOf(v.get("estateUnitName")).split("_", 2);
List<String> records = idxBizJgRegisterInfoService.getBaseMapper()
.selectList(new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.eq(IdxBizJgRegisterInfo::getUseOrgCode, useCode))
.stream()
.map(IdxBizJgRegisterInfo::getRecord)
.collect(Collectors.toList());
if (!records.isEmpty()) {
idxBizJgUseInfoService.update(
new IdxBizJgUseInfo()
.setEstateUnitCreditCode(estateData[0])
.setEstateUnitName(estateData[1]),
new LambdaQueryWrapper<IdxBizJgUseInfo>()
.in(IdxBizJgUseInfo::getRecord, records)
);
}
//场车更新车牌号
if ("5000".equals(dto.getEquList())){
if (newCarNumber != null && useCode != null){
idxBizJgRegisterInfoService.update(
new IdxBizJgRegisterInfo()
.setCarNumber(newCarNumber),
new LambdaQueryWrapper<IdxBizJgRegisterInfo>()
.in(IdxBizJgRegisterInfo::getUseOrgCode, useCode)
);
}
}
});
registration.setNextTaskId(nextTaskId);
updateTaskModel(registration, op);
//新增使用登记证和设备变更记录
......@@ -1208,6 +1237,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
JSONArray historyJson = JSON.parseArray(history.getChangeData());
// 更新历史表中一二级审批车牌号
history.setChangeData(JSONObject.toJSONString(dto.getRegistrationList()));
registrationHistoryService.updateById(history);
List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
for (JgUseRegistrationManage registrationManage : list) {
......@@ -1266,40 +1298,48 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 处理工业管道
*
* @param dto
* @param nextTaskId
* @param registration
*/
private void dealProjectContraption(JgChangeRegistrationUnitDto dto, String nextTaskId, JgChangeRegistrationUnit registration,String op) {
private void dealProjectContraption(JgChangeRegistrationUnitDto dto, String nextTaskId, JgChangeRegistrationUnit registration, String op) {
List<Map<String, Object>> projectContraptionList = dto.getProjectContraptionList();
if(CollUtil.isEmpty(projectContraptionList)){
if (CollUtil.isEmpty(projectContraptionList)) {
throw new BadRequest("工程/装置列表为空");
}
registration.setNextTaskId(nextTaskId);
updateTaskModel(registration, op);
for (Map<String, Object> map : projectContraptionList) {
String useRegistrationCode = (String)map.get("useRegistrationCode");
String useRegistrationCode = (String) map.get("useRegistrationCode");
String sequenceNbr = (String) map.get("sequenceNbr");
String[] estateData = String.valueOf(map.get("estateUnitName")).split("_", 2);
LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode,useRegistrationCode)
wrapper.eq(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
.isNotNull(IdxBizJgProjectContraption::getUseRegistrationCode)
.eq(BaseEntity::getIsDelete,false);
.eq(BaseEntity::getIsDelete, false);
List<IdxBizJgProjectContraption> jgProjectContraptions = projectContraptionService.list(wrapper);
if(CollectionUtils.isEmpty(jgProjectContraptions)){
throw new BadRequest("使用登记证编号："+useRegistrationCode+"对应的工程/装置列表不存在");
if (CollectionUtils.isEmpty(jgProjectContraptions)) {
throw new BadRequest("使用登记证编号：" + useRegistrationCode + "对应的工程/装置列表不存在");
}
//更新产权信息
idxBizJgUseInfoService.update(
new IdxBizJgUseInfo().setEstateUnitCreditCode(estateData[0]).setEstateUnitName(estateData[1]),
new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr)
);
//如果工程装置对应一个证就直接变更给新单位 否则重新生成一个登记证
if(jgProjectContraptions.size() == 1){
if (jgProjectContraptions.size() == 1) {
IdxBizJgProjectContraption idxBizJgProjectContraption = jgProjectContraptions.get(0);
idxBizJgProjectContraption.setUseUnitName(registration.getNewUseUnitName());
idxBizJgProjectContraption.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
projectContraptionService.updateById(idxBizJgProjectContraption);
//获取使用登记证
LambdaQueryWrapper<JgUseRegistrationManage> useRegistrationManageWrapper = new LambdaQueryWrapper<>();
useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode,useRegistrationCode)
useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
.isNotNull(JgUseRegistrationManage::getUseRegistrationCode)
.eq(JgUseRegistrationManage::getCertificateStatus,"已登记")
.eq(BaseEntity::getIsDelete,false);
.eq(JgUseRegistrationManage::getCertificateStatus, "已登记")
.eq(BaseEntity::getIsDelete, false);
JgUseRegistrationManage registrationManage = useRegistrationManageService.getBaseMapper().selectOne(useRegistrationManageWrapper);
//修改使用登记证管理使用单位地址、使用单位代码、接收机构、接收机构公司代码、办理日期、使用单位地址
registrationManage.setUseUnitName(registration.getNewUseUnitName());
......@@ -1317,35 +1357,35 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
useRegistrationManageService.updateById(registrationManage);
//新增使用登记证和设备变更记录
this.saveRecordByProjectContraption(registrationManage,registration);
this.saveRecordByProjectContraption(registrationManage, registration);
//通过装置Id查询出设备进行更新 更新其他关联表
this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(),registration,Boolean.FALSE,null);
this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(), registration, Boolean.FALSE, null);
} else {
IdxBizJgProjectContraption idxBizJgProjectContraption = projectContraptionService.getBaseMapper().selectById(Long.valueOf(sequenceNbr));
IdxBizJgProjectContraption idxBizJgProjectContraption = projectContraptionService.getBaseMapper().selectById(Long.valueOf(sequenceNbr));
//查询使用登记表eq 查询和装置关联的管道，取第一个用于生成登记编号
LambdaQueryWrapper<JgChangeRegistrationUnitEq> registrationUnitEqWrapper = new LambdaQueryWrapper<>();
registrationUnitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,idxBizJgProjectContraption.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registration.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete,false);
registrationUnitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId, idxBizJgProjectContraption.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registration.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete, false);
List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(registrationUnitEqWrapper);
if(CollUtil.isEmpty(changeRegistrationUnitEqs)){
if (CollUtil.isEmpty(changeRegistrationUnitEqs)) {
throw new BadRequest("使用登记表没有找到工程/装置对应的信息");
}
//重新生成使用登记证
LambdaQueryWrapper<JgUseRegistrationManage> useRegistrationManageWrapper = new LambdaQueryWrapper<>();
useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode,useRegistrationCode)
useRegistrationManageWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
.isNotNull(JgUseRegistrationManage::getUseRegistrationCode)
.eq(JgUseRegistrationManage::getCertificateStatus,"已登记")
.eq(BaseEntity::getIsDelete,false);
.eq(JgUseRegistrationManage::getCertificateStatus, "已登记")
.eq(BaseEntity::getIsDelete, false);
List<JgUseRegistrationManage> registrationManages = useRegistrationManageService.getBaseMapper().selectList(useRegistrationManageWrapper);
if(CollUtil.isEmpty(registrationManages)){
throw new BadRequest("使用登记编号为："+useRegistrationCode+"不存在");
if (CollUtil.isEmpty(registrationManages)) {
throw new BadRequest("使用登记编号为：" + useRegistrationCode + "不存在");
}
if(registrationManages.size()!=1){
throw new BadRequest("使用登记编号为："+useRegistrationCode+"有重复数据,请排查");
if (registrationManages.size() != 1) {
throw new BadRequest("使用登记编号为：" + useRegistrationCode + "有重复数据,请排查");
}
JgUseRegistrationManage registrationManage=registrationManages.get(0);
JgUseRegistrationManage registrationManage = registrationManages.get(0);
registrationManage.setSequenceNbr(sequence.nextId());
String code = commonServiceImpl.generateRegistrationCode(changeRegistrationUnitEqs.get(0).getEquId(), registrationManage.getReceiveCompanyCode(), true);
registrationManage.setUseRegistrationCode(code);
......@@ -1370,9 +1410,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
idxBizJgProjectContraption.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
projectContraptionService.updateById(idxBizJgProjectContraption);
//新增使用登记证和设备变更记录
this.saveRecordByProjectContraption(registrationManage,registration);
this.saveRecordByProjectContraption(registrationManage, registration);
//通过装置Id查询出设备进行更新 更新其他关联表
this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(),registration,Boolean.TRUE,code);
this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(), registration, Boolean.TRUE, code);
}
}
......@@ -1380,46 +1420,42 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 更新关系表
*
* @param sequenceNbr
* @param registration
* @param isNewUseOrgCode
* @param useOrgCode
*/
private void updateRelationTable(Long sequenceNbr, JgChangeRegistrationUnit registration, Boolean isNewUseOrgCode,String useOrgCode) {
private void updateRelationTable(Long sequenceNbr, JgChangeRegistrationUnit registration, Boolean isNewUseOrgCode, String useOrgCode) {
LambdaQueryWrapper<JgChangeRegistrationUnitEq> unitEqWrapper = new LambdaQueryWrapper<>();
unitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,sequenceNbr)
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registration.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete,false);
unitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId, sequenceNbr)
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registration.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete, false);
List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(unitEqWrapper);
if(!CollectionUtils.isEmpty(changeRegistrationUnitEqs)){
if (!CollectionUtils.isEmpty(changeRegistrationUnitEqs)) {
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : changeRegistrationUnitEqs) {
String equipId = jgChangeRegistrationUnitEq.getEquId();
LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(OtherInfo::getRecord, equipId);
OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
if (ObjectUtils.isNotEmpty(tzsJgOtherInfo)) {
LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(UseInfo::getRecord, equipId);
UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(useInfo)) {
useInfo.setUseUnitName(registration.getNewUseUnitName());
useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
useInfoMapper.updateById(useInfo);
}
//修改ES中使用单位信息和使用单位代码
Map<String, Object> map1 = new HashMap<>();
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间
if(Boolean.TRUE.equals(isNewUseOrgCode)){
map1.put("USE_ORG_CODE", useOrgCode);
}
resultMap.put(equipId, map1);
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(UseInfo::getRecord, equipId);
UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(useInfo)) {
useInfo.setUseUnitName(registration.getNewUseUnitName());
useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
useInfoMapper.updateById(useInfo);
}
//修改ES中使用单位信息和使用单位代码
Map<String, Object> map1 = new HashMap<>();
String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
map1.put("REC_DATE", new Date());// 更新时间
if (Boolean.TRUE.equals(isNewUseOrgCode)) {
map1.put("USE_ORG_CODE", useOrgCode);
}
resultMap.put(equipId, map1);
//修改各类告知列表，置为废弃
this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
}
}
......@@ -1427,9 +1463,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 保存装置单位变更记录
*
* @param registrationManage
*/
private void saveRecordByProjectContraption(JgUseRegistrationManage registrationManage,JgChangeRegistrationUnit registrationUnit) {
private void saveRecordByProjectContraption(JgUseRegistrationManage registrationManage, JgChangeRegistrationUnit registrationUnit) {
List<JgChangeRegistrationUnitEq> eqList = registrationUnitEqService.lambdaQuery().eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registrationManage.getSequenceNbr()).list();
List<JgCertificateChangeRecordEq> changeRecordEqList = new ArrayList<>();
JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord();
......@@ -1449,10 +1486,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
changeRecord.setCreateDate(new Date());
changeRecord.setSequenceNbr(nextId);
for (JgChangeRegistrationUnitEq unitEq : eqList) {
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(nextId));//登记证记录主键
changeRecordEq.setEquId(unitEq.getEquId());//设备主键
changeRecordEqList.add(changeRecordEq);
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(nextId));//登记证记录主键
changeRecordEq.setEquId(unitEq.getEquId());//设备主键
changeRecordEqList.add(changeRecordEq);
}
certificateChangeRecordService.save(changeRecord);
if (!changeRecordEqList.isEmpty()) {
......@@ -1493,17 +1530,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
JgChangeRegistrationUnit registrationUnit = this.lambdaQuery().eq(JgChangeRegistrationUnit::getApplyNo, applyNo)
.eq(JgChangeRegistrationUnit::getIsDelete, false)
.one();
if(Objects.nonNull(registrationUnit)){
if (Objects.nonNull(registrationUnit)) {
LambdaQueryWrapper<JgChangeRegistrationUnitEq> wrapper = new LambdaQueryWrapper<>();
wrapper.in(JgChangeRegistrationUnitEq::getProjectContraptionId,projectContraptionIdList)
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registrationUnit.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete,false);
wrapper.in(JgChangeRegistrationUnitEq::getProjectContraptionId, projectContraptionIdList)
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registrationUnit.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete, false);
List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(wrapper);
if(CollUtil.isNotEmpty(changeRegistrationUnitEqs)){
changeRegistrationUnitEqs.forEach(item->records.add(item.getEquId()));
if (CollUtil.isNotEmpty(changeRegistrationUnitEqs)) {
changeRegistrationUnitEqs.forEach(item -> records.add(item.getEquId()));
}
}
}else {
} else {
List<JSONObject> equList = registrationManageService.queryEquByCertificateSeqList(registrationIdList);
// 获取单位变更设备列表
if (CollectionUtils.isEmpty(equList)) {
......@@ -1640,7 +1677,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
//张三办理了【单位变更】 ，单号【DWBG202407050001】，原恒星电梯单位变更为新恒星电梯有限公司，办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return obj.getNewUseUnitName()+"的"+agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【单位变更登记】，单号【"
return obj.getNewUseUnitName() + "的" + agencyUserModelFeignClientResult.getResult().getRealName() + "办理了【单位变更登记】，单号【"
+ obj.getApplyNo() + "】，原" + obj.getUseUnitName() + "变更为新"
+ obj.getNewUseUnitName() + "，申请日期" + simpleDateFormat.format(obj.getCreateDate());
}
......@@ -1764,7 +1801,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Override
public boolean beforeCheck(JgChangeRegistrationUnit jgChangeRegistrationUnit) {
return jgChangeRegistrationUnit.getInstanceId() != null && !jgChangeRegistrationUnit.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) &&!jgChangeRegistrationUnit.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
return jgChangeRegistrationUnit.getInstanceId() != null && !jgChangeRegistrationUnit.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) && !jgChangeRegistrationUnit.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName());
}
@Override
......@@ -1808,17 +1845,18 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 注销-数据处理
*
* @param applyNoList 申请单号list
*/
private void scrapCancelHandler(List<String> applyNoList){
applyNoList.forEach(applyNo ->{
private void scrapCancelHandler(List<String> applyNoList) {
applyNoList.forEach(applyNo -> {
// 查询注销数据
JgScrapCancel scrapCancel = jgScrapCancelMapper.selectOne(new LambdaQueryWrapper<JgScrapCancel>()
.eq(JgScrapCancel::getApplyNo, applyNo));
// 查询注销的历史数据
JgRegistrationHistory history = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getRegistrationClass, "注销")
.eq(JgRegistrationHistory::getCurrentDocumentId,scrapCancel.getSequenceNbr()));
.eq(JgRegistrationHistory::getCurrentDocumentId, scrapCancel.getSequenceNbr()));
// 查询已经入库的设备id
List<String> inEqTableEquId = jgScrapCancelEqMapper.selectList(new LambdaQueryWrapper<JgScrapCancelEq>()
.eq(JgScrapCancelEq::getEquipTransferId, scrapCancel.getSequenceNbr()))
......@@ -1835,7 +1873,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
List<String> toBeProcessedEqRecord = toBeProcessedEq.stream().map(item -> String.valueOf(item.get("SEQUENCE_NBR"))).collect(Collectors.toList());
// 保存到对应的eq表
ArrayList<JgScrapCancelEq> jgScrapCancelEqs = new ArrayList<>();
toBeProcessedEqRecord.forEach(eq ->{
toBeProcessedEqRecord.forEach(eq -> {
IdxBizJgRegisterInfo jgRegisterInfo = idxBizJgRegisterInfoService.getBaseMapper().selectOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, eq));
JgScrapCancelEq cancelEq = new JgScrapCancelEq();
cancelEq.setEquipTransferId(String.valueOf(scrapCancel.getSequenceNbr()));
......@@ -1860,7 +1898,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.in(JgUseRegistrationManage::getSequenceNbr, certificateSeq)
.eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()));
LambdaUpdateWrapper<JgUseRegistrationManage> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(JgUseRegistrationManage::getSequenceNbr,jgUseRegistrationManages.stream().map(BaseEntity::getSequenceNbr).collect(Collectors.toList()));
updateWrapper.in(JgUseRegistrationManage::getSequenceNbr, jgUseRegistrationManages.stream().map(BaseEntity::getSequenceNbr).collect(Collectors.toList()));
updateWrapper.set(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName());
jgUseRegistrationManageMapper.update(null, updateWrapper);
// 修改es数据
......@@ -1924,11 +1962,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
* @param applyNoList 申请编号list
*/
private void changeRegistrationUnitHandler(List<String> applyNoList) {
applyNoList.forEach(applyNo ->{
applyNoList.forEach(applyNo -> {
// 查询单位变更登记的历史数据
JgRegistrationHistory history = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>()
.eq(JgRegistrationHistory::getRegistrationClass, "单位变更登记")
.eq(JgRegistrationHistory::getCurrentDocumentId,applyNo));
.eq(JgRegistrationHistory::getCurrentDocumentId, applyNo));
// 查询变更数据
JgChangeRegistrationUnit registrationUnit = this.baseMapper.selectOne(new LambdaQueryWrapper<JgChangeRegistrationUnit>()
.eq(JgChangeRegistrationUnit::getApplyNo, history.getCurrentDocumentId()));
......@@ -1972,6 +2010,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
});
registrationUnitEqService.saveBatch(jgRelationEquipList);
}
/**
* 单位变更-修改es漏掉的设备
*/
......@@ -1987,6 +2026,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
});
}
/**
* 单位变更-修改使用信息表中漏掉的设备
*/
......@@ -2005,6 +2045,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 保存工业管道的单位变更
*
* @param submitType
* @param map
* @param reginParams
......@@ -2022,16 +2063,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
//根据使用登记证查询设备
List<String> registrationNoList = new ArrayList<>();//使用登记证编号
Map<String,String> useRegistrationCodeMap = new HashMap<>();
Map<String, String> useRegistrationCodeMap = new HashMap<>();
for (Map<String, Object> objectMap : projectContraptionList) {
if (objectMap.containsKey("useRegistrationCode") && ObjectUtils.isNotEmpty(objectMap.get("useRegistrationCode"))) {
registrationNoList.add(objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(),objectMap.get("useRegistrationCode").toString());
useRegistrationCodeMap.put(objectMap.get("sequenceNbr").toString(), objectMap.get("useRegistrationCode").toString());
}
}
//查询装置下的管道信息
List<Map<String, Object>> deviceList = this.queryPipelineList(projectContraptionList);
if(CollUtil.isEmpty(deviceList)){
if (CollUtil.isEmpty(deviceList)) {
throw new BadRequest("工程/装置下没有管道信息");
}
if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
......@@ -2164,7 +2205,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
deviceList.forEach(device -> {
JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
if (device.containsKey("projectContraptionId")) {
String projectContraptionId = (String)device.get("projectContraptionId");
String projectContraptionId = (String) device.get("projectContraptionId");
unitEq.setRegistrationCertificate(useRegistrationCodeMap.get(projectContraptionId));
unitEq.setProjectContraptionId(projectContraptionId);
}
......@@ -2194,16 +2235,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
/**
* 获取装置下的管道信息
*
* @param projectContraptionList
* @return
*/
public List<Map<String, Object>> queryPipelineList(List<Map<String, Object>> projectContraptionList) {
List<Map<String, Object>> result = new ArrayList<>();
projectContraptionList.forEach(item-> result.addAll(projectContraptionService.getBaseMapper().selectEquipList((String) item.get("sequenceNbr"))));
projectContraptionList.forEach(item -> result.addAll(projectContraptionService.getBaseMapper().selectEquipList((String) item.get("sequenceNbr"))));
return result;
}
public Map<String, Map<String, Object>> detailsByProjectContraption(String sequenceNbr,String applyNo) {
public Map<String, Map<String, Object>> detailsByProjectContraption(String sequenceNbr, String applyNo) {
String[] jsonFields = {"productPhoto", "otherAccessories", "productQualificationCertificate", "startLatitudeLongitude",
"endLatitudeLongitude"};
Map<String, Map<String, Object>> resultMap = new HashMap<>();
......@@ -2214,17 +2256,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
JgChangeRegistrationUnit registrationUnit = this.lambdaQuery().eq(JgChangeRegistrationUnit::getApplyNo, applyNo)
.eq(JgChangeRegistrationUnit::getIsDelete, false)
.one();
if(Objects.isNull(registrationUnit)){
if (Objects.isNull(registrationUnit)) {
resultMap.put("equipInfo", Collections.emptyMap());
return resultMap;
}
//如果单位变更关系表没有管道数据返回空
LambdaQueryWrapper<JgChangeRegistrationUnitEq> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,sequenceNbr)
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registrationUnit.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete,false);
wrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId, sequenceNbr)
.eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registrationUnit.getSequenceNbr())
.eq(JgChangeRegistrationUnitEq::getIsDelete, false);
List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(wrapper);
if(CollUtil.isEmpty(changeRegistrationUnitEqs)){
if (CollUtil.isEmpty(changeRegistrationUnitEqs)) {
resultMap.put("equipInfo", Collections.emptyMap());
return resultMap;
}
......@@ -2236,31 +2278,31 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
.eq(JgRegistrationHistory::getIsDelete, false)
.one();
JSONArray historyJson = JSON.parseArray(history.getChangeData());
if(CollUtil.isEmpty(historyJson)){
if (CollUtil.isEmpty(historyJson)) {
resultMap.put("equipInfo", Collections.emptyMap());
return resultMap;
}
historyJson.forEach(item->{
historyJson.forEach(item -> {
JSONObject jsonObject = JSON.parseObject(item.toString());
if(sequenceNbr.equals(jsonObject.getString("sequenceNbr"))){
if (sequenceNbr.equals(jsonObject.getString("sequenceNbr"))) {
projectContraptionDetail.putAll(jsonObject);
}
});
Map<String, Object> projectContraptionMap = Optional.of(projectContraptionDetail)
.map(map -> {
commonServiceImpl.convertStringToJsonobject(map, jsonFields);
List<JSONObject> pipelineList= new ArrayList<>();
changeRegistrationUnitEqs.forEach(item-> {
List<JSONObject> pipelineList = new ArrayList<>();
changeRegistrationUnitEqs.forEach(item -> {
JSONObject jsonObject = JSON.parseObject(item.getDeviceInfo());
//如果日期格式是时间戳的话需要处理
if(jsonObject.containsKey("uscDate")&&!StringUtils.isEmpty(jsonObject.get("uscDate")) && !jsonObject.getString("uscDate").contains("-")){
if (jsonObject.containsKey("uscDate") && !StringUtils.isEmpty(jsonObject.get("uscDate")) && !jsonObject.getString("uscDate").contains("-")) {
// 转换为 Instant 并指定时区（默认系统时区）
Instant instant = Instant.ofEpochMilli( Long.parseLong(jsonObject.getString("uscDate")));
Instant instant = Instant.ofEpochMilli(Long.parseLong(jsonObject.getString("uscDate")));
ZoneId zoneId = ZoneId.systemDefault();
// 定义日期格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
.withZone(zoneId);
jsonObject.put("uscDate",formatter.format(instant));
jsonObject.put("uscDate", formatter.format(instant));
}
pipelineList.add(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/JgChangeVehicleRegistrationUnitServiceImpl.java
View file @ 41b6903e
......@@ -46,6 +46,7 @@ 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 io.seata.spring.annotation.GlobalTransactional;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
......@@ -109,6 +110,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
private IdxBizJgUseInfoMapper jgUseInfoMapper;
private volatile Map<String, Object> fillingMediumMap;
@Autowired
private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoServiceImpl;
public void changeData(JgChangeVehicleRegistrationUnit dto, CompanyBo company) {
......@@ -531,6 +534,19 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
// 更新es数据
updateEsData(collect, jgChangeVehicleRegistrationUnit, code);
}
// 产权单位信息
if (!StringUtils.isEmpty(jsonObject.getString("estateUnitName"))) {
String[] data = String.valueOf(jsonObject.getString("estateUnitName")).split("_");
// 更新产权单位
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.in(IdxBizJgUseInfo::getRecord, collect);
IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
useInfo.setEstateUnitName(data[1]);
useInfo.setEstateUnitCreditCode(data[0]);
idxBizJgUseInfoServiceImpl.update(useInfo, lambda);
}
// 区内变更
if ("1".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
updateEsData(collect, jgChangeVehicleRegistrationUnit, null);
......@@ -765,10 +781,15 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
if (!ObjectUtils.isEmpty(registrationManage) && !ObjectUtils.isEmpty(registrationManage.getCarNumber())) {
a.put("carNumber", registrationManage.getCarNumber());
}
if(!ObjectUtils.isEmpty(registrationManage.getCarNumber())){
if (!ObjectUtils.isEmpty(a.get("chargingMedium"))) {
a.put("chargingMedium", getFillingMediumMap().get(a.getOrDefault("chargingMedium", "") + ""));
}
});
map.put("estateUnitName", equList.stream()
.map(e -> e.get("estateUnitName"))
.filter(Objects::nonNull)
.findFirst()
.orElse(null));
map.put("dataList", equList);
// 组件回显
if (!ObjectUtils.isEmpty(registrationManage) && !ObjectUtils.isEmpty(registrationManage.getCarNumber())) {
......
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
View file @ 41b6903e
......@@ -1061,6 +1061,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
useInfo.setIsIntoManagement(Boolean.TRUE);
useInfo.setAddress(jgVehicleInformation.getUseUnitAddress());
useInfo.setUseDate(jgVehicleInformation.getUseDate());
useInfo.setEstateUnitCreditCode(jgVehicleInformation.getEstateUnitCreditCode());
useInfo.setEstateUnitName(jgVehicleInformation.getEstateUnitName());
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record"));
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java
View file @ 41b6903e
......@@ -288,4 +288,10 @@ public class IdxBizJgProjectContraption extends BaseEntity {
@TableField(exist = false)
private Boolean disableBasicButton;
/**
* 产权单位code_name
*/
@TableField(exist = false)
private String estateUnitName;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment