Browse Source

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

anderx 1 year ago
parent
commit
11af615df2

+ 1 - 0
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -163,5 +163,6 @@ public interface TOrderTaskMapper {
     List<TOrderTask> selectTasksByTid(Integer tid);
 
     List<TOrderTaskBo> selectAdminTaskByTid(Integer tid);
+    List<TOrderTaskBo> selectAdminTaskByAid(String aid);
 }
 

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

@@ -3072,9 +3072,16 @@
         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' and a.split_status in (0,2)
+        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>
+    <select id="selectAdminTaskByAid" resultType="com.goafanti.order.bo.TOrderTaskBo">
+        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' and a.split_status in (0,2)
+          and a.task_receiver = #{aid}
+    </select>
 </mapper>
 

+ 2 - 0
src/main/java/com/goafanti/order/service/TaskScoreService.java

@@ -62,4 +62,6 @@ public interface TaskScoreService {
     Result listExport(InputTaskScore in);
 
     void updateAdminByTid(Integer id);
+
+    void updateAdminByAid(String adminId);
 }

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

@@ -142,6 +142,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private UserTransferLogMapper userTransferLogMapper;
 	@Autowired
 	private TaskScoreService taskScoreService;
+	@Autowired
+	private AdminProjectStatisticsMapper adminProjectStatisticsMapper;
 
 
 	@Value(value = "${upload.path}")
@@ -240,10 +242,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		//派单后设置用户客户统计
 		if (type==0){
 			customerService.updateAdminUserCount(tn.getSalesmanId(),date);
-
+			taskScoreService.updateAdminByTid(t.getId());
+		}else {
+			taskScoreService.updateAdminByAid(TokenManager.getAdminId());
+			taskScoreService.updateAdminByAid(taskReceiverId);
 		}
-		//修改用户项目统计数
-		taskScoreService.updateAdminByTid(t.getId());
 		return 1;
 	}
 

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

@@ -93,14 +93,24 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
     @Override
     public void updateAdminByTid(Integer tid) {
         List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectAdminTaskByTid(tid);
-        String aid=null;
         //项目数量
+        pushAdminProjectStatistics(tOrderTaskBos, null);
+    }
+    @Override
+    public void updateAdminByAid(String aid) {
+        pushAdminProjectStatistics(null, aid);
+    }
+
+    private void pushAdminProjectStatistics(List<TOrderTaskBo> tOrderTaskBos, String aid) {
+        if (tOrderTaskBos==null){
+            tOrderTaskBos=tOrderTaskMapper.selectAdminTaskByAid(aid);
+        }
         int htSatCount = 0,htSatScoreCount = 0,htSatNotScoreCount = 0,
                 memberCount=0,memberScoreCount = 0,memberNotScoreCount = 0;
         BigDecimal ht_satSum=new BigDecimal(0);
         BigDecimal hySum=new BigDecimal(0);
         for (TOrderTaskBo tOrderTaskBo : tOrderTaskBos) {
-            if (aid==null)aid=tOrderTaskBo.getTaskReceiver();
+            if (aid ==null) aid =tOrderTaskBo.getTaskReceiver();
             if (tOrderTaskBo.getcSort()==3||tOrderTaskBo.getcSort()==9){
                 htSatCount++;
                 if (tOrderTaskBo.getScoreStatus()==1){
@@ -144,6 +154,8 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
         }
     }
 
+
+
     /**
      * 通过ID查询单条数据
      *