Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-job/pom.xml

@@ -89,6 +89,18 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>16.0.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

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

@@ -70,6 +70,4 @@ public class ScController {
             return ok(new JobResponse(saveId));
     }
 
-
-
 }

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

@@ -4,13 +4,11 @@ import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.request.UpdateCrew;
 import com.zjty.tynotes.job.basic.entity.request.UpdateWorkload;
 import com.zjty.tynotes.job.basic.entity.request.WorkRo;
-import com.zjty.tynotes.job.basic.entity.response.JobResponse;
-import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
-import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
-import com.zjty.tynotes.job.basic.entity.response.WorkVo;
+import com.zjty.tynotes.job.basic.entity.response.*;
 import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.WorkService;
+import com.zjty.tynotes.job.basic.service.WorkTimeService;
 import com.zjty.tynotes.job.common.Action;
 import com.zjty.tynotes.job.common.constant.WorkStatus;
 import com.zjty.tynotes.job.status.service.BusinessTreeManagement;
@@ -40,11 +38,16 @@ public class WorkController {
 
     @Autowired
     WorkService workService;
+
     @Autowired
     ConversionService conversionService;
+
     @Autowired
     WorkRepository workRepository;
 
+    @Autowired
+    WorkTimeService workTimeService;
+
     @Autowired
     private BusinessTreeManagement businessTreeManagement;
 
@@ -200,9 +203,27 @@ public class WorkController {
     }
 
     @GetMapping(value = "/select/work/workId/{workId}")
-    @ApiModelProperty(value = "根据任务id查询这个任务所在任务组里面",notes = "查看任务的所有相关任务")
+    @ApiOperation(value = "根据任务id查询这个任务所在任务组里面",notes = "查看任务的所有相关任务")
     public ResponseEntity<WorkMpping> selectWorkMappingWorkId(@PathVariable("workId") String workId){
 
         return ok(workService.selectWorkMapperWorkId(workId));
     }
+
+    @GetMapping(value = "/select/back/{workId}")
+    @ApiOperation(value = "根据任务id查询这个任务是否被退回过",notes = "查看任务是否为被退回")
+    public ResponseEntity<BackResponse> selectBackWorkWorkId(@PathVariable("workId") String workId){
+               if (workTimeService.selectWorkTime(workId).size()>=2){
+                   return ok(new BackResponse(true));
+               }else {
+                   return ok(new BackResponse(false));
+               }
+    }
+
+    @GetMapping(value = "/select/WorkOverTime/{userId}")
+    @ApiOperation(value = "根据人员id查询所有正在进行中且组长是人员id的任务",notes = "查看进行中的任务")
+    public ResponseEntity<List<WorkOverTime>> selectWorkOverTimeWorkId(@PathVariable("userId") String userId){
+
+        return ResponseEntity.ok(workService.selectWorkToWorkOverTime(userId));
+    }
+
 }

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

@@ -187,6 +187,7 @@ public class Work {
     /**
      * 副经理id集合
      */
+
     @ApiModelProperty(value = "副经理id集合",example = "[1,2,3]")
     private List<String> assistantManagers;
 

notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/response/BackResponse.java

+package com.zjty.tynotes.job.basic.entity.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "判断任务是否被退回过", description = "是否被退任务的对象")
+public class BackResponse {
+    private boolean isBack;
+}

notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/response/WorkOverTime.java

+package com.zjty.tynotes.job.basic.entity.response;
+
+import com.zjty.tynotes.pas.entity.User;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.data.annotation.Id;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "加班申请任务列表", description = "任务简化对象")
+public class WorkOverTime {
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id.若新增数据则不可附带id.更新已有数据则必须附带id.", example = "id", notes = "若新增数据则不可附带id.更新已有数据则必须附带id")
+    private String id;
+
+    @ApiModelProperty(value = "标题", example = "请输入标题")
+    private String title;
+
+    @ApiModelProperty(value = "组员集合")
+    private List<User> users;
+}

notes-job/src/main/java/com/zjty/tynotes/job/basic/repository/WorkRepository.java

@@ -47,4 +47,12 @@ public interface WorkRepository extends MongoRepository<Work, String> {
      * @return 集合
      */
     List<Work> findByExecutor(String id);
+
+    /**
+     * 根据人员id以及任务状态查询相关的任务
+     * @param id 人员id
+     * @param status 状态
+     * @return 任务集合
+     */
+    List<Work> findByExecutorAndStatus(String id,String status);
 }

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/ConversionService.java

 package com.zjty.tynotes.job.basic.service;
 
 import com.zjty.tynotes.job.basic.entity.database.Work;
+import com.zjty.tynotes.job.basic.entity.response.WorkOverTime;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
 
 public interface ConversionService {
     WorkVo workToVo(Work work);
+
+    WorkOverTime workToWorkOverTime(Work work);
 }

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/WorkService.java

@@ -3,6 +3,7 @@ package com.zjty.tynotes.job.basic.service;
 import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
 import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
+import com.zjty.tynotes.job.basic.entity.response.WorkOverTime;
 import com.zjty.tynotes.job.basic.service.impl.WorkServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -155,4 +156,11 @@ public interface WorkService {
      */
     WorkMpping selectWorkMapperWorkId(String workId);
 
+    /**
+     * 根据任务id查看所有相关任务
+     * @param userId 人员id
+     * @return 转化后的对象
+     */
+    List<WorkOverTime> selectWorkToWorkOverTime(String userId);
+
 }

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/ConversionServiceImpl.java

@@ -2,6 +2,7 @@ package com.zjty.tynotes.job.basic.service.impl;
 
 import com.zjty.tynotes.job.basic.entity.database.Attachment;
 import com.zjty.tynotes.job.basic.entity.database.Work;
+import com.zjty.tynotes.job.basic.entity.response.WorkOverTime;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
 import com.zjty.tynotes.job.basic.repository.AttachmentRepository;
 import com.zjty.tynotes.job.basic.service.AttachmentService;
@@ -113,7 +114,18 @@ public class ConversionServiceImpl implements ConversionService {
 
     }
 
+    @Override
+    public WorkOverTime workToWorkOverTime(Work work) {
+        List<User> users=new ArrayList<>();
+        work.getCrewList().forEach(id->{
+            users.add(iUserService.findUserById(id));
+        });
+
+        return new WorkOverTime(work.getId(),work.getTitle(),users);
+    }
+
     private List<User> selectUserIdAll(List<String> list){
         return  iUserService.findUserByIds(list);
     }
+
 }

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/PriviceServiceImpl.java

@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
 public class PriviceServiceImpl implements PriviceService {
     @Autowired
     WorkRepository workRepository;
-
     @Autowired
     IUserService iUserService;
     @Override

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/WorkServiceImpl.java

@@ -6,6 +6,7 @@ import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.database.WorkTime;
 import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
 import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
+import com.zjty.tynotes.job.basic.entity.response.WorkOverTime;
 import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.ScoreCoefficientService;
@@ -15,6 +16,7 @@ import com.zjty.tynotes.job.basic.utils.WorkingTime;
 import com.zjty.tynotes.job.common.constant.WorkStatus;
 import com.zjty.tynotes.job.common.exception.BadRequestException;
 import com.zjty.tynotes.job.common.exception.NotFoundException;
+import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.entity.vo.HolidayRequest;
 import com.zjty.tynotes.pas.entity.vo.JobLeads;
 import com.zjty.tynotes.pas.service.ConfigService;
@@ -72,10 +74,6 @@ public class WorkServiceImpl implements WorkService {
         //新增数据不可附带id.
         Boolean idMustNull = isNull(work.getId());
         if (idMustNull) {
-//            if (work.getSuperiorId()==null ||work.getSuperiorId().equals("")){
-//            }else {
-//                work.setAudit(selectGroupId(work.getSuperiorId()));
-//            }
             work.setCreateTime(new Date());
             work.setUpdateTime(new Date());
             JobLeads jobLeads=iUserService.findJobLeads(work.getExecutor());
@@ -355,6 +353,22 @@ return 0.0f;
         return new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),iUserService.findUserById(work.getPublisher()).getUsername(),iUserService.findUserById(work.getExecutor()).getUsername(),selectWorkMapper(work.getId()));
     }
 
+    @Override
+    public List<WorkOverTime> selectWorkToWorkOverTime(String userId) {
+
+        List<WorkOverTime> workOverTimes=new ArrayList<>();
+        workRepository.findByExecutorAndStatus(userId,WorkStatus.ONGOING).forEach(
+                work -> {
+                    List<User> users=new ArrayList<>();
+                    for (String id:work.getCrewList()){
+                        users.add(iUserService.findUserById(id));
+                    }
+                    workOverTimes.add(new WorkOverTime(work.getId(),work.getTitle(),users));
+                }
+        );
+        return workOverTimes;
+    }
+
     private List<WorkMpping>  selectWorkMapper(String workId){
         List<WorkMpping> workMppings=new ArrayList<>();
         List<Work> works=  workRepository.findBySuperiorId(workId);

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

@@ -58,6 +58,12 @@ public class TestServiceImpl implements TestService {
         List<String> majordomos = work.getMajordomos();
         List<String> generalManagers = work.getGeneralManagers();
         List<String> assistantManagers = work.getAssistantManagers();
+
+        HashSet<String> set = new HashSet();
+        set.addAll(majordomos);
+        set.addAll(generalManagers);
+        set.addAll(assistantManagers);
+
         String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
         String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
         String auditName=iUserService.findUserById(work.getAudit()).getUsername();
@@ -163,12 +169,11 @@ public class TestServiceImpl implements TestService {
 
 
 
-        majordomos.addAll(generalManagers);
-        majordomos.addAll(assistantManagers);
-        majordomos.remove(work.getExecutor());
-        majordomos.remove(work.getPublisher());
-        majordomos.remove(work.getAudit());
-        for (String id : majordomos) {
+
+        set.remove(work.getExecutor());
+        set.remove(work.getPublisher());
+        set.remove(work.getAudit());
+        for (String id : set) {
             personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
             personalWork.setReadState(1);
             personalWork.setIsNotCommission(0);
@@ -262,6 +267,11 @@ public class TestServiceImpl implements TestService {
         List<String> generalManagers = work.getGeneralManagers();
         List<String> assistantManagers = work.getAssistantManagers();
 
+        HashSet<String> set = new HashSet();
+        set.addAll(majordomos);
+        set.addAll(generalManagers);
+        set.addAll(assistantManagers);
+
         String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
         String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
         String auditName=iUserService.findUserById(work.getAudit()).getUsername();
@@ -344,11 +354,9 @@ public class TestServiceImpl implements TestService {
         }
 
 
-        majordomos.addAll(generalManagers);
-        majordomos.addAll(assistantManagers);
-        majordomos.remove(work.getExecutor());
-        majordomos.remove(work.getPublisher());
-        majordomos.remove(work.getAudit());
+        set.remove(work.getExecutor());
+        set.remove(work.getPublisher());
+        set.remove(work.getAudit());
 
         for (String id : majordomos) {
             personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
@@ -729,7 +737,7 @@ public class TestServiceImpl implements TestService {
     @Override
     public void appraisal(String executorId, String latestNews, Work work,int count){
         List<Object> list =new ArrayList<>();
-        List<String> sumIds=new ArrayList<>();
+        HashSet<String> sumIds=new HashSet<>();
         sumIds.add(work.getAudit());
         sumIds.add(work.getExecutor());
         List<String> majordomos = work.getMajordomos();
@@ -739,9 +747,6 @@ public class TestServiceImpl implements TestService {
         sumIds.addAll(generalManagers);
         sumIds.addAll(assistantManagers);
         Long time=new Date().getTime();
-        HashSet set = new HashSet(sumIds);
-        sumIds.clear();
-        sumIds.addAll(set);
         switch (count){
             case 1:
                 list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1);
@@ -1017,12 +1022,13 @@ public class TestServiceImpl implements TestService {
                             }
                         }
                         pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
+                        sumIds.remove(uId);
                     }
                 }
 
 
                 sumIds.removeAll(assistantManagers);
-                sumIds.removeAll(generalManagers);
+
                 if (sumIds.size()!=0) {
                     for (String uId:sumIds) {
                         list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
@@ -1042,7 +1048,6 @@ public class TestServiceImpl implements TestService {
                         pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
                     }
                 }
-
                 break;
             case 5:
                 if (generalManagers.size()!=0) {