更新状态页面接口以及工作时间的算法

notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java

@@ -6,6 +6,7 @@ import com.zjty.tynotes.job.basic.entity.request.WorkRo;
 import com.zjty.tynotes.job.basic.entity.response.JobResponse;
 import com.zjty.tynotes.job.basic.service.WorkService;
 import com.zjty.tynotes.job.common.Action;
+import com.zjty.tynotes.job.common.constant.WorkStatus;
 import com.zjty.tynotes.job.status.service.BusinessTreeManagement;
 import com.zjty.tynotes.misc.config.AutoDocument;
 import io.swagger.annotations.*;
@@ -155,6 +156,7 @@ public class WorkController {
                 break;
             case "audit":
                 //执行者提交
+
                 workService.alterTaskStatus(workId, status);
                 businessTreeManagement.saveAction(userId, workId, Action.COMMIT_WORK, new Date(), msg);
                 break;
@@ -163,6 +165,11 @@ public class WorkController {
                 workService.alterTaskStatus(workId, status);
                 businessTreeManagement.saveAction(userId, workId, Action.FINISH_WORK, new Date(), msg);
                 break;
+            case WorkStatus
+                        .FINISHED:
+                workService.alterTaskStatus(workId, status);
+                businessTreeManagement.saveAction(userId, workId, Action.FINISHED_WORK, new Date(), msg);
+
             default:
                 log.warn("[job] 修改任务状态传入的参数有误，传入值为：{}", status);
                 break;

notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/database/ScoreCoefficient.java

@@ -44,18 +44,6 @@ public class ScoreCoefficient {
      */
     @ApiModelProperty(value = "发布者评语", example = "comments2")
     private String comments2;
-    /**
-     * 最终评价
-     * 发布者的直接上级或更上级
-     */
-    @ApiModelProperty(value = "最终评价", example = "score3")
-    private String score3;
-
-    /**
-     * 最终评语
-     */
-    @ApiModelProperty(value = "最终评语", example = "comments3")
-    private String comments3;
     /**
      *  最终工作量
      */

notes-job/src/main/java/com/zjty/tynotes/job/basic/utils/WorkingTime.java

+package com.zjty.tynotes.job.basic.utils;
+
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+@Service
+public class WorkingTime {
+
+    //设置上班时间：该处时间可以根据实际情况进行调整
+    static float morningBegin = 9;//上午上班时间,小时
+    static float morningEnd = 11.5f;//上午下班时间，小时
+    static float eveningBegin = 13;//下午上班时间，小时
+    static float eveningEnd = 17;//下午下班时间，小时
+
+    static float noonBreak = eveningBegin-morningEnd;//中午休息时间
+    static float eveningBreak = 24-eveningEnd+morningBegin;//晚上休息时间
+    static float morningWork = morningEnd-morningBegin;//上午上班时间
+    static float eveningWork = eveningEnd-eveningBegin;//下午上班时间
+    static float operHours = morningWork + eveningWork;//一天上班时间
+
+
+
+
+    @SuppressWarnings("deprecation")
+    public static float findOperHours(List<Date> maps, Date startDate, Date endDate) throws ParseException {
+        //用于格式化日期
+        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd ");
+        Date startTime =startDate;
+        Date endTime =endDate;
+        double leaveDays = 0;
+        //从startTime开始循环，若该日期不是节假日或者不是周六日则请假天数+1
+        Date flag = startTime;//设置循环开始日期
+        Calendar cal = Calendar.getInstance();
+
+        //如果结束时间大于开始时间则返回0
+        if(flag.compareTo(endTime) == 1) {
+
+            return 0;
+        }
+
+        outer:while((getNowDate(flag)).compareTo(getNowDate(endTime)) == -1){
+            cal.setTime(flag);
+            for (Date map : maps){
+
+                if((getNowDate(flag)).compareTo(map) == 0){
+                    //跳出循环进入下一个日期
+                    cal.add(Calendar.DAY_OF_MONTH, +1);
+                    flag = cal.getTime();
+                    continue outer;
+                }
+            }
+            leaveDays = leaveDays + operHours;
+            //日期往后加一天
+            cal.add(Calendar.DAY_OF_MONTH, +1);
+            flag = cal.getTime();
+        }
+        System.out.println("endTime.getHours()---"+endTime.getHours() +"------flag.getMinutes():" +flag.getMinutes());
+        float endHours = endTime.getHours() + (float)endTime.getMinutes()/60;
+        float startHours = flag.getHours() + (float)flag.getMinutes()/60;
+
+        //时间在上午上班时间
+        if(endHours > morningBegin && endHours <= morningEnd) {
+            //结束时间在工作时间内  判断开始时间是否在上班时间之后
+            if(startHours > morningBegin) {
+                leaveDays = leaveDays + endHours - startHours;
+            } else {
+                leaveDays = leaveDays + endHours - morningBegin;
+            }
+        }
+        //时间在中午休息时间则取上午上班时间
+        if(endHours > morningEnd && endHours < eveningBegin) {
+            if(startHours <= morningBegin) {
+                leaveDays = leaveDays + morningEnd - morningBegin;
+            } else if(startHours > morningBegin && startHours < morningEnd) {
+                leaveDays = leaveDays + morningEnd - startHours;
+            }
+        }
+        //时间大于中午休息时间则减去中午休息时间
+        if(endHours > eveningBegin && endHours <= eveningEnd) {
+            if(startHours < morningBegin) {
+                leaveDays = leaveDays + endHours - morningBegin - noonBreak;
+            } else if(startHours >= morningBegin && startHours <= morningEnd) {
+                leaveDays = leaveDays + endHours - startHours - noonBreak;
+            } else if(startHours > morningEnd && startHours <= eveningBegin) {
+                leaveDays = leaveDays + endHours - eveningBegin;
+            } else if(startHours > eveningBegin) {
+                leaveDays = leaveDays + endHours - startHours;
+            }
+        }
+        //时间大于晚上下班时间则去白天上班时间
+        if(endHours > eveningEnd) {
+            if(startHours < morningBegin) {
+                leaveDays = leaveDays + eveningEnd - morningBegin - noonBreak;
+            } else if(startHours >= morningBegin && startHours <= morningEnd) {
+                leaveDays = leaveDays + eveningEnd - startHours - noonBreak;
+            } else if(startHours > morningEnd && startHours <= eveningBegin) {
+                leaveDays = leaveDays + eveningEnd - eveningBegin;
+            } else if(startHours > eveningBegin) {
+                leaveDays = leaveDays + eveningEnd - startHours;
+            }
+        }
+
+        System.out.println("-------leaveDays----:"+leaveDays);
+        return (float)(Math.round(leaveDays*100)/100.0);
+    }
+
+
+    public static List<Date> initHoliday() throws ParseException {
+        List<Date> holidays = new ArrayList<Date>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        holidays.add(sdf.parse("2019-01-01"));
+        holidays.add(sdf.parse("2019-01-05"));
+        holidays.add(sdf.parse("2019-01-06"));
+        return holidays;
+    }
+
+    public static Date getNowDate(Date date) throws ParseException {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        String dateString = formatter.format(date);
+        Date currentTime_2 = formatter.parse(dateString);
+        return currentTime_2;
+    }
+
+
+}

notes-job/src/main/java/com/zjty/tynotes/job/common/Action.java

@@ -63,4 +63,9 @@ public interface Action {
      * 任务重未发布到进行中
      */
     int SAVE_PUBLISH_WORK=11;
+
+    /**
+     * 完结任务
+     */
+    int FINISHED_WORK=12;
 }

notes-job/src/main/java/com/zjty/tynotes/job/common/exception/WorkAttribution.java

@@ -27,4 +27,6 @@ public interface WorkAttribution {
     int ME_RELEASE_WORK = 4;
 
 
+
+
 }

notes-job/src/main/java/com/zjty/tynotes/job/common/exception/WorkAttribution1.java

+package com.zjty.tynotes.job.common.exception;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2019-05-09
+ */
+public interface WorkAttribution1 {
+
+
+
+    //我的相关任务
+    int ME_RELATED_WORK = 1;
+
+    /**
+     * 我分解的任务
+     */
+    int ME_RESOLVE_WORK = 2;
+
+    /**
+     * 我发布的任务
+     */
+    int ME_RELEASE_WORK = 3;
+
+
+
+
+}

notes-job/src/main/java/com/zjty/tynotes/job/status/controller/Read1Controller.java

 package com.zjty.tynotes.job.status.controller;
 
-import com.zjty.tynotes.job.status.entity.EsListSum;
-import com.zjty.tynotes.job.status.service.WorkShowSeeService;
-import com.zjty.tynotes.job.status.service.WorkShowService;
+import com.zjty.tynotes.job.status.entity.RedisListSum;
+import com.zjty.tynotes.job.status.service.TestSeeService;
+import com.zjty.tynotes.job.status.service.TestService;
 import com.zjty.tynotes.misc.config.AutoDocument;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,34 +26,34 @@ import java.util.HashMap;
 @Api(tags = "查看任务页面", value = "查看任务页面数据")
 public class Read1Controller {
     @Autowired
-    WorkShowSeeService workShowSeeService;
+    TestService testService;
     @Autowired
-    WorkShowService workShowService;
+    TestSeeService testSeeService;
     /**
-     *阅读页面我的任务列表
+     *阅读页面我的代办任务列表
      * @param page              页码 默认1
      * @param size              每页显示条数 默认10
      * @param id                人员id
      */
-    @PostMapping("/selectMeWork")
-    @ApiOperation(value = "获取我的任务列表")
+    @PostMapping("/selectCommission")
+    @ApiOperation(value = "获取我的代办任务列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query",required = true),
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),
             @ApiImplicitParam(name="size",value="每页显示条数",dataType="int", paramType = "query",example = "10")
     })
-    public ResponseEntity<EsListSum> selectCommission(@RequestParam(value = "id") String id,
+    public ResponseEntity<RedisListSum> selectCommission(@RequestParam(value = "id") String id,
                                                       @RequestParam(value = "page", defaultValue = "1") int page,
                                                       @RequestParam(value = "size", defaultValue = "10") int size){
 
         int pageSize;
         if (page==0){
-            pageSize=0;
+            pageSize=1;
         }else {
-            pageSize=page-1;
+            pageSize=1;
         }
 
-        return ResponseEntity.ok(workShowSeeService.selectMeWork(id,pageSize,size));
+        return ResponseEntity.ok(testSeeService.selectMeCommissionWork(id,pageSize,size));
     }
 
     /**
@@ -62,25 +62,25 @@ public class Read1Controller {
      * @param size              每页显示条数 默认10
      * @param id                人员id
      */
-    @PostMapping("/selectMeReceiv")
-    @ApiOperation(value = "获取我的接收任务列表")
+    @PostMapping("/selectRelated")
+    @ApiOperation(value = "获取我的相关任务列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query",required = true),
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),
             @ApiImplicitParam(name="size",value="每页显示条数",dataType="int", paramType = "query",example = "10")
     })
-    public ResponseEntity<EsListSum> selectSubmit(@RequestParam(value = "id") String id,
+    public ResponseEntity<RedisListSum> selectRelated(@RequestParam(value = "id") String id,
                                                 @RequestParam(value = "page", defaultValue = "1") int page,
                                                 @RequestParam(value = "size", defaultValue = "10") int size){
 
         int pageSize;
         if (page==0){
-            pageSize=0;
+            pageSize=1;
         }else {
-            pageSize=page-1;
+            pageSize=1;
         }
 
-        return ResponseEntity.ok(workShowSeeService.selectMeReceiveWork(id,pageSize,size));
+        return ResponseEntity.ok(testSeeService.selectMeRelatedWork(id,pageSize,size));
     }
 
     /**
@@ -96,17 +96,16 @@ public class Read1Controller {
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),
             @ApiImplicitParam(name="size",value="每页显示条数",dataType="int", paramType = "query",example = "10")
     })
-    public ResponseEntity<EsListSum> selectMeResolveWork(@RequestParam(value = "id") String id,
+    public ResponseEntity<RedisListSum> selectMeResolveWork(@RequestParam(value = "id") String id,
                                                 @RequestParam(value = "page", defaultValue = "1") int page,
                                                 @RequestParam(value = "size", defaultValue = "10") int size){
-
         int pageSize;
         if (page==0){
-            pageSize=0;
+            pageSize=1;
         }else {
-            pageSize=page-1;
+            pageSize=1;
         }
-        return ResponseEntity.ok(workShowSeeService.selectMeResolveWork(id,pageSize,size));
+        return ResponseEntity.ok(testSeeService.selectMeResolveWork(id,pageSize,size));
     }
 
     /**
@@ -122,17 +121,17 @@ public class Read1Controller {
             @ApiImplicitParam(name="page",value="页码",dataType="int", paramType = "query",example = "1"),
             @ApiImplicitParam(name="size",value="每页显示条数",dataType="int", paramType = "query",example = "10")
     })
-    public ResponseEntity<EsListSum> selectMeReleaseWork(@RequestParam(value = "id") String id,
-                                                 @RequestParam(value = "page", defaultValue = "1") int page,
-                                                 @RequestParam(value = "size", defaultValue = "10") int size){
+    public ResponseEntity<RedisListSum> selectMeReleaseWork(@RequestParam(value = "id") String id,
+                                                            @RequestParam(value = "page", defaultValue = "1") int page,
+                                                            @RequestParam(value = "size", defaultValue = "10") int size){
 
         int pageSize;
         if (page==0){
-            pageSize=0;
+            pageSize=1;
         }else {
-            pageSize=page-1;
+            pageSize=1;
         }
-        return ResponseEntity.ok(workShowSeeService.selectMeReleaseWork(id,pageSize,size));
+        return ResponseEntity.ok(testSeeService.selectMeReleaseWork(id,pageSize,size));
     }
 
     /**
@@ -149,7 +148,7 @@ public class Read1Controller {
             @ApiImplicitParam(name="size",value="每页显示条数",dataType="int", paramType = "query",example = "10"),
             @ApiImplicitParam(name="title",value="标题",dataType="string", paramType = "query")
     })
-    public ResponseEntity<EsListSum> titleSelect(@RequestParam(value = "id") String id,
+    public ResponseEntity<RedisListSum> titleSelect(@RequestParam(value = "id") String id,
                                                  @RequestParam(value = "page", defaultValue = "1") int page,
                                                  @RequestParam(value = "size", defaultValue = "10") int size,
                                                  @RequestParam(value = "title", defaultValue = "10") String title){
@@ -160,7 +159,7 @@ public class Read1Controller {
         }else {
             pageSize=page-1;
         }
-        return ResponseEntity.ok(workShowSeeService.titleSelect(id,pageSize,size,title));
+        return ResponseEntity.ok(testSeeService.titleSelect(id,pageSize,size,title));
     }
 
 
@@ -185,7 +184,7 @@ public class Read1Controller {
                                               @RequestParam(value = "eventId")String eventId,
                                               @RequestParam(value = "readState")int readState
     ){
-        workShowService.readsStatus(id,eventId,readState);
+        testService.readsStatus(id,eventId,readState);
         HashMap map=new HashMap(10);
         map.put("msg","事件状态修改成功");
         return ResponseEntity.ok(map);
@@ -200,7 +199,7 @@ public class Read1Controller {
     public ResponseEntity loginFirstOneManualPush(@RequestParam(value = "id") String id
     ){
 
-        workShowService.loginFirstOneManualPush(id);
+        testService.loginFirstOneManualPush(id);
         return ResponseEntity.ok().build();
     }
 

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/EsListSum.java

@@ -20,6 +20,7 @@ import java.util.List;
 public class EsListSum {
     @ApiModelProperty(value = "总数", name = "count", example = "0L")
     private Long count;
+
     @ApiModelProperty(value = "数据列表", name = "eventTitles")
     private List<RedisPersonalWork> eventTitles;
 

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/RedisListSum.java

+package com.zjty.tynotes.job.status.entity;
+
+import com.zjty.tynotes.misc.config.AutoDocument;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author zjm
+ */
+@ApiModel(value = "RedisListSum对象",description="提供数据列表和总数")
+@AutoDocument
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RedisListSum {
+    @ApiModelProperty(value = "总数", name = "count", example = "0L")
+    private int count;
+
+    @ApiModelProperty(value = "数据列表", name = "eventTitles")
+    private List<RedisPersonalWork> eventTitles;
+
+}

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/RedisPersonalWork.java

@@ -78,4 +78,10 @@ public class RedisPersonalWork {
      */
     @ApiModelProperty(value = "上级任务id",name = "superiorId",example = "root留言")
     private List<String> subtaskIds;
+
+    /**
+     * 是否是代办任务
+     */
+    @ApiModelProperty(value = "是否是代办任务",name = "isNotCommission",example = "1是代办 0不是")
+    private int isNotCommission;
 }

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/RoleSum1.java

+package com.zjty.tynotes.job.status.entity;
+
+import com.zjty.tynotes.misc.config.AutoDocument;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zjm
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@AutoDocument
+@ApiModel(value = "webSocket对象")
+public class RoleSum1 {
+
+    /**
+     * 我的代办任务 是否有未读　０　否　１有
+     */
+    @ApiModelProperty(value = "我的任务 是否未读",name = "meWorkUnread",example = "０　读了　１没读")
+    private int meCommissionUnread;
+
+    /**
+     * 我的代办任务 条数
+     */
+    @ApiModelProperty(value = "我的任务 条数",name = "meWorkCount",example = "20")
+    private int meCommissionCount;
+
+    /**
+     * 我的相关任务 是否有未读　０　否　１有
+     */
+    @ApiModelProperty(value = "我接收的任务 是否未读",name = "workId",example = "０　读了　１没读")
+    private int meRelatedUnread;
+
+    /**
+     * 我的相关任务 条数
+     */
+    @ApiModelProperty(value = "我接收的任务 条数",name = "meReceiveCount",example = "1")
+    private int meRelatedCount;
+
+
+    /**
+     * 我分解的任务  是否有未读　０　否　１有
+     */
+    @ApiModelProperty(value = "我分解的任务 是否未读",name = "workId",example = "０　读了　１没读")
+    private int meResolveUnread;
+
+    /**
+     * 我分解的任务  条数
+     */
+    @ApiModelProperty(value = "我分解的任务  条数",name = "meResolveCount",example = "10")
+    private int meResolveCount;
+
+    /**
+     * 我发布的任务  是否有未读　０　否　１有
+     */
+    @ApiModelProperty(value = "我发布的任务 是否未读",name = "workId",example = "０　读了　１没读")
+    private int meReleaseUnread;
+
+    /**
+     * 我发布的任务  条数
+     */
+    @ApiModelProperty(value = " 我发布的任务  条数",name = "meReleaseCount",example = "12")
+    private int meReleaseCount;
+
+}

notes-job/src/main/java/com/zjty/tynotes/job/status/service/TestSeeService.java

+package com.zjty.tynotes.job.status.service;
+
+import com.zjty.tynotes.job.status.entity.EsListSum;
+import com.zjty.tynotes.job.status.entity.RedisListSum;
+
+public interface TestSeeService {
+
+    /**
+     * 根据人员id查看我的代办任务列表
+     * @param id
+     * @param page
+     * @param size
+     * @return
+     */
+    RedisListSum selectMeCommissionWork(String id, int page, int size);
+
+    /**
+     * 根据人员id查看我的相关任务列表
+     * @param id
+     * @param page
+     * @param size
+     * @return
+     */
+    RedisListSum selectMeRelatedWork(String id, int page, int size);
+    /**
+     *根据人员id查看我分解的任务列表
+     * @param id
+     * @param page
+     * @param size
+     * @return
+     */
+    RedisListSum selectMeResolveWork(String id, int page, int size);
+    /**
+     *根据人员id查看我发布的任务列表
+     * @param id
+     * @param page
+     * @param size
+     * @return
+     */
+    RedisListSum selectMeReleaseWork(String id, int page, int size);
+
+    /**
+     * 标题查询
+     *
+     * @param id   　人员id
+     * @param page 　页码
+     * @param size 　每页显示的条数
+     * @param title 事件的标题
+     * @return 给前端对象集合 和条数
+     */
+    RedisListSum titleSelect(String id, int page, int size, String title);
+
+}

notes-job/src/main/java/com/zjty/tynotes/job/status/service/TestService.java

+package com.zjty.tynotes.job.status.service;
+
+import com.zjty.tynotes.job.basic.entity.database.Work;
+
+public interface TestService {
+
+    /**
+     * 新增任务接口
+     * 分解任务等
+     * @param executorId 操作人id
+     * @param latestNews 最近一次操作
+     * @param work 任务对象
+     */
+    void saveTakePushWork(String executorId, String latestNews,  Work work);
+
+
+
+    /**
+     * 把未发布的任务转变为进行中
+     * @param executorId 操作人id
+     * @param latestNews 最近一次操作
+     * @param work 任务对象
+     */
+    void unpublishedToOngoing(String executorId, String latestNews,  Work work);
+    /**
+     * 保存任务
+     * @param executorId 操作人id
+     * @param latestNews 最近一次操作
+     * @param work
+     */
+    void saveWork(String executorId, String latestNews, Work work);
+
+
+    /**
+     * 修改任务 通用
+     * @param executorId 操作人id
+     * @param latestNews  最近一次操作
+     * @param work 任务对象
+     */
+    void upDateWork(String executorId, String latestNews, Work work);
+
+    /**
+     *
+     */
+   void appraisal(String executorId, String latestNews,  Work work);
+    /**
+     * 修改任务状态
+     * @param executorId  操作人id
+     * @param latestNews 任务对象
+     * @param status 任务状态
+     * @param work  任务对象
+     */
+
+    void updateWorkStatus(String executorId, String latestNews, String status, Work work);
+
+
+    /**
+     * 查看事件的时候
+     * @param id 人员id
+     * @param eventId 事件id
+     * @param readState 是否阅读过  判读是否阅读过  否修改 阅读状态
+     */
+    void readsStatus(String id, String eventId, int readState);
+
+    /**
+     * 人员登入　第一次的数据　接口触发
+     * @param id 人员ｉｄ
+     */
+    void loginFirstOneManualPush(String id);
+}

notes-job/src/main/java/com/zjty/tynotes/job/status/service/WorkShowSeeService.java

@@ -9,35 +9,35 @@ public interface WorkShowSeeService {
 
     /**
      * 根据人员id查看我的任务列表
-     * @param id
-     * @param page
-     * @param size
-     * @return
+     * @param id 人员id
+     * @param page 第几页
+     * @param size 条数
+     * @return 数据集合
      */
     EsListSum selectMeWork(String id, int page, int size);
 
     /**
      * 根据人员id查看我接收的任务列表
-     * @param id
-     * @param page
-     * @param size
-     * @return
+     * @param id 人员id
+     * @param page 第几页
+     * @param size 条数
+     * @return 数据集合
      */
     EsListSum selectMeReceiveWork(String id, int page, int size);
     /**
      *根据人员id查看我分解的任务列表
-     * @param id
-     * @param page
-     * @param size
-     * @return
+     * @param id 人员id
+     * @param page 第几页
+     * @param size 条数
+     * @return 数据集合
      */
     EsListSum selectMeResolveWork(String id, int page, int size);
     /**
      *根据人员id查看我发布的任务列表
-     * @param id
-     * @param page
-     * @param size
-     * @return
+     * @param id 人员id
+     * @param page 第几页
+     * @param size 条数
+     * @return 数据集合
      */
     EsListSum selectMeReleaseWork(String id, int page, int size);
 

notes-job/src/main/java/com/zjty/tynotes/job/status/service/WorkShowService.java

-package com.zjty.tynotes.job.status.service;
-
-import com.zjty.tynotes.job.basic.entity.database.Work;
-
-import java.util.List;
-
-public interface WorkShowService {
-
-   /**
-     * 预留
-    */
-
-   void test(String executorId, String latestNews, Work work);
-    /**
-     * 任务新增 操作人 最近一次操作 看到人员id  work 对象
-     */
-   void saveTakePushWork(String executorId, String latestNews, List<String> userIds, Work work);
-
-    /**
-     * 新增分解任务
-     */
-    void saveTakePushWork1(String executorId, String latestNews, List<String> userIds, Work work);
-
- /**
-  * 保存任务
-  * @param executorId
-  * @param latestNews
-  * @param work
-  */
- void saveWork(String executorId, String latestNews, Work work);
-
-
- /**
-  * 把未发布的任务转变为进行中
-  * @param executorId
-  * @param latestNews
-  * @param userIds
-  * @param work
-  */
-    void unpublishedToOngoing(String executorId, String latestNews, List<String> userIds, Work work);
-    /**
-     * 修改任务 操作人 最近一次操作 看到人员id
-     */
-    void updateWorkStatus(String executorId, String latestNews, List<String> userIds, String status, String workId);
-
-    /**
-     * 修改任务 常用
-     * @param executorId 操作人id
-     * @param latestNews 最近操作
-     * @param userIds 所有人员集合
-     * @param workId 任务id
-     */
-    void upDateWork(String executorId, String latestNews, List<String> userIds, String workId);
-
-    /**
-     * 查看事件的时候
-     * @param id 人员id
-     * @param eventId 事件id
-     * @param readState 是否阅读过  判读是否阅读过  否修改 阅读状态
-     */
-    void readsStatus(String id, String eventId, int readState);
-
- /**
-  * 人员登入　第一次的数据　接口触发
-  * @param id 人员ｉｄ
-  */
- void loginFirstOneManualPush(String id);
-}
+//package com.zjty.tynotes.job.status.service;
+//
+//import com.zjty.tynotes.job.basic.entity.database.Work;
+//
+//import java.util.List;
+//
+//public interface WorkShowService {
+//
+//   /**
+//     * 预留
+//    */
+//
+//   void test(String executorId, String latestNews, Work work);
+//    /**
+//     * 任务新增 操作人 最近一次操作 看到人员id  work 对象
+//     */
+//   void saveTakePushWork(String executorId, String latestNews, List<String> userIds, Work work);
+//
+//    /**
+//     * 新增分解任务
+//     */
+//    void saveTakePushWork1(String executorId, String latestNews, List<String> userIds, Work work);
+//
+// /**
+//  * 保存任务
+//  * @param executorId
+//  * @param latestNews
+//  * @param work
+//  */
+// void saveWork(String executorId, String latestNews, Work work);
+//
+//
+// void upDateWork(String executorId, String latestNews, Work work);
+//
+// /**
+//  * 把未发布的任务转变为进行中
+//  * @param executorId
+//  * @param latestNews
+//  * @param userIds
+//  * @param work
+//  */
+//    void unpublishedToOngoing(String executorId, String latestNews, List<String> userIds, Work work);
+//    /**
+//     * 修改任务 操作人 最近一次操作 看到人员id
+//     */
+//
+//
+//    void updateWorkStatus(String executorId, String latestNews, List<String> userIds, String status, String workId);
+//
+//    /**
+//     * 修改任务 常用
+//     * @param executorId 操作人id
+//     * @param latestNews 最近操作
+//     * @param userIds 所有人员集合
+//     * @param workId 任务id
+//     */
+//    void upDateWork(String executorId, String latestNews, List<String> userIds, String workId);
+//
+//    /**
+//     * 查看事件的时候
+//     * @param id 人员id
+//     * @param eventId 事件id
+//     * @param readState 是否阅读过  判读是否阅读过  否修改 阅读状态
+//     */
+//    void readsStatus(String id, String eventId, int readState);
+//
+// /**
+//  * 人员登入　第一次的数据　接口触发
+//  * @param id 人员ｉｄ
+//  */
+// void loginFirstOneManualPush(String id);
+//}

notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/BusinessTreeManagementImpl.java

@@ -8,7 +8,7 @@ import com.zjty.tynotes.job.status.entity.ActionHistory;
 import com.zjty.tynotes.job.status.entity.NoteResource;
 import com.zjty.tynotes.job.status.repository.ActionHistoryRepository;
 import com.zjty.tynotes.job.status.service.BusinessTreeManagement;
-import com.zjty.tynotes.job.status.service.WorkShowService;
+import com.zjty.tynotes.job.status.service.TestService;
 import com.zjty.tynotes.pas.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,7 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
     private WorkService workService;
 
     @Autowired
-    private WorkShowService workShowService;
+    private TestService testService;
 
     @Autowired
     private IUserService iUserService;
@@ -96,12 +96,12 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                 if (work.getSuperiorId()==null) {
                     actionHistory.setActionMsg(name + "新建了任务");
                     actionHistoryRepository.save(actionHistory);
-                    workShowService.saveTakePushWork(work.getPublisher(), actionHistory.getActionMsg(), ids, work);
+                    testService.saveTakePushWork(work.getPublisher(), actionHistory.getActionMsg(), work);
                     log.info("[TREE] {}新建任务", name);
                 }else {
                     actionHistory.setActionMsg(name + "新建了分解任务");
                     actionHistoryRepository.save(actionHistory);
-                    workShowService.saveTakePushWork1(work.getPublisher(), actionHistory.getActionMsg(), ids, work);
+                    testService.saveTakePushWork(work.getPublisher(), actionHistory.getActionMsg(), work);
                     log.info("[TREE] {}新建分解任务，执行人id是{}", name);
                 }
                 break;
@@ -110,11 +110,10 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
                 actionHistory.setActionMsg(name + "提交了任务");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.updateWorkStatus(noteResource.getId(),
+                testService.updateWorkStatus(noteResource.getId(),
                                                  actionHistory.getActionMsg(),
-                                                 ids1,
                                                  status,
-                                                 work.getId());
+                                                 work);
                 log.info("[TREE] {}提交了任务", name);
                 break;
 
@@ -122,11 +121,10 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
                 actionHistory.setActionMsg(name + "撤回了任务");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.updateWorkStatus(noteResource.getId(),
+                testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
-                        ids1,
                         status,
-                        work.getId());
+                        work);
                 log.info("[TREE] {}退回了任务", name);
                 break;
 
@@ -134,11 +132,10 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
                 actionHistory.setActionMsg(name + "审核任务不通过");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.updateWorkStatus(noteResource.getId(),
+                testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
-                        ids1,
                         status,
-                        work.getId());
+                        work);
                 log.info("[TREE] {}审核任务不通过", name);
                 break;
 
@@ -146,11 +143,10 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
                 actionHistory.setActionMsg(name + "审核任务通过");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.updateWorkStatus(noteResource.getId(),
+                testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
-                        ids1,
                         status,
-                        work.getId());
+                        work);
                 log.info("[TREE] {}审核任务通过", name);
                 break;
 
@@ -159,30 +155,27 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
 
                 actionHistory.setActionMsg(name + "删除任务");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.updateWorkStatus(noteResource.getId(),
+                testService.updateWorkStatus(noteResource.getId(),
                         actionHistory.getActionMsg(),
-                        ids1,
                         status,
-                        work.getId());
+                        work);
                 log.info("[TREE] {}删除任务", name);
                 break;
 
             case 7:
                 actionHistory.setActionMsg(name + "修改了任务的组员");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.upDateWork(noteResource.getId(),
+                testService.upDateWork(noteResource.getId(),
                         actionHistory.getActionMsg(),
-                        ids1,
-                        noteResource.getTaskId());
+                        work);
                 log.info("[TREE] {}修改了任务的组员", name);
                 break;
             case 8:
                 actionHistory.setActionMsg(name + "修改了任务的工作量和考评系数");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.upDateWork(noteResource.getId(),
+                testService.upDateWork(noteResource.getId(),
                         actionHistory.getActionMsg(),
-                        ids1,
-                        noteResource.getTaskId());
+                        work);
                 log.info("[TREE] {}修改了任务的工作量和考评系数", name);
                 break;
 
@@ -193,12 +186,10 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                    actionMsg=name+"对任务进行了自我评价";
                }else if (scoreCoefficient.getScore2()!=null){
                    actionMsg=name+"对任务进行了发布者评价";
-               }else if (scoreCoefficient.getScore3()!=null){
-                   actionMsg=name+"对任务进行了最终评价";
                }
                 actionHistory.setActionMsg(actionMsg);
                 actionHistoryRepository.save(actionHistory);
-                workShowService.upDateWork(noteResource.getId(),actionMsg,ids1,noteResource.getTaskId());
+                testService.appraisal(noteResource.getId(),actionMsg,work);
                 log.info("[TREE] {}对任务评价了", name);
                 break;
 
@@ -206,15 +197,22 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                 //保存任务
                 actionHistory.setActionMsg(name + "保存了任务");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.saveWork(work.getPublisher(),actionHistory.getActionMsg(),work);
+                testService.saveWork(work.getPublisher(),actionHistory.getActionMsg(),work);
                 log.info("[TREE] {}保存任务", name);
                 break;
             case 11:
                 actionHistory.setActionMsg(name + "修改任务从未发布到进行中");
                 actionHistoryRepository.save(actionHistory);
-                workShowService.unpublishedToOngoing(work.getPublisher(), actionHistory.getActionMsg(), ids, work);
+                testService.unpublishedToOngoing(work.getPublisher(), actionHistory.getActionMsg(), work);
                 log.info("[TREE] {}修改任务从未发布到进行中", name);
                 break;
+            case 12:
+                actionHistory.setActionMsg(name + "完结任务");
+                actionHistoryRepository.save(actionHistory);
+                testService.updateWorkStatus(noteResource.getId(),
+                        actionHistory.getActionMsg(),
+                        status,
+                       work);
             default:
                 log.warn("[es] 状态处理模块传入参数有误");
                 break;

notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/TestSeeServiceImpl.java

+package com.zjty.tynotes.job.status.service.impl;
+
+import com.zjty.tynotes.job.common.Constants;
+import com.zjty.tynotes.job.common.exception.WorkAttribution1;
+import com.zjty.tynotes.job.status.entity.EsListSum;
+import com.zjty.tynotes.job.status.entity.RedisListSum;
+import com.zjty.tynotes.job.status.entity.RedisPersonalWork;
+import com.zjty.tynotes.job.status.service.TestSeeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+@Service
+public class TestSeeServiceImpl implements TestSeeService {
+
+    @Autowired
+    RedisTemplate<String,Object> redisTemplate;
+    @Override
+    public RedisListSum selectMeCommissionWork(String id, int page, int size) {
+        List<RedisPersonalWork> list=new ArrayList<>();
+        List<Object> objectList=redisTemplate.opsForList().range(Constants.REDIS_EVENT+id,0,-1);
+        for (Object object:objectList){
+            RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
+            if (redisPersonalWork.getIsNotCommission()==1){
+                list.add(redisPersonalWork);
+            }
+        }
+       return listSum(list,size,page);
+    }
+
+    @Override
+    public RedisListSum selectMeRelatedWork(String id, int page, int size) {
+
+        List<RedisPersonalWork> list=new ArrayList<>();
+        List<Object> objectList=redisTemplate.opsForList().range(Constants.REDIS_EVENT+id,0,-1);
+        for (Object object:objectList){
+            RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
+            if (redisPersonalWork.getWorkAttribution()==WorkAttribution1.ME_RELATED_WORK){
+                list.add(redisPersonalWork);
+            }
+        }
+
+        return listSum(list,size,page);
+    }
+
+    @Override
+    public RedisListSum selectMeResolveWork(String id, int page, int size) {
+        List<RedisPersonalWork> list=new ArrayList<>();
+        List<Object> objectList=redisTemplate.opsForList().range(Constants.REDIS_EVENT+id,0,-1);
+        for (Object object:objectList){
+            RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
+            if (redisPersonalWork.getWorkAttribution()==WorkAttribution1.ME_RESOLVE_WORK){
+                list.add(redisPersonalWork);
+            }
+        }
+        return listSum(list,size,page);
+    }
+
+    @Override
+    public RedisListSum selectMeReleaseWork(String id, int page, int size) {
+        List<RedisPersonalWork> list=new ArrayList<>();
+        List<Object> objectList=redisTemplate.opsForList().range(Constants.REDIS_EVENT+id,0,-1);
+        for (Object object:objectList){
+            RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
+            if (redisPersonalWork.getWorkAttribution()==WorkAttribution1.ME_RELEASE_WORK){
+                list.add(redisPersonalWork);
+            }
+        }
+        return listSum(list,size,page);
+    }
+
+    @Override
+    public RedisListSum titleSelect(String id, int page, int size, String title) {
+        List<RedisPersonalWork> list=new ArrayList<>();
+        List<Object> objectList=redisTemplate.opsForList().range(Constants.REDIS_EVENT+id,0,-1);
+        for (Object object:objectList){
+            RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
+            if (redisPersonalWork.getTitle().contains(title)){
+                list.add(redisPersonalWork);
+            }
+        }
+
+        return listSum(list,size,page);
+    }
+
+    private RedisListSum listSum(List<RedisPersonalWork> list,int size,int page){
+        int count=list.size();
+        if (size<count){
+            return new RedisListSum(count,list);
+        }
+        int countPage=count/size;
+        if (count%size!=0){
+            countPage=countPage+1;
+        }
+        if (page>countPage){
+            return new RedisListSum(count,list.subList((page-1)*size,countPage*size));
+        } else {
+            return  new RedisListSum(count,list.subList((page-1)*size,page*size));
+
+        }
+    }
+}