Skip to content

A
amos-boot-biz
Commit e9868550 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):台套的历史设备登记

parent c0c3ef08
Show whitespace changes
Inline Side-by-side
Showing with 309 additions and 54 deletions
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
View file @ e9868550
......@@ -84,7 +84,7 @@ public class JgUseRegistration extends BaseEntity {
private Date auditPassDate;
/**
* 登记类别
* 登记类别（1：历史设备登记，0：other）
*/
@TableField("reg_type")
private String regType;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java
View file @ e9868550
......@@ -50,8 +50,12 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
Map<String, Object> getMaintenanceDetail(@Param("id") String id);
Map<String, Object> getMaintenanceDetailByIdx(@Param("id") String id);
Map<String, Object> getiInstallDetail(@Param("id") String id);
Map<String, Object> getiInstallDetailByIdx(@Param("id") String id);
Map<String, Object> getUseRegistrationDetail(@Param("id") String id);
Page<JSONObject> queryForUnitVesselEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml
View file @ e9868550
......@@ -310,6 +310,26 @@
LIMIT 1
</select>
<select id="getiInstallDetailByIdx" resultType="java.util.Map">
SELECT
ibjci."CONSTRUCTION_LEADER_NAME" as installLeaderName ,
ibjci."CONSTRUCTION_LEADER_PHONE" as installLeaderPhone ,
ibjci."USC_DATE" as installStartDate ,
ibjci."USC_UNIT_NAME" as installPropertyUnitName ,
ibjci."PROXY_STATEMENT_ATTACHMENT" as installProxyStatementAttachment ,
ibjci."CONSTRUCTION_CONTRACT_ATTACHMENT" as installContractAttachment ,
ibjci."CONSTRUCTION_OTHER_ACCESSORIES" as insOtherAccessories,
ibjui."STREET_NAME" as installStreet,
ibjui."PROVINCE_NAME" as installProvince,
ibjui."CITY_NAME" as installCity,
ibjui."COUNTY_NAME" as installCounty
FROM "idx_biz_jg_construction_info" AS ibjci
left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjci."RECORD"
WHERE ibjci."RECORD" = #{id}
ORDER BY ibjci."rec_date" desc
LIMIT 1
</select>
<select id="getUseRegistrationDetail" resultType="java.util.Map">
SELECT tjur."status" as UseRegistratStatus,
tjur."sequence_nbr" as UseRegistratSequenceNbr,
......@@ -342,6 +362,23 @@
ORDER BY tjmce."rec_date" desc
LIMIT 1
</select>
<select id="getMaintenanceDetailByIdx" resultType="java.util.Map">
SELECT ibjmri."ME_UNIT_NAME" as maintenanceUnitName,
ibjui."USE_UNIT_NAME" as maintenanceUseUnitName,
-- ibjmri."ME_MASTER" as maintenanceManagerName,
-- ibjmri."ME_MASTER_PHONE" as maintenanceManagerPhone,
ibjmri."ME_MASTER" as maintenanceManagerOneName,
ibjmri."ME_MASTER_PHONE" as maintenanceManagerOnePhone,
ibjmri."ME_MASTER1" as maintenanceManagerTwoName,
ibjmri."ME_MASTER1_PHONE" as maintenanceManagerTwoPhone,
ibjmri."REPAIR_INFORM" as maintenanceContract
FROM "idx_biz_jg_maintenance_record_info" as ibjmri
left join "idx_biz_jg_use_info" as ibjui on ibjui."RECORD" = ibjmri."RECORD"
WHERE ibjmri."RECORD" = #{id}
ORDER BY ibjmri."rec_date" desc
LIMIT 1
</select>
<select id="selectEquipList" resultType="java.util.Map">
select jui.RECORD as SEQUENCE_NBR,
(SELECT name from tz_equipment_category where code = jri.EQU_LIST) as EQU_LIST,
......
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
View file @ e9868550
......@@ -1069,26 +1069,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
taskMap.put("model", taskMessageDto);
TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
jgCertificateChangeRecord.setAuditPassDate(new Date());
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
certificateChangeRecordService.save(jgCertificateChangeRecord);
// 生成证记录表主键
long certChangeSeq = sequence.nextId();
// 生成jg证书变更记录
genJgCertificateChangeRecord(jgInstallationNotice,certChangeSeq, registrationCode, idxBizJgRegisterInfo, taskV2Model1);
// 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
......@@ -1096,7 +1080,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
// 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());//登记证记录主键
changeRecordEq.setChangeRecordId(String.valueOf(certChangeSeq));//登记证记录主键
changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq);
......@@ -1184,6 +1168,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
}
}
public void genJgCertificateChangeRecord(JgInstallationNotice jgInstallationNotice,Long sequenceNbr, String registrationCode, IdxBizJgRegisterInfo idxBizJgRegisterInfo, TaskV2Model taskV2Model1) {
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
jgCertificateChangeRecord.setAuditPassDate(new Date());
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
certificateChangeRecordService.save(jgCertificateChangeRecord);
}
private void createConstruction2Db(JgInstallationNotice jgInstallationNotice, JgInstallationNoticeEq jgRelationEquip) {
IdxBizJgConstructionInfo idxBizJgConstructionInfo = new IdxBizJgConstructionInfo();
idxBizJgConstructionInfo.setUscUnitCreditCode(jgInstallationNotice.getInstallUnitCreditCode());
......
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
View file @ e9868550
......@@ -175,6 +175,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
@Autowired
private JgUseRegistrationManageServiceImpl jgUseRegistrationManageService;
@Autowired
private IdxBizJgConstructionInfoServiceImpl idxBizJgConstructionInfoService;
@Autowired
private JgInstallationNoticeServiceImpl jgInstallationNoticeService;
/**
* @param auditPassDate 通过时间
......@@ -957,7 +961,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
changeRecord.setAuditPassDate(new Date());
changeRecord.setRegType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName());
changeRecord.setRegDate(jgUseRegistration.getCreateDate());
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, flag));//变更内容
changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration,BusinessTypeEnum.JG_USAGE_REGISTRATION.getName(), flag));//变更内容
changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
changeRecord.setCertificateNo(commonServiceImpl.generateCertificateNo(equType,new Date(),jgUseRegistration.getReceiveCompanyCode()));//登记证书唯一码
......@@ -1249,10 +1253,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
}
private String buildRecordContent(JgUseRegistration obj, Boolean flag) {
private String buildRecordContent(JgUseRegistration obj,String businessName, Boolean flag) {
//张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日");
return obj.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + (flag ? "设备增补" : "") + "】，" +
return obj.getRecUserName() + "办理了【" + businessName + (flag ? "设备增补" : "") + "】，" +
"单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
}
......@@ -2040,7 +2044,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/
private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
// 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) {
if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())
|| jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))
|| jgUseRegistration.getRegType().equals("1")) {
// 基本信息 + 制造信息
Map<String, Object> detail = this.baseMapper.getDetail(record);
// 设计信息
......@@ -2050,8 +2056,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
// 安装信息
Map<String, Object> installDetail = this.baseMapper.getiInstallDetail(record);
// 历史设备登记来的数据没有安装业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(installDetail)){
installDetail = this.baseMapper.getiInstallDetailByIdx(record);
}
// 维保信息
Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
// 历史设备登记来的数据没有维保业务信息 从一码通数据拿
if (ValidationUtil.isEmpty(maintenanceDetail)){
maintenanceDetail = this.baseMapper.getMaintenanceDetailByIdx(record);
}
if (!ObjectUtils.isEmpty(maintenanceDetail)) {
detail.putAll(maintenanceDetail);
}
......@@ -2536,13 +2550,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 业务管理设备信息保存
JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
jgRelationEquip.setEquId(map.get("equipId").toString());
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("type"))), 1);
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
if (!ObjectUtils.isEmpty(listResponseModel)) {
jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
}
jgUseRegistration.setAuditPassDate(new Date());
jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useRegistrationCode")) ? "" : String.valueOf(map.get("useRegistrationCode")));
jgUseRegistration.setRegType("1");//历史登记
this.save(jgUseRegistration);
jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
......@@ -2551,41 +2566,53 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 暂存历史表
updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
LambdaQueryWrapper<JgRegistrationHistory> lambdaSelect = new QueryWrapper<JgRegistrationHistory>().lambda();
lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, jgUseRegistration.getSequenceNbr());
JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
TaskV2Model taskV2Model = new TaskV2Model();
taskV2Model.setRoutePath("");
// 登记证记录主键
Long changeRecordId= sequence.nextId();
// 注册信息
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
processMapData(null, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, map, Boolean.FALSE, null);
// 生成证书管理表记录
generateRegistrationManage(jgUseRegistration, registerInfo, Boolean.FALSE, null);
// 生成一条使用登记证变更记录
generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, Boolean.FALSE);
registerInfo.setUseOrgCode(ValidationUtil.isEmpty(map.get("useRegistrationCode")) ? "" : String.valueOf(map.get("useRegistrationCode")));
// 查询设备制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
// 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq);
// 使用信息
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, String.valueOf(map.get("equipId")));
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() +"/" + useInfo.getStreetName();
useInfo.setIsIntoManagement(Boolean.TRUE);
useInfo.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
useInfo.setUseUnitName(String.valueOf(map.get("useUnitName")));
useInfo.setProvince("610000");
useInfo.setProvinceName("陕西省");
useInfo.setCity(String.valueOf(map.get("city")).split("_")[0]);
// useInfo.setCityName(String.valueOf(map.get("city")).split("_")[1]);
useInfo.setCounty(String.valueOf(map.get("county")).split("_")[0]);
// useInfo.setCountyName(String.valueOf(map.get("county")).split("_")[1]);
useInfo.setFactoryUseSiteStreet(String.valueOf(map.get("factoryUseSiteStreet")).split("_")[0]);
// useInfo.setStreetName(String.valueOf(map.get("factoryUseSiteStreet")).split("_")[1]);
useInfo.setAddress(String.valueOf(map.get("address")));
useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
useInfo.setEstateUnitCreditCode(String.valueOf(map.get("estateUnitName")).split("_")[0]);
useInfo.setEstateUnitName(String.valueOf(map.get("estateUnitName")).split("_")[1]);
useInfoMapper.updateById(useInfo);
// 更新es
updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
// 设备安装信息更新
this.historyEquUpdateInstallInfo(map);
// 设备维保信息更新
this.historyEquUpdateMaintenanceInfo(map);
// 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
historyEquGenManageRelated(map,jgUseRegistration, registerInfo,idxBizJgFactoryInfo);
}
return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
} catch (BadRequest | LocalBadRequest e) {
......@@ -2600,4 +2627,154 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
FlowingEquipRedisContext.clean();
}
}
/**
* 历史设备登记-》更新维保信息
*/
private void historyEquUpdateMaintenanceInfo(JSONObject map){
SimpleDateFormat format = new SimpleDateFormat();
IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (!ValidationUtil.isEmpty(info)) {
info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]);
info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]);
info.setMeMaster(ValidationUtil.isEmpty(map.get("meMaster")) ? null : String.valueOf(map.get("meMaster")).split("_")[1]);
info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("meMasterPhone")) ? null : String.valueOf(map.get("meMasterPhone")));
info.setMeMasterId(ValidationUtil.isEmpty(map.get("meMasterId")) ? null : String.valueOf(map.get("meMasterId")));
info.setMeMaster1(ValidationUtil.isEmpty(map.get("meMaster1")) ? null : String.valueOf(map.get("meMaster1")).split("_")[1]);
info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("meMaster1Phone")) ? null : String.valueOf(map.get("meMaster1Phone")));
info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("meMaster1Id")) ? null : String.valueOf(map.get("meMaster1Id")));
try {
info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : format.parse(String.valueOf(map.get("informStart"))));
info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : format.parse(String.valueOf(map.get("informEnd"))));
}catch (Exception exception){
exception.printStackTrace();
log.info("date转化失败");
}
info.setRepairInform(ValidationUtil.isEmpty(map.get("repairInform")) ? null : JSONObject.toJSONString(map.get("repairInform")));
}
idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
}
/**
* 历史设备登记-》更新安装信息
*/
private void historyEquUpdateInstallInfo(JSONObject map){
IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
if (!ValidationUtil.isEmpty(constructionInfo)) {
constructionInfo.setUscUnitCreditCode(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[0]);
constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[1]);
constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")).split("_")[1]);
constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
constructionInfo.setConstructionContractAttachment(ValidationUtil.isEmpty(map.get("installContractAttachment")) ? null : JSONObject.toJSONString(map.get("installContractAttachment")));
constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
}
idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
}
private void historyEquGenManageRelated(JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo,IdxBizJgFactoryInfo idxBizJgFactoryInfo){
// 生成证书管理表记录
generateRegistrationManage(jgUseRegistration, registerInfo, Boolean.FALSE, null);
// 使用登记证变更记录 -> 使用登记记录
long jgUseRegSeq = sequence.nextId();
generateCertificateChangeRecord(jgUseRegistration, registerInfo, jgUseRegSeq, new TaskV2Model(), Boolean.FALSE);
// 使用登记证变更记录 -> 使用登记记录 ——> 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
changeRecordEq.setChangeRecordId(String.valueOf(jgUseRegSeq));//登记证记录主键
changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq);
// 使用登记证变更记录 -> 安装告知记录
if (!ValidationUtil.isEmpty(map.get("uscUnitCodeAndName"))){
long jgInstallSeq = sequence.nextId();//登记证记录主键
String useRegistrationCode = jgUseRegistration.getUseRegistrationCode();// 使用登记证编号
genJgCertChangeRecordForInstall(jgInstallSeq,useRegistrationCode,map,jgUseRegistration,registerInfo);
// 使用登记证变更记录 -> 安装告知记录 ——> 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq1 = new JgCertificateChangeRecordEq();
changeRecordEq1.setChangeRecordId(String.valueOf(jgInstallSeq));
changeRecordEq1.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq1.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq1);
}
// 使用登记证变更记录 -> 维保备案记录
if (!ValidationUtil.isEmpty(map.get("uscUnitCodeAndName"))){
long jgMaintenanceSeq = sequence.nextId();//登记证记录主键
String useRegistrationCode = jgUseRegistration.getUseRegistrationCode();// 使用登记证编号
genJgCertChangeRecordForMaintenance(jgMaintenanceSeq,useRegistrationCode,map,jgUseRegistration,registerInfo);
// 使用登记证变更记录 -> 维保备案记录 ——> 生成tzs_jg_certificate_change_record_eq记录
JgCertificateChangeRecordEq changeRecordEq2 = new JgCertificateChangeRecordEq();
changeRecordEq2.setChangeRecordId(String.valueOf(jgMaintenanceSeq));
changeRecordEq2.setEquId(registerInfo.getRecord());//设备主键
changeRecordEq2.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
certificateChangeRecordEqService.save(changeRecordEq2);
}
}
public void genJgCertChangeRecordForInstall(Long sequenceNbr, String registrationCode,JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo idxBizJgRegisterInfo) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String changeContent = "";
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo("");
try {
changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName() + "】，" +
"办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("installStartDate")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("installStartDate")));
}catch (Exception e){
e.printStackTrace();
log.info("date转化错误");
}
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
jgCertificateChangeRecord.setChangeContent(changeContent);//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveOrgName(String.valueOf(map.get("receiveOrgCode")).split("_")[1]);
jgCertificateChangeRecord.setReceiveCompanyCode(String.valueOf(map.get("receiveOrgCode")).split("_")[0]);//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(String.valueOf(map.get("useUnitName")));//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath("");
jgCertificateChangeRecord.setCreateUserId(RequestContext.getExeUserId());
jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
certificateChangeRecordService.save(jgCertificateChangeRecord);
}
public void genJgCertChangeRecordForMaintenance(Long sequenceNbr, String registrationCode,JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo idxBizJgRegisterInfo) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
String changeContent = "";
// 生成一条tzs_jg_certificate_change_record记录
JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
jgCertificateChangeRecord.setApplyNo("");
try {
changeContent = jgUseRegistration.getRecUserName() + "办理了【" + BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "】，" +
"办理日期" + map.get("installStartDate");
jgCertificateChangeRecord.setAuditPassDate(simpleDateFormat.parse((String) map.get("informEnd")));
jgCertificateChangeRecord.setRegDate(simpleDateFormat.parse((String) map.get("informStart")));
}catch (Exception e){
e.printStackTrace();
log.info("date转化错误");
}
jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
jgCertificateChangeRecord.setChangeContent(changeContent);//变更内容
jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
jgCertificateChangeRecord.setReceiveOrgName(String.valueOf(map.get("receiveOrgCode")).split("_")[1]);
jgCertificateChangeRecord.setReceiveCompanyCode(String.valueOf(map.get("receiveOrgCode")).split("_")[0]);//接收机构公司代码
jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
jgCertificateChangeRecord.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));//使用单位统一信用代码
jgCertificateChangeRecord.setUseUnitName(String.valueOf(map.get("useUnitName")));//使用单位名称
jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
jgCertificateChangeRecord.setCreateDate(new Date());
jgCertificateChangeRecord.setRoutePath("");
jgCertificateChangeRecord.setCreateUserId(RequestContext.getExeUserId());
jgCertificateChangeRecord.setSequenceNbr(sequenceNbr);
certificateChangeRecordService.save(jgCertificateChangeRecord);
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgConstructionInfo.java
View file @ e9868550
......@@ -54,13 +54,13 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
private String uscUnitCreditCode;
/**
*
* 施工单位名称
*/
@TableField("\"USC_UNIT_NAME\"")
private String uscUnitName;
/**
*
* 施工时间
*/
@TableField("\"USC_DATE\"")
private Date uscDate;
......@@ -94,5 +94,35 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
@TableField(value = "\"INFORM_FILE_PATH\"")
private String informFilePath;
/**
* 施工负责人
*/
@TableField(value = "\"CONSTRUCTION_LEADER_NAME\"")
private String constructionLeaderName;
/**
* 施工负责人手机
*/
@TableField(value = "\"CONSTRUCTION_LEADER_PHONE\"")
private String constructionLeaderPhone;
/**
* 施工委托书图片
*/
@TableField(value = "\"PROXY_STATEMENT_ATTACHMENT\"")
private String proxyStatementAttachment;
/**
* 施工合同照片
*/
@TableField(value = "\"CONSTRUCTION_CONTRACT_ATTACHMENT\"")
private String constructionContractAttachment;
/**
* 其他附件
*/
@TableField(value = "\"CONSTRUCTION_OTHER_ACCESSORIES\"")
private String constructionOtherAccessories;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java
View file @ e9868550
......@@ -56,19 +56,19 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
private String meUnitName;
/**
*
* 维保备案合同
*/
@TableField("\"REPAIR_INFORM\"")
private String repairInform;
/**
*
* 维保合同开始日期
*/
@TableField("\"INFORM_START\"")
private Date informStart;
/**
*
* 维保合同结束日期
*/
@TableField("\"INFORM_END\"")
private Date informEnd;
......
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