Skip to content

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

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

parent c0c3ef08
Expand all Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 27 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-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