修改返回空集合

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

@@ -40,6 +40,9 @@ public class ConversionServiceImpl implements ConversionService {
                 users.add(iUserService.findUserById(id));
             }
         }
+        if (users.size()==0){
+            users=null;
+        }
 
         if (attachIds!=null && attachIds.size()!=0){
             for (String id:attachIds){

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

@@ -128,12 +128,53 @@ public class WorkServiceImpl implements WorkService {
 
         ob.setStatus(status);
         if (status.equals(WorkStatus.ONGOING)){
-//          Float expect= score(ob.getStateTime(),ob.getCompleteTime());
-//          Float practical=score(ob.getStateTime(),ob.getEndTime());
+            Float expect= score(ob.getStateTime(),ob.getCompleteTime());
+            Float practical=score(ob.getStateTime(),ob.getEndTime());
+          if (expect<practical){
+              float time=  practical-expect;
+               beyond(1,1.0f,time);
+               //添加
+          }else if (expect.equals(practical)){
+
+
+              //添加
+          }else {
+              float time=  expect-practical;
+              advance(1,1.0f,time);
+          }
+
         }
         workRepository.save(ob);
     }
+private float beyond(float count,float coefficient,Float time){
+        if (coefficient<0.5f){
+            return 0.5f;
+        }
+        float si=time-4;
 
+        if (si<4){
+            return coefficient-0.025f*count;
+        }else {
+            coefficient=coefficient-0.025f*count;
+        }
+        count++;
+        return beyond(count,coefficient,si);
+}
+
+    private float advance(float count,float coefficient,Float time){
+        if (coefficient>1.2f){
+            return 1.2f;
+        }
+        float remainingTime=time-6;
+
+        if (remainingTime<6){
+            return coefficient+0.025f*count;
+        }else {
+            coefficient=coefficient +0.025f*count;
+        }
+        count++;
+        return beyond(count,coefficient,remainingTime);
+    }
 
 private Float score(Date startTime,Date entTime){
    List<Date> dates= configService.findHolidays(new HolidayRequest(startTime,entTime));

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

@@ -50,7 +50,7 @@ public class Read1Controller {
         if (page==0){
             pageSize=1;
         }else {
-            pageSize=1;
+            pageSize=page;
         }
 
         return ResponseEntity.ok(testSeeService.selectMeCommissionWork(id,pageSize,size));
@@ -77,7 +77,7 @@ public class Read1Controller {
         if (page==0){
             pageSize=1;
         }else {
-            pageSize=1;
+            pageSize=page;
         }
 
         return ResponseEntity.ok(testSeeService.selectMeRelatedWork(id,pageSize,size));
@@ -103,7 +103,7 @@ public class Read1Controller {
         if (page==0){
             pageSize=1;
         }else {
-            pageSize=1;
+            pageSize=page;
         }
         return ResponseEntity.ok(testSeeService.selectMeResolveWork(id,pageSize,size));
     }
@@ -129,7 +129,7 @@ public class Read1Controller {
         if (page==0){
             pageSize=1;
         }else {
-            pageSize=1;
+            pageSize=page;
         }
         return ResponseEntity.ok(testSeeService.selectMeReleaseWork(id,pageSize,size));
     }
@@ -157,7 +157,7 @@ public class Read1Controller {
         if (page==0){
             pageSize=0;
         }else {
-            pageSize=page-1;
+            pageSize=page;
         }
         return ResponseEntity.ok(testSeeService.titleSelect(id,pageSize,size,title));
     }

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

@@ -96,8 +96,8 @@ public class TestSeeServiceImpl implements TestSeeService {
         if (count%size!=0){
             countPage=countPage+1;
         }
-        if (page>countPage){
-            return new RedisListSum(count,list.subList((page-1)*size,countPage*size));
+        if (page>=countPage){
+            return new RedisListSum(count,list.subList((page-1)*size,count));
         } else {
             return  new RedisListSum(count,list.subList((page-1)*size,page*size));