Browse Source

咨询师首页开发

anderx 2 years ago
parent
commit
ab0cccb3dd

+ 49 - 14
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.admin.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.bo.*;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.DepartmentService;
@@ -8,6 +9,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -47,6 +49,8 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private NewAdminService newAdminService;
 	@Autowired
 	private AdminUserCountMapper adminUserCountMapper;
+	@Autowired
+	private TaskTimeMapper taskTimeMapper;
 
 
 
@@ -561,23 +565,54 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 
 	@Override
 	public Object pushStatistics() {
-		List<String> roles=new ArrayList<>();
-		roles.add(AFTConstants.SALESMAN);
-		roles.add(AFTConstants.SALESMAN_MANAGER);
-		List<Admin> adminList = adminMapper.getAdminRoleTypesList(roles);
-		for (Admin admin : adminList) {
-		List<AdminUserCount> list =adminMapper.selectAdminPublicRelease(admin.getId());
-		List<AdminUserCount> list2 =adminMapper.selectAdminUserFollow(admin.getId());
-		List<AdminUserCount> list3 =adminMapper.selectAdminOrder(admin.getId());
-		if (list.isEmpty())list=new ArrayList<>();
-		if (!list.isEmpty())list.addAll(list2);
-		if (!list.isEmpty())list.addAll(list3);
-		publiAdminUserCount(list);
-		System.out.println("list="+list.size());
+//营销统计处理
+//		List<String> roles=new ArrayList<>();
+//		roles.add(AFTConstants.SALESMAN);
+//		roles.add(AFTConstants.SALESMAN_MANAGER);
+//		List<Admin> adminList = adminMapper.getAdminRoleTypesList(roles);
+//		for (Admin admin : adminList) {
+//		List<AdminUserCount> list =adminMapper.selectAdminPublicRelease(admin.getId());
+//		List<AdminUserCount> list2 =adminMapper.selectAdminUserFollow(admin.getId());
+//		List<AdminUserCount> list3 =adminMapper.selectAdminOrder(admin.getId());
+//		if (list.isEmpty())list=new ArrayList<>();
+//		if (!list.isEmpty())list.addAll(list2);
+//		if (!list.isEmpty())list.addAll(list3);
+//		publiAdminUserCount(list);
+//		System.out.println("list="+list.size());
+//		}
+		List<TOrderTask> allTimeRecord = taskTimeMapper.getAllTimeRecord();
+		for (TOrderTask e : allTimeRecord) {
+			String timeRecord = e.getTimeRecord();
+			Map<String,Object> map = JSON.parseObject(timeRecord, Map.class);
+			if (!map.isEmpty()){
+				for (String s : map.keySet()) {
+					if (s.equals("2")||s.equals("3")||s.equals("29")||s.equals("19")||(s.equals("27"))){
+						TaskTime tt=new TaskTime();
+						tt.setTid(e.getId());
+						tt.setProjectStatus(Integer.valueOf(s));
+						Map<String,Object> map1 = JSON.parseObject(map.get(s).toString(), Map.class);
+						if (null!=map1.get("date")){
+							String date = map1.get("date").toString();
+							if (StringUtils.isNotBlank(date)){
+								System.out.println(date);
+								tt.setDateTime(DateUtils.StringToDate(date,AFTConstants.YYYYMMDD));
+								int i = taskTimeMapper.updateByTidAndProjectSelective(tt);
+								if (i==0){
+									taskTimeMapper.insertSelective(tt);
+								}
+							}
+						}
+					}
+				}
+				try {
+					Thread.sleep(500);
+				} catch (InterruptedException exception) {
+					exception.printStackTrace();
+				}
+			}
 		}
 
 
-
 		return 1;
 	}
 

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

@@ -89,4 +89,5 @@ public interface TOrderTaskMapper {
     void updateDimissionTransferManager(@Param("aid")String aid, @Param("transferId")String transferId);
 
     List<String> selectOrderNoAllByaid(String aid);
+
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/TaskTimeMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TaskTime;
 
 import java.util.List;
@@ -20,4 +21,6 @@ public interface TaskTimeMapper {
     int updateByTidAndProjectSelective(TaskTime tt);
 
     List<TaskTime> selectByTidAndProject(TaskTime tt);
+
+    List<TOrderTask> getAllTimeRecord();
 }

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

@@ -2379,7 +2379,8 @@
   </select>
 
 
-  <delete id="deleteBySplitId" parameterType="java.lang.Integer">
+
+    <delete id="deleteBySplitId" parameterType="java.lang.Integer">
     delete from t_order_task
     where split_super = #{id,jdbcType=INTEGER}
   </delete>

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

@@ -92,7 +92,7 @@
           date_time = #{dateTime,jdbcType=DATE},
         </if>
       </set>
-
+      where tid = #{tid,jdbcType=INTEGER} and project_status =  #{projectStatus,jdbcType=INTEGER}
     </update>
   <select id="selectByTidAndProject" parameterType="com.goafanti.common.model.TaskTime" resultMap="BaseResultMap">
     select
@@ -100,4 +100,9 @@
     from task_time
     where tid = #{tid,jdbcType=INTEGER} and project_status =  #{projectStatus,jdbcType=INTEGER}
   </select>
+  <select id="getAllTimeRecord" resultType="com.goafanti.common.model.TOrderTask">
+      SELECT id,time_record timeRecord
+      from t_order_task
+      where time_record is not null and split_status in (0,2)
+  </select>
 </mapper>