单位变更bug修改

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -141,6 +142,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     JgRegistrationHistoryServiceImpl registrationHistoryService;
 
     @Autowired
+    private Sequence sequence;
+
+    @Autowired
     JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
 
     @Autowired
@@ -477,6 +481,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord();
         JSONArray historyJson = JSON.parseArray(historyList.get(0).getChangeData());
         for (Object object : historyJson) {
+            long nextId = sequence.nextId();
             JSONObject jsonObject = JSON.parseObject(object.toString());
             String registrationCode = jsonObject.getString("useRegistrationCode");
             String certificateNo = jsonObject.getString("certificateNo");
@@ -494,14 +499,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             changeRecord.setUseUnitName(registrationUnit.getNewUseUnitName());//使用单位名称
             changeRecord.setEquCategory(equCategoryCode);//设备类别编码
             changeRecord.setCreateDate(new Date());
-            changeRecord.setSequenceNbr(Long.parseLong(UUID.randomUUID().toString().replace("-","")));
+            changeRecord.setSequenceNbr(nextId);
             changeRecordList.add(changeRecord);
             for (JgChangeRegistrationUnitEq unitEq : eqList) {
                 if (!StringUtils.isEmpty(unitEq.getRegistrationCertificate()) && !StringUtils.isEmpty(registrationCode) &&
                         unitEq.getRegistrationCertificate().equals(registrationCode)) {
                     JSONObject deviceJson = JSON.parseObject(unitEq.getDeviceInfo());
                     JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
-                    changeRecordEq.setChangeRecordId(changeRecord.getSequenceNbr().toString());//登记证记录主键
+                    changeRecordEq.setChangeRecordId(String.valueOf(nextId));//登记证记录主键
                     changeRecordEq.setEquId(deviceJson.getString("SEQUENCE_NBR"));//设备主键
                     changeRecordEqList.add(changeRecordEq);
                 }
@@ -635,7 +640,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 //        });
 
 //        WorkflowResultDto workDto = new WorkflowResultDto();
-        model.setSequenceNbr(Long.parseLong(UUID.randomUUID().toString().replace("-","")));
+        model.setSequenceNbr(sequence.nextId());
         model.setCreateDate(new Date());
         model.setCreateUserName(reginParams.getUserModel().getRealName());
         model.setUseRegistCode(String.join("，", registrationNoList));