添加了人员管理需要的service

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Repository
 public interface ScoreCoefficientRepository extends MongoRepository<ScoreCoefficient, String> {
-  List<ScoreCoefficient> findByWordId(String workId);
+  ScoreCoefficient findByWordId(String workId);
 
   List<ScoreCoefficient> findAllByGroupLeaderScore2IsNullOrDirectorScore2IsNull();
 

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

@@ -32,4 +32,19 @@ public interface WorkRepository extends MongoRepository<Work, String> {
 
     List<Work> findByAuditTimeBefore(Date auditTime);
 
+    /**
+     * 根据人员id以及时间范围查询开始时间在范围里的任务
+     * @param id 人员id
+     * @param sTime 开始时间
+     * @param eTime 结束时间
+     * @return 集合
+     */
+    List<Work> findAllByExecutorAndStateTimeBetween(String id,Date sTime,Date eTime);
+
+    /**
+     * 根据人员id以及的任务
+     * @param id 人员id
+     * @return 集合
+     */
+    List<Work> findAllByExecutor(String id);
 }

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

@@ -60,14 +60,9 @@ public class ScoreCoefficientServiceImpl implements ScoreCoefficientService {
 
     @Override
     public ScoreCoefficient findById(String id) {
-      List<ScoreCoefficient> scoreCoefficients= scoreCoefficientRepository.findByWordId(id);
-      if (scoreCoefficients.size()==0){
-          String msg = "[job] 没有考评信息";
-          log.error(msg);
-          throw new BadRequestException(msg);
-      }else {
-          return scoreCoefficients.get(0);
-      }
+
+        return scoreCoefficientRepository.findByWordId(id);
+
 
     }
 

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

@@ -25,12 +25,17 @@ public interface InternalService {
 
     /**
      * 根据时间区间查找人员任务信息
-     * @param userId
-     * @param startTime
-     * @param endTime
-     * @return
+     * @param userId 人员id
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return  人员的任务信息
      */
     UserWorkData personnelWorkMsg(String userId,Date startTime,Date endTime);
 
+    /**
+     * 查找人员id任务信息
+     * @param userId 人员id
+     * @return  人员的任务信息
+     */
     UserWorkData personnelWorkMsgAll(String userId);
 }

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

 package com.zjty.tynotes.job.status.service.impl;
 
+import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient;
+import com.zjty.tynotes.job.basic.entity.database.Work;
+import com.zjty.tynotes.job.basic.repository.ScoreCoefficientRepository;
+import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.common.Constants;
 import com.zjty.tynotes.job.common.constant.WorkStatus;
 import com.zjty.tynotes.job.common.exception.WorkAttribution;
@@ -11,6 +15,7 @@ import com.zjty.tynotes.job.status.service.InternalService;
 import com.zjty.tynotes.pas.service.IUserService;
 import com.zjty.tynotes.search.subject.service.EsUtil;
 import com.zjty.tynotes.sms.service.MessageTemplateService;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -26,6 +31,11 @@ public class InternalServiceImpl implements InternalService {
 
     @Autowired
     IUserService iUserService;
+
+    @ApiModelProperty
+    WorkRepository workRepository;
+    @Autowired
+    ScoreCoefficientRepository scoreCoefficientRepository;
     @Override
     public List<Personnel> personnels(List<String> list) {
         List<Personnel> personnels=new ArrayList<>();
@@ -67,11 +77,53 @@ public class InternalServiceImpl implements InternalService {
 
     @Override
     public UserWorkData personnelWorkMsg(String userId, Date startTime, Date endTime) {
-        return null;
+        UserWorkData userWorkData=new UserWorkData();
+        int countOngoing=0;
+        int countFinished=0;
+        Double countScore=0d;
+        List<Work> works=  workRepository.findAllByExecutorAndStateTimeBetween(userId,startTime,endTime);
+        for (Work work:works){
+
+            if (work.getStatus().equals(WorkStatus.ONGOING)){
+                countOngoing++;
+            }
+
+            if (work.getStatus().equals(WorkStatus.FINISHED)){
+                countFinished++;
+                ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(work.getId());
+                countScore=countScore+scoreCoefficient.getEndWorkLoad();
+            }
+        }
+        userWorkData.setAverageScore(countScore/countFinished);
+        userWorkData.setCompletedNum(countOngoing);
+        userWorkData.setUnCompletedNum(countOngoing);
+        userWorkData.setUserId(userId);
+      return userWorkData;
     }
 
     @Override
     public UserWorkData personnelWorkMsgAll(String userId) {
-        return null;
+        UserWorkData userWorkData=new UserWorkData();
+        int countOngoing=0;
+        int countFinished=0;
+        Double countScore=0d;
+        List<Work> works=  workRepository.findAllByExecutor(userId);
+        for (Work work:works){
+
+            if (work.getStatus().equals(WorkStatus.ONGOING)){
+                countOngoing++;
+            }
+
+            if (work.getStatus().equals(WorkStatus.FINISHED)){
+                countFinished++;
+                ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(work.getId());
+                countScore=countScore+scoreCoefficient.getEndWorkLoad();
+            }
+        }
+        userWorkData.setAverageScore(countScore/countFinished);
+        userWorkData.setCompletedNum(countOngoing);
+        userWorkData.setUnCompletedNum(countOngoing);
+        userWorkData.setUserId(userId);
+        return userWorkData;
     }
 }

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

@@ -23,6 +23,7 @@ import java.util.List;
 
 @Service
 public class RepairServiceImpl implements RepairService {
+
     @Autowired
     private RedisTemplate<String,Object> redisTemplate;
 
@@ -37,6 +38,7 @@ public class RepairServiceImpl implements RepairService {
 
     @Autowired
     ScoreCoefficientService scoreCoefficientService;
+
     @Autowired
     IUserService iUserService;
     @Override

notes-job/src/main/java/com/zjty/tynotes/job/task/Task.java

@@ -81,7 +81,7 @@ public class Task {
                         sc->{
                             Work work=workService.findById(sc.getWordId());
                             if (sc.getTime().getTime()< finalTime1){
-                                    String score3= String.valueOf(Integer.valueOf(sc.getDirectorScore2())+Integer.valueOf(sc.getGroupLeaderScore2()));
+                                    String score3= String.valueOf((Integer.valueOf(sc.getDirectorScore2())+Integer.valueOf(sc.getGroupLeaderScore2()))/2);
                                     sc.setViceScore3(score3);
                                     sc.setTime(new Date());
                                     businessTreeManagement.saveAction(work.getAssistantManagers().get(0),sc.getWordId(),Action.APPRAISAL_WORD,new Date(),"副总经理评价");

notes-union/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=workbook
 
 ## https端口号.
 server.port=8289
-## 证书的路径.
+# 证书的路径.
 server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
 # 证书密码，请修改为您自己证书的密码.
 server.ssl.key-store-password=bMEPW9BG