From 435780eeac3d83dfe8ec2a3cbb0488e198269591 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 26 十二月 2023 19:02:04 +0800
Subject: [PATCH] 加入工作单功能
---
service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
index b1a736d..da7897e 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/QueryStartWorkCmd.java
@@ -8,8 +8,10 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.workCopy.WorkCopyDto;
import com.java110.dto.workPool.WorkPoolDto;
+import com.java110.dto.workPoolContent.WorkPoolContentDto;
import com.java110.dto.workTask.WorkTaskDto;
import com.java110.intf.oa.IWorkCopyV1InnerServiceSMO;
+import com.java110.intf.oa.IWorkPoolContentV1InnerServiceSMO;
import com.java110.intf.oa.IWorkPoolV1InnerServiceSMO;
import com.java110.intf.oa.IWorkTaskV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -39,6 +41,9 @@
@Autowired
private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
+ @Autowired
+ private IWorkPoolContentV1InnerServiceSMO workPoolContentV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -67,6 +72,9 @@
//todo 鏌ヨ 澶勭悊浜� 鍜屾妱閫佷汉
queryTaskAndCopy(workPoolDtos);
+ //todo 鏌ヨ鍐呭
+ queryContent(workPoolDtos);
+
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, workPoolDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -74,6 +82,32 @@
context.setResponseEntity(responseEntity);
}
+ /**
+ * 鏌ヨ鍐呭
+ *
+ * @param workPoolDtos
+ */
+ private void queryContent(List<WorkPoolDto> workPoolDtos) {
+ if (ListUtil.isNull(workPoolDtos)) {
+ return;
+ }
+
+ if (workPoolDtos.size() != 1) {
+ return;
+ }
+
+ WorkPoolContentDto workPoolContentDto = new WorkPoolContentDto();
+ workPoolContentDto.setWorkId(workPoolDtos.get(0).getWorkId());
+
+ List<WorkPoolContentDto> workPoolContentDtos = workPoolContentV1InnerServiceSMOImpl.queryWorkPoolContents(workPoolContentDto);
+
+ if (ListUtil.isNull(workPoolContentDtos)) {
+ return;
+ }
+
+ workPoolDtos.get(0).setContent(workPoolContentDtos.get(0).getContent());
+ }
+
private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {
if (ListUtil.isNull(workPoolDtos)) {
--
Gitblit v1.8.0