fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/TaskController.java

@@ -9,6 +9,7 @@ import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.LoggerUtil;
 import org.fouram.service.SapApprovalInfoService;
 import org.fouram.service.SapCheckService;
+import org.fouram.service.SapCheckUserService;
 import org.fouram.service.SapEmployeeTimeService;
 import org.fouram.service.SapReportService;
 import org.fouram.service.SapUserService;
@@ -37,6 +38,8 @@ public class TaskController extends BaseController {
 	private SapEmployeeTimeService employeeTimeService;
 	@Autowired
 	private SapApprovalInfoService sapApprovalInfoService;
+	@Autowired
+	private SapCheckUserService sapCheckUserService;
 
 	/**
 	 * http://localhost:8080/sapcms/task/syncWeixinUser
@@ -94,13 +97,29 @@ public class TaskController extends BaseController {
 	@ResponseBody
 	public Object saveReportBaseData() {
 		try {
-			Date startDate = DateUtil.sdfTime.parse("2020-05-06 00:00:00");
-			Date endDate = DateUtil.sdfTime.parse("2020-05-09 23:59:59");
+			Date startDate = DateUtil.sdfTime.parse("2020-05-11 00:00:00");
+			Date endDate = DateUtil.sdfTime.parse("2020-05-15 23:59:59");
 			sapCheckService.saveAllUserCheckData(startDate, endDate);
 			sapCheckService.saveCheckoutStartAndEndData();
 			employeeTimeService.saveEmployeeTimes();
 			sapCheckService.saveAllUserCheckOption();
-			sapApprovalInfoService.saveApprovalInfos(startDate, endDate);
+			sapApprovalInfoService.saveApprovalInfos(DateUtil.sdfTime.parse("2020-05-01 00:00:00"), endDate);
+			return AppUtil.success();
+		} catch (Exception e) {
+			LoggerUtil.error(e);
+			return AppUtil.error(ResultConstant.WEB_ERR_MSG);
+		}
+	}
+	
+	/**
+	 * http://localhost:8080/sapcms/task/saveCheckUsers
+	 * @return
+	 */
+	@RequestMapping(value = "/saveCheckUsers", produces = "application/json;charset=utf-8")
+	@ResponseBody
+	public Object saveCheckUsers() {
+		try {
+			sapCheckUserService.saveCheckUsers();
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);

code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpUserUtil.java

@@ -3,12 +3,17 @@ package org.fouram.core.plugin.weixin.cp.util;
 import static org.fouram.core.plugin.weixin.cp.core.WXCpBase.userService;
 
 import java.util.List;
+import java.util.Set;
 
 import org.fouram.constants.WebConstants;
 import org.fouram.core.util.Tools;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.bean.Gender;
+import me.chanjar.weixin.cp.bean.WxCpDepart;
 import me.chanjar.weixin.cp.bean.WxCpUser;
 import me.chanjar.weixin.cp.bean.WxCpUser.ExternalAttribute;
 
@@ -161,7 +166,23 @@ public class WXCpUserUtil {
 		return userService.listByDepartment(departId, true, 0);
 	}
 
-	public static void main(String[] args) {
-		System.out.println(getByIdOrEmail("1029", "weilong.jia@cmcinc.cn"));
+	public static List<WxCpUser> listAllUser() throws WxErrorException {
+		List<WxCpUser> result = Lists.newArrayList();
+		Set<String> set = Sets.newHashSet();
+		List<WxCpDepart> departs = WXCpDepartUtil.getAllChildDeparts(1L);
+		for (WxCpDepart depart : departs) {
+			List<WxCpUser> users = WXCpUserUtil.listByDepartment(depart.getId());
+			for (WxCpUser user : users) {
+				if(!set.contains(user.getUserId())) {
+					result.add(user);
+					set.add(user.getUserId());
+				}
+			}
+		}
+		return result;
+	}
+
+	public static void main(String[] args) throws WxErrorException {
+		System.out.println(listAllUser().size());
 	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapCheckMapper.xml

@@ -78,10 +78,11 @@
 	<insert id="saveCheckReportUser">
 		create table sap_check_report_user
 		SELECT a.userId, a.name, 
-		replace(group_concat(case when a.checkinDay = '2020-05-06' then a.result else '' end ),',','') as '2020-05-06',
-		replace(group_concat(case when a.checkinDay = '2020-05-07' then a.result else '' end ),',','') as '2020-05-07',
-		replace(group_concat(case when a.checkinDay = '2020-05-08' then a.result else '' end ),',','') as '2020-05-08',
-		replace(group_concat(case when a.checkinDay = '2020-05-09' then a.result else '' end ),',','') as '2020-05-09'
+		replace(group_concat(case when a.checkinDay = '2020-05-11' then a.result else '' end ),',','') as '2020-05-11',
+		replace(group_concat(case when a.checkinDay = '2020-05-12' then a.result else '' end ),',','') as '2020-05-12',
+		replace(group_concat(case when a.checkinDay = '2020-05-13' then a.result else '' end ),',','') as '2020-05-13',
+		replace(group_concat(case when a.checkinDay = '2020-05-14' then a.result else '' end ),',','') as '2020-05-14',
+		replace(group_concat(case when a.checkinDay = '2020-05-15' then a.result else '' end ),',','') as '2020-05-15'
 		from sap_check_report a group by a.userId, a.name;
 	</insert>
 	<update id="truncateCheckOption">

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapCheckUserMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="SapCheckUserMapper">
+	<insert id="save">
+		insert into sap_check_user(userId,name,sapExists) 
+		values (#{userId},#{name},'0')
+	</insert>
+</mapper>

code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckUserService.java

@@ -0,0 +1,20 @@
+package org.fouram.service;
+
+import java.util.List;
+
+import org.fouram.core.base.service.BaseService;
+import org.fouram.core.plugin.weixin.cp.util.WXCpUserUtil;
+import org.springframework.stereotype.Service;
+
+import me.chanjar.weixin.cp.bean.WxCpUser;
+
+@Service
+public class SapCheckUserService extends BaseService {
+
+	public void saveCheckUsers() throws Exception {
+		List<WxCpUser> users = WXCpUserUtil.listAllUser();
+		for (WxCpUser user : users) {
+			save("SapCheckUserMapper.save", user);
+		}
+	}
+}