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

fix(企标稽查整改): 79376

Browse Source
This commit is contained in:
yjz
2023-12-18 14:52:31 +08:00
parent 1d82e9e15f
commit 73ec80b490
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
-1
View File
@@ -127,7 +127,6 @@ public class ProcessAspect {
.ne(ProcessApprovalRecord::getTaskId, processAll.getTaskId()) .ne(ProcessApprovalRecord::getTaskId, processAll.getTaskId())
.set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue()) .set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue())
.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.SUSPEND.getValue())); .set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.SUSPEND.getValue()));
} }
} }
log.info("==========流程会签节点驳回一票否决前置方法结束=========="); log.info("==========流程会签节点驳回一票否决前置方法结束==========");
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectReportServiceImpl.java
+13 -5
View File
@@ -23,6 +23,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @author ThinkBook * @author ThinkBook
@@ -161,8 +162,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
EnterpriseStandardInspectReport enterpriseStandardInspectReport = getById(id); EnterpriseStandardInspectReport enterpriseStandardInspectReport = getById(id);
// 稽查内容查询 // 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo()); if (!Objects.isNull(enterpriseStandardInspectContent)){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
}
return enterpriseStandardInspectReport; return enterpriseStandardInspectReport;
} }
@@ -173,8 +176,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
.orderByDesc(EnterpriseStandardInspectReport::getCreateTime)); .orderByDesc(EnterpriseStandardInspectReport::getCreateTime));
// 稽查内容查询 // 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo()); if (!Objects.isNull(enterpriseStandardInspectContent)){
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
}
return enterpriseStandardInspectReport; return enterpriseStandardInspectReport;
} }
@@ -187,7 +192,10 @@ public class EnterpriseStandardInspectReportServiceImpl extends ServiceImpl<Ente
for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : list) { for (EnterpriseStandardInspectReport enterpriseStandardInspectReport : list) {
// 稽查内容查询 // 稽查内容查询
EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId()); EnterpriseStandardInspectContent enterpriseStandardInspectContent = enterpriseStandardInspectContentService.getById(enterpriseStandardInspectReport.getInspectContentId());
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getStandardNo()); if (Objects.isNull(enterpriseStandardInspectContent)){
continue;
}
enterpriseStandardInspectReport.setBaseClause(enterpriseStandardInspectContent.getClause());
enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement()); enterpriseStandardInspectReport.setStandardRequire(enterpriseStandardInspectContent.getRequirement());
} }
return list; return list;