优化代码

java110-bean/src/main/java/com/java110/dto/workEvent/WorkEventDto.java

@@ -42,6 +42,8 @@ public class WorkEventDto extends PageDto implements Serializable {
 
     private String itemId;
 
+    private String contentId;
+
 
     public String getEventId() {
         return eventId;
@@ -195,4 +197,12 @@ public class WorkEventDto extends PageDto implements Serializable {
     public void setItemId(String itemId) {
         this.itemId = itemId;
     }
+
+    public String getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(String contentId) {
+        this.contentId = contentId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workPoolContent/WorkPoolContentDto.java

@@ -24,6 +24,8 @@ public class WorkPoolContentDto extends PageDto implements Serializable {
     private String workId;
     private String content;
 
+    private int seqNum;
+
 
     private Date createTime;
 
@@ -87,5 +89,11 @@ public class WorkPoolContentDto extends PageDto implements Serializable {
         this.statusCd = statusCd;
     }
 
+    public int getSeqNum() {
+        return seqNum;
+    }
 
+    public void setSeqNum(int seqNum) {
+        this.seqNum = seqNum;
+    }
 }

java110-bean/src/main/java/com/java110/po/workEvent/WorkEventPo.java

@@ -42,6 +42,9 @@ public class WorkEventPo implements Serializable {
 
     private String itemId;
 
+    private String contentId;
+
+
     public String getEventId() {
         return eventId;
     }
@@ -137,4 +140,12 @@ public class WorkEventPo implements Serializable {
     public void setItemId(String itemId) {
         this.itemId = itemId;
     }
+
+    public String getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(String contentId) {
+        this.contentId = contentId;
+    }
 }

java110-bean/src/main/java/com/java110/po/workPoolContent/WorkPoolContentPo.java

@@ -35,6 +35,7 @@ public class WorkPoolContentPo implements Serializable {
     private String workId;
     private String content;
 
+    private int seqNum;
 
 
 
@@ -86,5 +87,11 @@ public class WorkPoolContentPo implements Serializable {
         this.content = content;
     }
 
+    public int getSeqNum() {
+        return seqNum;
+    }
 
+    public void setSeqNum(int seqNum) {
+        this.seqNum = seqNum;
+    }
 }

java110-db/src/main/resources/mapper/oa/WorkPoolContentV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存工作单内容信息 add by wuxw 2018-07-03 -->
     <insert id="saveWorkPoolContentInfo" parameterType="Map">
         insert into work_pool_content(
-        content_id,community_id,store_id,work_id,content
+        content_id,community_id,store_id,work_id,content,seq_num
         ) values (
-        #{contentId},#{communityId},#{storeId},#{workId},#{content}
+        #{contentId},#{communityId},#{storeId},#{workId},#{content},#{seqNum}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <!-- 查询工作单内容信息 add by wuxw 2018-07-03 -->
     <select id="getWorkPoolContentInfo" parameterType="Map" resultType="Map">
         select t.content_id,t.content_id contentId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
-        communityId,t.store_id,t.store_id storeId,t.work_id,t.work_id workId,t.content
+        communityId,t.store_id,t.store_id storeId,t.work_id,t.work_id workId,t.content,t.seq_num seqNum
         from work_pool_content t
         where 1 =1
         <if test="contentId !=null and contentId != ''">
@@ -39,7 +39,7 @@
         <if test="content !=null and content != ''">
             and t.content= #{content}
         </if>
-        order by t.create_time desc
+        order by t.seq_num
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -57,7 +57,9 @@
         <if test="content !=null and content != ''">
             , t.content= #{content}
         </if>
-
+        <if test="seqNum !=null and seqNum != ''">
+            , t.seq_num= #{seqNum}
+        </if>
         where 1=1
         <if test="contentId !=null and contentId != ''">
             and t.content_id= #{contentId}

service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkTaskCmd.java

@@ -175,6 +175,10 @@ public class FinishWorkTaskCmd extends Cmd {
             preStaffName = workEventDtos.get(0).getStaffName();
 
         }
+        WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
+        workTaskItemDto.setItemId(reqJson.getString("itemId"));
+        workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
+        List<WorkTaskItemDto> workTaskItemDtos = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItems(workTaskItemDto);
 
         //todo 保存事件
         WorkEventPo workEventPo = new WorkEventPo();
@@ -189,10 +193,14 @@ public class FinishWorkTaskCmd extends Cmd {
         workEventPo.setStoreId(workTaskDto.getStoreId());
         workEventPo.setTaskId(workTaskDto.getTaskId());
         workEventPo.setItemId(reqJson.getString("itemId"));
+        workEventPo.setContentId("-1");
+        if (!ListUtil.isNull(workTaskItemDtos)) {
+            workEventPo.setContentId(workTaskItemDtos.get(0).getContentId());
+        }
         workEventV1InnerServiceSMOImpl.saveWorkEvent(workEventPo);
 
         // todo 查询 任务明细是否处理完成
-        WorkTaskItemDto workTaskItemDto = new WorkTaskItemDto();
+        workTaskItemDto = new WorkTaskItemDto();
         workTaskItemDto.setTaskId(workTaskDto.getTaskId());
         workTaskItemDto.setCommunityId(workTaskDto.getCommunityId());
         workTaskItemDto.setState(WorkTaskDto.STATE_WAIT);
@@ -217,7 +225,7 @@ public class FinishWorkTaskCmd extends Cmd {
         WorkTaskDto tmpWorkTaskDto = new WorkTaskDto();
         tmpWorkTaskDto.setWorkId(workTaskDto.getWorkId());
         tmpWorkTaskDto.setStoreId(workTaskDto.getStoreId());
-        tmpWorkTaskDto.setStates(new String[]{WorkTaskDto.STATE_WAIT,WorkTaskDto.STATE_DOING});
+        tmpWorkTaskDto.setStates(new String[]{WorkTaskDto.STATE_WAIT, WorkTaskDto.STATE_DOING});
         int waitCount = workTaskV1InnerServiceSMOImpl.queryWorkTasksCount(tmpWorkTaskDto);
         WorkPoolPo workPoolPo = new WorkPoolPo();
         workPoolPo.setWorkId(workTaskDto.getWorkId());
@@ -269,6 +277,7 @@ public class FinishWorkTaskCmd extends Cmd {
         workEventPo.setStoreId(workTaskDto.getStoreId());
         workEventPo.setTaskId(workTaskDto.getTaskId());
         workEventPo.setItemId("-1");
+        workEventPo.setContentId("-1");
         workEventV1InnerServiceSMOImpl.saveWorkEvent(workEventPo);
     }
 }

service-oa/src/main/java/com/java110/oa/cmd/work/SaveWorkPoolCmd.java

@@ -330,6 +330,7 @@ public class SaveWorkPoolCmd extends Cmd {
             workPoolContentPo.setWorkId(workPoolPo.getWorkId());
             workPoolContentPo.setCommunityId(reqJson.getString("communityId"));
             workPoolContentPo.setStoreId(reqJson.getString("storeId"));
+            workPoolContentPo.setSeqNum(cIndex + 1);
             content.put("contentId", workPoolContentPo.getContentId());
             workPoolContentV1InnerServiceSMOImpl.saveWorkPoolContent(workPoolContentPo);
         }

service-oa/src/main/java/com/java110/oa/cmd/work/UpdateWorkPoolCmd.java

@@ -350,6 +350,7 @@ public class UpdateWorkPoolCmd extends Cmd {
             workPoolContentPo.setWorkId(workPoolPo.getWorkId());
             workPoolContentPo.setCommunityId(reqJson.getString("communityId"));
             workPoolContentPo.setStoreId(reqJson.getString("storeId"));
+            workPoolContentPo.setSeqNum(cIndex + 1);
             workPoolContentV1InnerServiceSMOImpl.saveWorkPoolContent(workPoolContentPo);
         }
     }