Dlp-Gyjd
/
dlp-entrustment
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250114 更新

Browse Source 
1.受理编号生成，有受理成功后在受理改为委托单位提交后，受理单位审核通过就生成
master
陈江保 1 month ago
parent 0e3b75b34c
commit 148618dedf
1 changed files with 54 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 110
      src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java

110
src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
Unescape View File

@ -1596,11 +1596,15 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
// 审核任务已经提交了, 转到新的环节
int newStatus = -1; // 新的状态(环节)
String currentAcceptNo = "";
{
newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
if (opCode == 1) {
if (opCode == 1 && StrUtil.isBlank(entrustment.getAcceptNo())) {
// 20250114 贵阳需求，审核通过后就生成受理编号
String yearStr = String.valueOf(LocalDateTime.now().getYear());
String maxEntrustAcceptNo = baseMapper.getMaxEntrustAcceptNo(yearStr);
currentAcceptNo = yearStr + "-" + (StrUtil.isBlank(maxEntrustAcceptNo) ? "1" : (Integer.parseInt(maxEntrustAcceptNo) + 1));
}
if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
@ -1621,18 +1625,18 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
//-------------------
// 更新数据库表数据
//-------------------
entrustment.setDestructiveAnalysis(entrust.getDestructiveAnalysis());
entrustment.setOtherIdentificationNotes(entrust.getOtherIdentificationNotes());
// entrustment.setDestructiveAnalysis(entrust.getDestructiveAnalysis());
// entrustment.setOtherIdentificationNotes(entrust.getOtherIdentificationNotes());
//entrustment.setOtherAgreement(entrust.getOtherAgreement());
entrustment.setAvoidIdentifier(entrust.getAvoidIdentifier());
entrustment.setComments(entrust.getComments());
// entrustment.setAvoidIdentifier(entrust.getAvoidIdentifier());
// entrustment.setComments(entrust.getComments());
entrustment.setCheckUser(dlpUser.getId());
entrustment.setCheckTime(LocalDateTime.now());
entrustment.setCheckComments(entrust.getCheckComments());
entrustment.setCheckTimes(entrustment.getCheckTimes() + 1); // 审核次数加 1
entrustment.setPreviousStatus(entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
entrustment.setStatus(newStatus); // 新的状态(环节), 可能会是审批或提交前
// entrustment.setCheckUser(dlpUser.getId());
// entrustment.setCheckTime(LocalDateTime.now());
// entrustment.setCheckComments(entrust.getCheckComments());
// entrustment.setCheckTimes(entrustment.getCheckTimes() + 1); // 审核次数加 1
// entrustment.setPreviousStatus(entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
// entrustment.setStatus(newStatus); // 新的状态(环节), 可能会是审批或提交前
List<UpdateInfo> pis = entrustment.getProcessInfo();
if (pis == null) {
@ -1657,28 +1661,28 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
pis.add(pi);
}
entrustment.setProcessInfo(pis);
// entrustment.setProcessInfo(pis);
UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等
updateWrapper.set("destructive_analysis", entrustment.getDestructiveAnalysis());
updateWrapper.set("other_identification_notes", entrustment.getOtherIdentificationNotes());
updateWrapper.set("destructive_analysis", entrust.getDestructiveAnalysis());
updateWrapper.set("other_identification_notes", entrust.getOtherIdentificationNotes());
updateWrapper.set("other_agreement", entrustment.getOtherAgreement());
updateWrapper.set("avoid_identifier", entrustment.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
updateWrapper.set("comments", entrustment.getComments());
updateWrapper.set("avoid_identifier", entrust.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
updateWrapper.set("comments", entrust.getComments());
updateWrapper.set("return_or_not", entrustment.getReturnOrNot());
updateWrapper.set("check_user", entrustment.getCheckUser());
updateWrapper.set("check_time", entrustment.getCheckTime());
updateWrapper.set("check_comments", entrustment.getCheckComments());
updateWrapper.set("check_times", entrustment.getCheckTimes());
updateWrapper.set("check_user", dlpUser.getId());
updateWrapper.set("check_time", LocalDateTime.now());
updateWrapper.set("check_comments", entrust.getCheckComments());
updateWrapper.set("check_times", entrustment.getCheckTimes() + 1); // 审核次数加 1
updateWrapper.set("approve_candidate_user", entrustment.getApproveCandidateUser());
updateWrapper.set("status", entrustment.getStatus());
updateWrapper.set("previous_status", entrustment.getPreviousStatus());
updateWrapper.set("status", newStatus); // 新的状态(环节), 可能会是审批或提交前
updateWrapper.set("previous_status", entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
// updateWrapper.set("process_info", entrustment.getProcessInfo(), "javaType=String,jdbcType=VARCHAR,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler");
updateWrapper.set("process_info", entrustment.getProcessInfo(), "javaType=String,jdbcType=VARCHAR,typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
updateWrapper.set("process_info", pis, "javaType=String,jdbcType=VARCHAR,typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
updateWrapper.set(StrUtil.isNotBlank(currentAcceptNo), "accept_no", currentAcceptNo);
if (!this.update(null, updateWrapper)) {
throw new RuntimeException("保存委托信息失败");
}
@ -2343,28 +2347,19 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
//-------------------
// 更新数据库表数据
//-------------------
entrustment.setDestructiveAnalysis(entrust.getDestructiveAnalysis());
entrustment.setOtherIdentificationNotes(entrust.getOtherIdentificationNotes());
entrustment.setAvoidIdentifier(entrust.getAvoidIdentifier());
entrustment.setOtherAgreement(entrust.getOtherAgreement());
entrustment.setComments(entrust.getComments());
entrustment.setAcceptUser(null); // 之前可能受理过, 现在后悔了, 置 null
entrustment.setAcceptTime(null); // 之前可能受理过, 现在后悔了, 置 null
entrustment.setAcceptComments(entrust.getAcceptComments());
UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
updateWrapper.eq("id", entrustment.getId()); // 查询条件是 id 相等
updateWrapper.set("destructive_analysis", entrustment.getDestructiveAnalysis());
updateWrapper.set("other_identification_notes", entrustment.getOtherIdentificationNotes());
updateWrapper.set("avoid_identifier", entrustment.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
updateWrapper.set("other_agreement", entrustment.getOtherAgreement());
updateWrapper.set("comments", entrustment.getComments());
updateWrapper.set("destructive_analysis", entrust.getDestructiveAnalysis());
updateWrapper.set("other_identification_notes", entrust.getOtherIdentificationNotes());
updateWrapper.set("avoid_identifier", entrust.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
updateWrapper.set("other_agreement", entrust.getOtherAgreement());
updateWrapper.set("comments", entrust.getComments());
updateWrapper.set("accept_user", entrustment.getAcceptUser());
updateWrapper.set("accept_time", entrustment.getAcceptTime());
updateWrapper.set("accept_comments", entrustment.getAcceptComments());
updateWrapper.set("accept_user", null); // 之前可能受理过, 现在后悔了, 置 null
updateWrapper.set("accept_time", null);
updateWrapper.set("accept_comments", entrust.getAcceptComments());
if (!this.update(null, updateWrapper)) {
@ -2382,7 +2377,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
@Override
@GlobalTransactional
public Entrustment bizAccept_Apply(Entrustment entrust, Integer opCode, DLPUser dlpUser) {
String newEntrustAcceptNo = "";
// 20250114 贵阳禁毒需求，受理编号在提交审核时就生成
// String newEntrustAcceptNo = "";
if (opCode == null) {
throw new RuntimeException(String.format("受理必须提供 opCode"));
}
@ -2451,15 +2447,15 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
}
}
//从检材中取出委托的受理号
String materialAcceptNo = imList.get(0).getAcceptNo();
// 3-26 如果是大数据平台同步的委托，那么我们在受理完成的时候先生成一个空的受理编号，最后在同步大数据平台信息的时候会把这个编号赋值过去
// String materialAcceptNo = imList.get(0).getAcceptNo(); 20250114
// // 3-26 如果是大数据平台同步的委托，那么我们在受理完成的时候先生成一个空的受理编号，最后在同步大数据平台信息的时候会把这个编号赋值过去
//// newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
// entrustmentIdentificationMaterialService.getNewIdentificationMaterialNo(newEntrustAcceptNo);
// if (entrustment.getDataSources() != 1) {
// newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
entrustmentIdentificationMaterialService.getNewIdentificationMaterialNo(newEntrustAcceptNo);
if (entrustment.getDataSources() != 1) {
newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
} else {
newEntrustAcceptNo = "acceptNo";
}
// } else {
// newEntrustAcceptNo = "acceptNo";
// }
}
int newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
@ -2528,12 +2524,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
entrustment.setProcessInfo(pis);
//上面注释的代码前面已经设置过，不需要再设置一次，直接更新
if (StringUtils.isNotBlank(newEntrustAcceptNo)) {
entrustment.setAcceptNo(newEntrustAcceptNo);//设置受理编号
}
if (!StringUtils.isNotBlank(newEntrustAcceptNo) && opCode == 1) {
throw new RuntimeException("受理编号不能为空");
}
// if (StringUtils.isNotBlank(newEntrustAcceptNo)) { 20250114
// entrustment.setAcceptNo(newEntrustAcceptNo);//设置受理编号
// }
// if (!StringUtils.isNotBlank(newEntrustAcceptNo) && opCode == 1) {
// throw new RuntimeException("受理编号不能为空");
// }
entrustment.setIsTrans(1);//如果是通过我们系统进行受理，就让他不能再手动流转了
if (!this.updateById(entrustment)) {
throw new RuntimeException("保存委托信息失败");

Write Preview
Loading…
Cancel
Save