优化办工作单

928255095 · 928255095 · commit d187ccc44aaf · 2023-12-26T22:53:14.000+08:00
diff --git a/java110-bean/src/main/java/com/java110/dto/workTask/WorkTaskDto.java b/java110-bean/src/main/java/com/java110/dto/workTask/WorkTaskDto.java
@@ -15,7 +15,7 @@
  **/
 public class WorkTaskDto extends PageDto implements Serializable {
 
-    public static final String STATE_DOING = "D";// 处理中
+    public static final String STATE_WAIT = "W";// 待处理
     public static final String STATE_COMPLETE = "C";// 处理完成
 
     private String staffName;
diff --git a/java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml
@@ -235,7 +235,7 @@
         statusCd,t.store_id storeId,t.work_name workName,t.work_id
         workId,t.wt_id wtId,t.create_user_tel createUserTel,wtk.start_time
         startTime,wtk.end_time endTime,wtk.state,t.community_id communityId,t.create_time createTime,
-        td.`name` stateName,wt.type_name typeName,wtk.staff_name curStaffName,t.task_id taskId
+        td.`name` stateName,wt.type_name typeName,wtk.staff_name curStaffName,wtk.task_id taskId
         from work_pool t
         left join work_type wt on t.wt_id = wt.wt_id
         left join work_task wtk on t.work_id = wtk.work_id and wtk.status_cd = '0'
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
@@ -138,7 +138,7 @@ private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {
         for (WorkPoolDto workPoolDto : workPoolDtos) {
             curStaffName = "";
             for (WorkTaskDto tmpWorkTaskDto : workTaskDtos) {
-                if (!WorkTaskDto.STATE_DOING.equals(tmpWorkTaskDto.getState())) {
+                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkTaskDto.getState())) {
                     continue;
                 }
 
@@ -164,7 +164,7 @@ private void queryTaskAndCopy(List<WorkPoolDto> workPoolDtos) {
         for (WorkPoolDto workPoolDto : workPoolDtos) {
             curCopyName = "";
             for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
-                if (!WorkTaskDto.STATE_DOING.equals(tmpWorkCopyDto.getState())) {
+                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
                     continue;
                 }
 
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
@@ -94,7 +94,7 @@ private void queryCopy(List<WorkPoolDto> workPoolDtos) {
         for (WorkPoolDto workPoolDto : workPoolDtos) {
             curCopyName = "";
             for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {
-                if (!WorkTaskDto.STATE_DOING.equals(tmpWorkCopyDto.getState())) {
+                if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {
                     continue;
                 }
 
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java
@@ -197,7 +197,7 @@ private void saveWorkTask(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto use
         for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
             WorkTaskPo workTaskPo = new WorkTaskPo();
             workTaskPo.setWorkId(workPoolPo.getWorkId());
-            workTaskPo.setState(WorkTaskDto.STATE_DOING);
+            workTaskPo.setState(WorkTaskDto.STATE_WAIT);
             workTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId("11"));
             workTaskPo.setStoreId(workPoolPo.getStoreId());
             workTaskPo.setCommunityId(workPoolPo.getCommunityId());
diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java
@@ -186,7 +186,7 @@ private void updateWorkTask(WorkPoolPo workPoolPo, JSONObject reqJson, UserDto u
         for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
              workTaskPo = new WorkTaskPo();
             workTaskPo.setWorkId(workPoolPo.getWorkId());
-            workTaskPo.setState(WorkTaskDto.STATE_DOING);
+            workTaskPo.setState(WorkTaskDto.STATE_WAIT);
             workTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId("11"));
             workTaskPo.setStoreId(workPoolPo.getStoreId());
             workTaskPo.setCommunityId(workPoolPo.getCommunityId());

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private void queryCopy(List<WorkPoolDto> workPoolDtos) {`
`94`	`94`	`for (WorkPoolDto workPoolDto : workPoolDtos) {`
`95`	`95`	`curCopyName = "";`
`96`	`96`	`for (WorkCopyDto tmpWorkCopyDto : workCopyDtos) {`
`97`		`- if (!WorkTaskDto.STATE_DOING.equals(tmpWorkCopyDto.getState())) {`
	`97`	`+ if (!WorkTaskDto.STATE_WAIT.equals(tmpWorkCopyDto.getState())) {`
`98`	`98`	`continue;`
`99`	`99`	`}`
`100`	`100`