From 3b6f49f1123f68bb6d1424070600158f85b66a30 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 20 三月 2025 18:55:33 +0800
Subject: [PATCH] 优化代码
---
service-oa/src/main/java/com/java110/oa/cmd/work/QueryTaskWorkCmd.java | 38 ++++++++------------------------------
1 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/QueryTaskWorkCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/QueryTaskWorkCmd.java
index a2a71b0..2d46876 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/QueryTaskWorkCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/QueryTaskWorkCmd.java
@@ -6,13 +6,14 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.workCopy.WorkCopyDto;
-import com.java110.dto.workPool.WorkPoolDto;
-import com.java110.dto.workTask.WorkTaskDto;
+import com.java110.dto.work.WorkCopyDto;
+import com.java110.dto.work.WorkPoolDto;
+import com.java110.dto.work.WorkTaskDto;
import com.java110.intf.oa.*;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -29,17 +30,7 @@
private IWorkPoolV1InnerServiceSMO workPoolV1InnerServiceSMOImpl;
@Autowired
- private IWorkTaskV1InnerServiceSMO workTaskV1InnerServiceSMOImpl;
-
- @Autowired
private IWorkCopyV1InnerServiceSMO workCopyV1InnerServiceSMOImpl;
-
- @Autowired
- private IWorkPoolFileV1InnerServiceSMO workPoolFileV1InnerServiceSMOImpl;
-
- @Autowired
- private IWorkPoolContentV1InnerServiceSMO workPoolContentV1InnerServiceSMOImpl;
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -51,34 +42,28 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
WorkPoolDto workPoolDto = BeanConvertUtil.covertBean(reqJson, WorkPoolDto.class);
+ if(!StringUtil.isEmpty(workPoolDto.getState()) && workPoolDto.getState().contains(",")){
-
+ workPoolDto.setStates(workPoolDto.getState().split(","));
+ workPoolDto.setState("");
+ }
String userId = CmdContextUtils.getUserId(context);
workPoolDto.setStaffId(userId);
-
int count = workPoolV1InnerServiceSMOImpl.queryTaskWorkPoolsCount(workPoolDto);
-
List<WorkPoolDto> workPoolDtos = null;
-
if (count > 0) {
workPoolDtos = workPoolV1InnerServiceSMOImpl.queryTaskWorkPools(workPoolDto);
} else {
workPoolDtos = new ArrayList<>();
}
-
//todo 鏌ヨ 澶勭悊浜� 鍜屾妱閫佷汉
queryCopy(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);
-
context.setResponseEntity(responseEntity);
}
private void queryCopy(List<WorkPoolDto> workPoolDtos) {
-
if (ListUtil.isNull(workPoolDtos)) {
return;
}
@@ -86,11 +71,9 @@
for (WorkPoolDto workPoolDto : workPoolDtos) {
workIds.add(workPoolDto.getWorkId());
}
-
WorkCopyDto workCopyDto = new WorkCopyDto();
workCopyDto.setWorkIds(workIds.toArray(new String[workIds.size()]));
List<WorkCopyDto> workCopyDtos = workCopyV1InnerServiceSMOImpl.queryWorkCopys(workCopyDto);
-
String curCopyName = "";
for (WorkPoolDto workPoolDto : workPoolDtos) {
curCopyName = "";
@@ -98,20 +81,15 @@
if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
continue;
}
-
if (!workPoolDto.getWorkId().equals(tmpWorkCopyDto.getWorkId())) {
continue;
}
-
if (curCopyName.split(",").length > 2) {
continue;
}
-
curCopyName += (tmpWorkCopyDto.getStaffName() + ",");
}
-
workPoolDto.setCurCopyName(curCopyName);
}
-
}
}
--
Gitblit v1.8.0