Browse Source

修改状态不生效BUG修复

anderx 1 year ago
parent
commit
251a99dd2f

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

@@ -645,6 +645,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(b.getSetUpAmount()!=null)t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
 		if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
 		TOrderTask task2=tOrderTaskMapper.queryById(b.getTid());//查询出项目信息
+		t.setTaskDistributionTime(task2.getTaskDistributionTime());
 		if(!Objects.equals(b.getProjectStatus(), task2.getProjectStatus())
 				||!b.getTimeRecord().equals(task2.getTimeRecord())){
 				TTaskMid taskMid = new TTaskMid();
@@ -679,7 +680,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
 			pushTaskLog(b.getTid(), b.getProjectStatus());
 			updateMidServiceProject(task2.getOrderNo());
-			updateProjectCompleteDate(t,0);
+			updateProjectCompleteDate(t);
 		}
 		return 1;
 	}
@@ -2075,7 +2076,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
 //		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectTasksByTid(2960);
 		for (TOrderTask e : tOrderTasks) {
-		updateProjectCompleteDate(e,0);
+		updateProjectCompleteDate(e);
 		}
 	}
 
@@ -2084,7 +2085,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 * @param e
 	 * @param type =0 是批量处理会修改  =1是修改属性,外部一起修改
 	 */
-	private void  updateProjectCompleteDate(TOrderTask e ,Integer type) {
+	private void  updateProjectCompleteDate(TOrderTask e ) {
 			ObjectMapper mapper = new ObjectMapper();
 			try {
 				Map map =null;
@@ -2110,15 +2111,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				if(flag){
 					TOrderTaskDetailBo orderTaskDetail = tOrderTaskMapper.getOrderTaskDetail(e.getId());
 					Integer sort = orderTaskDetail.getSort();
-					if (type==1){
-						e.setCompleteStatus(1);
-						if (date !=null)e.setCompleteDate(DateUtils.parseDate(date));
-						if (sort==3||sort==6||sort==9){
-							e.setScoreStatus(1);
-							taskScoreService.updateTOrderNewByTid(e.getId());
-							taskScoreService.updateAdminByTid(e.getId());
-						}
-					}else {
 						TOrderTask t=new TOrderTask();
 						t.setId(e.getId());
 						t.setCompleteStatus(1);
@@ -2139,10 +2131,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 									t.setScoreStatus(0);
 								}
 							}
+							tOrderTaskMapper.update(t);
 							taskScoreService.updateTOrderNewByTid(e.getId());
 						}
-						tOrderTaskMapper.update(t);
-					}
 				}
 			} catch (JsonProcessingException | ParseException ex) {
 				throw new RuntimeException(ex);