Commit 38f914f8 authored by tianbo's avatar tianbo

fix(jg): 将设备档案序号生成方式从 UUID 修改为 sequence.nextId()

parent f2357858
...@@ -2743,7 +2743,7 @@ public class DataDockServiceImpl { ...@@ -2743,7 +2743,7 @@ public class DataDockServiceImpl {
JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getEquId, useInfo.getRecord()).one(); JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getEquId, useInfo.getRecord()).one();
if (ValidationUtil.isEmpty(resumeInfo)) { if (ValidationUtil.isEmpty(resumeInfo)) {
resumeInfo = new JgResumeInfo(); resumeInfo = new JgResumeInfo();
resumeInfo.setSequenceNbr(UUID.randomUUID().node()); resumeInfo.setSequenceNbr(sequence.nextId());
resumeInfo.setStatus("正常"); resumeInfo.setStatus("正常");
resumeInfo.setBusinessType(BusinessTypeEnum.JG_NEW_EQUIP.getName()); resumeInfo.setBusinessType(BusinessTypeEnum.JG_NEW_EQUIP.getName());
resumeInfo.setEquId(useInfo.getRecord()); resumeInfo.setEquId(useInfo.getRecord());
...@@ -2755,6 +2755,7 @@ public class DataDockServiceImpl { ...@@ -2755,6 +2755,7 @@ public class DataDockServiceImpl {
} }
resumeInfo.setApprovalUnit(useInfo.getUseUnitName()); resumeInfo.setApprovalUnit(useInfo.getUseUnitName());
resumeInfo.setApprovalUnitCode(useInfo.getUseUnitCreditCode()); resumeInfo.setApprovalUnitCode(useInfo.getUseUnitCreditCode());
resumeInfo.setRecDate(new Date());
jgResumeInfoService.saveOrUpdate(resumeInfo); jgResumeInfoService.saveOrUpdate(resumeInfo);
} }
...@@ -2955,7 +2956,7 @@ public class DataDockServiceImpl { ...@@ -2955,7 +2956,7 @@ public class DataDockServiceImpl {
JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getApplyNo, jgUseRegistration.getApplyNo()).one(); JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getApplyNo, jgUseRegistration.getApplyNo()).one();
if (ValidationUtil.isEmpty(resumeInfo)) { if (ValidationUtil.isEmpty(resumeInfo)) {
resumeInfo = new JgResumeInfo(); resumeInfo = new JgResumeInfo();
resumeInfo.setSequenceNbr(UUID.randomUUID().node()); resumeInfo.setSequenceNbr(sequence.nextId());
resumeInfo.setBusinessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName()); resumeInfo.setBusinessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName());
resumeInfo.setEquId(equ.get("record").toString()); resumeInfo.setEquId(equ.get("record").toString());
resumeInfo.setApplyNo(jgUseRegistration.getApplyNo()); resumeInfo.setApplyNo(jgUseRegistration.getApplyNo());
......
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