Browse Source

项目、订单状态修改联动修改

anderx 1 year ago
parent
commit
b9fcae89ae

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -2068,8 +2068,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public void pushProjectCompleteDate() {
-		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
-//		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectTasksByTid(2272);
+//		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
+		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectTasksByTid(2957);
 		for (TOrderTask e : tOrderTasks) {
 		updateProjectCompleteDate(e,0);
 		}

+ 15 - 12
src/main/java/com/goafanti/order/service/impl/TaskScoreServiceImpl.java

@@ -182,28 +182,31 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
         if (!tOrderTasks.isEmpty()){
             String orderNo=null;
             int count=0;
+            int completeCount = 0;
             int notSum = 0;
             for (TOrderTask e : tOrderTasks) {
                 if (orderNo==null&&e.getOrderNo() != null)orderNo=e.getOrderNo();
-                if (e.getScoreStatus()==2||e.getScoreStatus()==0)count++;
+                if (e.getScoreStatus()==0)count++;
                 if (e.getScoreStatus()==1)notSum++;
+                if (e.getScoreStatus()==2)completeCount++;
             }
             TOrderNew tOrderNew = new TOrderNew();
             tOrderNew.setOrderNo(orderNo);
-            if (notSum>0){
-                if (count>0&&count<tOrderTasks.size()){
-                    tOrderNew.setScoreStatus(2);
+            if (notSum==0){
+                //没有未评分,全部不是是无,全部已评分是已完成
+                if (count==tOrderTasks.size()){
+                    tOrderNew.setScoreStatus(0);
+                }else if (completeCount==tOrderTasks.size()){
+                    tOrderNew.setScoreStatus(3);
                 }
-                if (count==0){
-                    tOrderNew.setScoreStatus(1);
+            }else if (notSum>0){
+                //有未评分默认是待评分,有已完成是部分评分
+                tOrderNew.setScoreStatus(1);
+                if (completeCount>0){
+                    tOrderNew.setScoreStatus(2);
                 }
             }
-            if (count==tOrderTasks.size()){
-                tOrderNew.setScoreStatus(3);
-            }
-            if (count==0&&notSum==0){
-                tOrderNew.setScoreStatus(0);
-            }
+
             tOrderNewMapper.update(tOrderNew);
         }