ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(企标稽查流程): 保存问题修复

Browse Source
This commit is contained in:
yjz
2024-01-06 21:12:42 +08:00
parent d519f9e92f
commit 2ea8dae465
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java
+3
View File
@@ -1,5 +1,6 @@
package com.jero.modules.activiti.process.esinspect.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -44,10 +45,12 @@ public class ProcessEsInspect extends BaseEntity {
@ApiModelProperty(value = "实际稽查完成日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date completeDate;
/**实际稽查人*/
@Excel(name = "实际稽查人", width = 15)
@ApiModelProperty(value = "实际稽查人")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private java.lang.String actualInspectUser;
/**稽查内容*/
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java
+3 -17
View File
@@ -3,7 +3,6 @@ package com.jero.modules.activiti.process.esinspect.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.SnowflakeUtils;
import com.jero.modules.activiti.entity.ProcessAll;
@@ -175,13 +174,11 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
v.setProjectId(projectId);
return v;
}).collect(Collectors.toList()).forEach(v -> log.info(v.toString()));
// 重复性校验
duplicateCheck(processEsInspectList);
processEsInspectService.saveOrUpdateBatch(processEsInspectList);
for (ProcessEsInspect processEsInspect : processEsInspectList) {
// 处理稽查内容
if (EsInspectCommon.PROCESS_NODE_1.equals(processAll.getNodeId())){
if (StringUtils.isBlank(processAll.getNodeId())){
// 添加新稽查内容
List<EnterpriseStandardInspectContent> enterpriseStandardInspectContentList = processEsInspect.getEnterpriseStandardInspectContentList();
enterpriseStandardInspectContentList = enterpriseStandardInspectContentList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList());
@@ -203,7 +200,7 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
enterpriseStandardInspectReportList = enterpriseStandardInspectReportList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList());
for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : enterpriseStandardInspectReportList) {
enterpriseStandardInspectReport.setId(String.valueOf(SnowflakeUtils.snowflake()));
enterpriseStandardInspectReport.setInspectId(processEsInspect.getId());
enterpriseStandardInspectReport.setProcessEsInspectId(processEsInspect.getId());
}
enterpriseStandardInspectReportService.saveOrUpdateBatch(enterpriseStandardInspectReportList);
@@ -212,23 +209,12 @@ public class EsInspectFlowServiceImpl implements IEsInspectFlowService {
enterpriseStandardInspectRectifyPlanList = enterpriseStandardInspectRectifyPlanList.stream().filter(v -> StringUtils.isBlank(v.getId())).collect(Collectors.toList());
for (EnterpriseStandardInspectRectifyPlan enterpriseStandardInspectRectifyPlan : enterpriseStandardInspectRectifyPlanList) {
enterpriseStandardInspectRectifyPlan.setId(String.valueOf(SnowflakeUtils.snowflake()));
enterpriseStandardInspectRectifyPlan.setInspectId(processEsInspect.getId());
enterpriseStandardInspectRectifyPlan.setProcessEsInspectId(processEsInspect.getId());
}
enterpriseStandardInspectRectifyPlanService.saveOrUpdateBatch(enterpriseStandardInspectRectifyPlanList);
}
}
private void duplicateCheck(List<ProcessEsInspect> processEsInspectList) {
List<ProcessEsInspect> list = processEsInspectService.list(
new LambdaQueryWrapper<ProcessEsInspect>()
.in(ProcessEsInspect::getId, processEsInspectList.stream().map(ProcessEsInspect::getId).collect(Collectors.toList())));
if (!list.isEmpty()){
List<EnterpriseStandardInspect> enterpriseStandardInspectList = enterpriseStandardInspectService.listByIds(list.stream().map(ProcessEsInspect::getInspectId).collect(Collectors.toList()));
String inspectNos = enterpriseStandardInspectList.stream().map(EnterpriseStandardInspect::getInspectNo).collect(Collectors.joining(","));
throw new JeroBootException("稽查依据标准编号为：" + inspectNos + "的稽查已发起过企标稽查流程，请勿重复选择！");
}
}
private void updateLawsEnterpriseStandardStatus(String projectId) {
List<ProcessEsInspect> list = processEsInspectService.list(
new LambdaQueryWrapper<ProcessEsInspect>()
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardInspectVo.java
+2 -2
View File
@@ -138,8 +138,8 @@ public class EnterpriseStandardInspectVo {
* 创建时间
*/
@Excel(name = "创建日期", width = 15, format = "yyyy-MM-dd", needMerge = true)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;