Commit bf0f3395 authored by 王果's avatar 王果

单位变更bug修改

parent 4d688fb1
...@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray; ...@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -142,9 +141,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -142,9 +141,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
JgRegistrationHistoryServiceImpl registrationHistoryService; JgRegistrationHistoryServiceImpl registrationHistoryService;
@Autowired @Autowired
private Sequence sequence;
@Autowired
JgCertificateChangeRecordServiceImpl certificateChangeRecordService; JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
@Autowired @Autowired
...@@ -498,7 +494,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -498,7 +494,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
changeRecord.setUseUnitName(registrationUnit.getNewUseUnitName());//使用单位名称 changeRecord.setUseUnitName(registrationUnit.getNewUseUnitName());//使用单位名称
changeRecord.setEquCategory(equCategoryCode);//设备类别编码 changeRecord.setEquCategory(equCategoryCode);//设备类别编码
changeRecord.setCreateDate(new Date()); changeRecord.setCreateDate(new Date());
changeRecord.setSequenceNbr(sequence.nextId()); changeRecord.setSequenceNbr(Long.parseLong(UUID.randomUUID().toString()));
changeRecordList.add(changeRecord); changeRecordList.add(changeRecord);
for (JgChangeRegistrationUnitEq unitEq : eqList) { for (JgChangeRegistrationUnitEq unitEq : eqList) {
if (!StringUtils.isEmpty(unitEq.getRegistrationCertificate()) && !StringUtils.isEmpty(registrationCode) && if (!StringUtils.isEmpty(unitEq.getRegistrationCertificate()) && !StringUtils.isEmpty(registrationCode) &&
...@@ -639,7 +635,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -639,7 +635,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
// }); // });
// WorkflowResultDto workDto = new WorkflowResultDto(); // WorkflowResultDto workDto = new WorkflowResultDto();
model.setSequenceNbr(sequence.nextId()); model.setSequenceNbr(Long.parseLong(UUID.randomUUID().toString()));
model.setCreateDate(new Date()); model.setCreateDate(new Date());
model.setCreateUserName(reginParams.getUserModel().getRealName()); model.setCreateUserName(reginParams.getUserModel().getRealName());
model.setUseRegistCode(String.join(",", registrationNoList)); model.setUseRegistCode(String.join(",", registrationNoList));
......
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