liupeng 4 年之前
父节点
当前提交
988428fdf8

+ 5 - 5
code/sapparent/sapcms/src/main/java/org/fouram/controller/ReportController.java

@@ -43,12 +43,12 @@ public class ReportController extends BaseController {
 		try {
 			String startDay = "2020-05-11";
 			String endDay = "2020-05-15";
-			wxDepartService.saveDeparts(); // ok
-			wxUserService.saveUsers(); // ok
+			wxDepartService.saveDeparts();
+			wxUserService.saveUsers();
 			sapCheckService.saveCheckInOffOuts(startDay, endDay);
-			employeeTimeService.saveEmployeeTimes(); // ok
-			sapCheckOptionService.saveOptions(); // ok
-			sapApprovalInfoService.saveApprovalInfos(endDay); // ok
+			employeeTimeService.saveEmployeeTimes();
+			sapCheckOptionService.saveOptions();
+			sapApprovalInfoService.saveApprovalInfos(endDay);
 			return AppUtil.success();
 		} catch (Exception e) {
 			LoggerUtil.error(e);

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

@@ -1,7 +1,7 @@
 <?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="SapCheckMapper">
-	<update id="deleteCheckin">
+	<update id="deleteCheckinList">
 		delete from sap_checkin where checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}
 	</update>
 	<insert id="saveCheckin">
@@ -10,7 +10,7 @@
 		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{checkinDay},#{exceptionType},
 			#{checkinTime},#{locationTitle},#{locationDetail},#{wifiName},#{wifiMac})
 	</insert>
-	<update id="deleteCheckoff">
+	<update id="deleteCheckoffList">
 		delete from sap_checkoff where checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}
 	</update>
 	<insert id="saveCheckoff">
@@ -19,7 +19,7 @@
 		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{checkinDay},#{exceptionType},
 			#{checkinTime},#{locationTitle},#{locationDetail},#{wifiName},#{wifiMac})
 	</insert>
-	<update id="deleteCheckout">
+	<update id="deleteCheckoutList">
 		delete from sap_checkout where checkinDay >= #{startDay} and checkinDay &lt;= #{endDay}
 	</update>
 	<insert id="saveCheckout">

+ 3 - 7
code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -10,7 +10,6 @@ import org.fouram.core.base.service.BaseService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpOaUtil;
 import org.fouram.core.util.BeanUtils;
 import org.fouram.core.util.DateUtil;
-import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.Tools;
 import org.fouram.entity.SapCheck;
 import org.fouram.entity.SapCheckReport;
@@ -29,15 +28,14 @@ public class SapCheckService extends BaseService {
 	private WxUserService wxUserService;
 
 	public void saveCheckInOffOuts(String startDay, String endDay) throws Exception {
-		LoggerUtil.info("执行微信打卡开始" + DateUtil.getTime());
 		Map<String, String> param = Maps.newHashMap();
 		param.put("startDay", startDay);
 		param.put("endDay", endDay);
 
 		// 重新生成制定日期范围内的打卡数据
-		update("SapCheckMapper.deleteCheckin", param);
-		update("SapCheckMapper.deleteCheckoff", param);
-		update("SapCheckMapper.deleteCheckout", param);
+		update("SapCheckMapper.deleteCheckinList", param);
+		update("SapCheckMapper.deleteCheckoffList", param);
+		update("SapCheckMapper.deleteCheckoutList", param);
 
 		Date startDate = DateUtil.sdfTime.parse(startDay + " 00:00:00");
 		Date endDate = DateUtil.sdfTime.parse(endDay + " 23:59:59");
@@ -69,8 +67,6 @@ public class SapCheckService extends BaseService {
 		update("SapCheckMapper.saveCheckoutStart1", param);
 		update("SapCheckMapper.saveCheckoutStart2", param);
 		update("SapCheckMapper.saveCheckoutEnd", param);
-
-		LoggerUtil.info("执行微信打卡结束" + DateUtil.getTime());
 	}
 
 	public void saveCheckin(SapCheck check) throws Exception {

+ 0 - 4
code/sapparent/sapservice/src/main/java/org/fouram/service/WxDepartService.java

@@ -7,8 +7,6 @@ import java.util.List;
 import org.fouram.constants.WebConstants;
 import org.fouram.core.base.service.BaseService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpDepartUtil;
-import org.fouram.core.util.DateUtil;
-import org.fouram.core.util.LoggerUtil;
 import org.fouram.entity.WxDepart;
 import org.springframework.stereotype.Service;
 
@@ -18,14 +16,12 @@ import me.chanjar.weixin.cp.bean.WxCpDepart;
 public class WxDepartService extends BaseService {
 
 	public void saveDeparts() throws Exception {
-		LoggerUtil.info("执行微信部门开始" + DateUtil.getTime());
 		List<WxCpDepart> departs = WXCpDepartUtil.getAllChildDeparts(WebConstants.TOP_DEPART);
 		for (WxCpDepart depart : departs) {
 			if(selectById(depart.getId()) == null) {
 				save("WxDepartMapper.save", depart);
 			}
 		}
-		LoggerUtil.info("执行微信部门结束" + DateUtil.getTime());
 	}
 	
 	public List<WxDepart> findParentList(Long id) throws Exception {

+ 0 - 4
code/sapparent/sapservice/src/main/java/org/fouram/service/WxUserService.java

@@ -5,8 +5,6 @@ import java.util.Map;
 
 import org.fouram.core.base.service.BaseService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpUserUtil;
-import org.fouram.core.util.DateUtil;
-import org.fouram.core.util.LoggerUtil;
 import org.fouram.entity.WxDepart;
 import org.fouram.entity.WxUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +23,6 @@ public class WxUserService extends BaseService {
 	private Map<Long, List<WxDepart>> userDepartMap = Maps.newHashMap();
 
 	public void saveUsers() throws Exception {
-		LoggerUtil.info("执行微信用户开始" + DateUtil.getTime());
 		List<WxCpUser> users = WXCpUserUtil.listAllUser();
 		List<WxDepart> departs = null;
 		WxUser wxUser = null;
@@ -49,7 +46,6 @@ public class WxUserService extends BaseService {
 				update("WxUserMapper.update", wxUser);
 			}
 		}
-		LoggerUtil.info("执行微信用户结束" + DateUtil.getTime());
 	}
 
 	public WxUser selectById(String userId) throws Exception {