Просмотр исходного кода

Merge branch 'test2' of jishutao/kede-server into prod

anderx 1 год назад
Родитель
Сommit
0d3c254c14

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -3072,7 +3072,7 @@
         select a.id,a.task_receiver taskReceiver,a.score_number scoreNumber,c.sort cSort,a.score_status scoreStatus
         from t_order_task a left join business_project b on a.commodity_id =b.id
                             left join business_category c on b.cid =c.id
-            where c.sort in (3,6,9) and a.task_distribution_time>'2024-01-01'
+            where c.sort in (3,6,9) and a.task_distribution_time>'2024-01-01' and a.split_status in (0,2)
           and a.task_receiver in (SELECT task_receiver from t_order_task
                                   where id = #{tid})
     </select>

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

@@ -641,11 +641,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setId(b.getTid());
 		t.setProjectStatus(b.getProjectStatus());
 		t.setTimeRecord(b.getTimeRecord());
-		updateProjectCompleteDate(t,1);
 		t.setCertificateNumber(b.getCertificateNumber());
 		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();
@@ -680,6 +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);
 		}
 		return 1;
 	}
@@ -2072,10 +2073,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public void pushProjectCompleteDate() {
-//		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
-		List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectTasksByTid(2960);
+		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);

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.26
-static.host=//172.16.1.187/1.3.26
+static.host=//static.jishutao.com/1.3.26
+#static.host=//172.16.1.187/1.3.26
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false