Commit 7baa7148 authored by 刘林's avatar 刘林

fix(jg):使用登记修改投入日期字段取值

parent 6830228d
...@@ -1068,18 +1068,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -1068,18 +1068,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgRegistrationHistory.setChangeData(JSON.toJSONString(mapData)); jgRegistrationHistory.setChangeData(JSON.toJSONString(mapData));
jgRegistrationHistoryService.updateById(jgRegistrationHistory); jgRegistrationHistoryService.updateById(jgRegistrationHistory);
// 装置表写入使用登记证编号、将装置名称写入到使用登记表 // 装置表写入使用登记证编号、将装置名称写入到使用登记表
updateRegAndProjectContrapt(jgUseRegistration); updateRegAndProjectContraption(jgUseRegistration, mapData);
} }
this.getBaseMapper().updateById(jgUseRegistration); this.getBaseMapper().updateById(jgUseRegistration);
commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration)); commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
} }
private void updateRegAndProjectContrapt(JgUseRegistration jgUseRegistration) { private void updateRegAndProjectContraption(JgUseRegistration jgUseRegistration, JSONObject mapData) {
if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){ if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
IdxBizJgProjectContraption jgProjectContraption = jgProjectContraptionService.getById(jgUseRegistration.getProjectContraptionId()); IdxBizJgProjectContraption jgProjectContraption = jgProjectContraptionService.getById(jgUseRegistration.getProjectContraptionId());
jgUseRegistration.setProjectContraption(jgProjectContraption.getProjectContraption()); jgUseRegistration.setProjectContraption(jgProjectContraption.getProjectContraption());
jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode()); jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
jgProjectContraption.setUseDate(String.valueOf(jgUseRegistration.getAuditPassDate())); jgProjectContraption.setUseDate(String.valueOf(mapData.get("useDate")));
jgProjectContraptionService.updateById(jgProjectContraption); jgProjectContraptionService.updateById(jgProjectContraption);
} }
} }
......
...@@ -260,6 +260,6 @@ public class IdxBizJgProjectContraption extends BaseEntity { ...@@ -260,6 +260,6 @@ public class IdxBizJgProjectContraption extends BaseEntity {
/** /**
* 投入日期 * 投入日期
*/ */
@TableField("USE_DATE") @TableField("use_date")
private String useDate; private String useDate;
} }
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