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

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

@@ -148,13 +148,11 @@ public class WorkServiceImpl implements WorkService {
                 workTimeService.saveWorkEndTime(ob,time);
             }
 
+
         }else if (WorkStatus.AUDIT.equals(status)){
             ob.setSubmitTime(time);
             workTimeService.saveWorkStartTime(ob,time);
 
-        }else if (WorkStatus.REVIEW.equals(status)) {
-        //计算分数
-
             Float expect= score(ob.getStateTime(),ob.getCompleteTime());
             Float practical=practical(taskId);
             if (expect<practical){
@@ -168,6 +166,10 @@ public class WorkServiceImpl implements WorkService {
                 ob.setWorkCoefficient(advance(1,1.0f,times));
             }
 
+        }else if (WorkStatus.REVIEW.equals(status)) {
+        //
+            ob.setAuditTime(time);
+
         }else if (status.equals(WorkStatus.FINISHED)){
             pWorkload(taskId);
             ob.setEndTime(time);

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

@@ -63,7 +63,20 @@ public class WorkingTime {
         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){
+            if(startHours < morningBegin) {
+                leaveDays = leaveDays-operHours+operHours;
+            } else if(startHours >= morningBegin && startHours <= morningEnd) {
+                leaveDays = leaveDays + eveningWork+ morningEnd- startHours - operHours;
+            } else if(startHours > morningEnd && startHours <= eveningBegin) {
+                leaveDays = leaveDays + eveningWork - operHours;
+            } else if(startHours > eveningBegin && startHours< eveningEnd) {
+                leaveDays = leaveDays -operHours + eveningEnd-startHours;
+            }else if (startHours>=eveningEnd){
+                leaveDays=leaveDays-operHours;
+            }
+        }
         //时间在上午上班时间
         if(endHours > morningBegin && endHours <= morningEnd) {
             //结束时间在工作时间内  判断开始时间是否在上班时间之后

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

@@ -180,11 +180,10 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
                 break;
 
             case 9:
-               ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(noteResource.getTaskId()).get(0);
-               String actionMsg="";
-               if (scoreCoefficient.getScore1()!=null){
+               String actionMsg;
+               if (!noteResource.getId().equals(work.getPublisher())){
                    actionMsg=name+"对任务进行了自我评价";
-               }else if (scoreCoefficient.getScore2()!=null){
+               }else {
                    actionMsg=name+"对任务进行了发布者评价";
                }
                 actionHistory.setActionMsg(actionMsg);

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

@@ -13,7 +13,7 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/test2
+spring.data.mongodb.uri=mongodb://localhost:27017/test3
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB

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

@@ -3,7 +3,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
@@ -13,7 +13,7 @@ server.ssl.keyStoreType=PKCS12
 server.ssl.keyAlias= alias
 
 #mongodb configuration
-spring.data.mongodb.uri=mongodb://localhost:27017/test2
+spring.data.mongodb.uri=mongodb://localhost:27017/test3
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB

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

@@ -4,7 +4,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