liupeng 5 éve
szülő
commit
1a26bbdf30

+ 1 - 0
code/sapparent/sapservice/src/main/java/org/fouram/entity/SapCheck.java

@@ -22,6 +22,7 @@ public class SapCheck implements Serializable {
 	private String groupName;
 	private String checkinType;
 	private Date checkinDate;
+	private String checkinDay;
 	private String exceptionType;
 	private Long checkinTime;
 	private String locationTitle;

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

@@ -2,23 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="SapCheckMapper">
 	<insert id="saveCheckin">
-		insert into sap_checkin(userId,groupName,checkinType,checkinDate,exceptionType,
+		insert into sap_checkin(userId,groupName,checkinType,checkinDate,checkinDay,exceptionType,
 			checkinTime,locationTitle,locationDetail,wifiName,wifiMac) 
-		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{exceptionType},
+		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{checkinDay},#{exceptionType},
 			#{checkinTime},#{locationTitle},#{locationDetail},#{wifiName},#{wifiMac})
 	</insert>
 	
 	<insert id="saveCheckoff">
-		insert into sap_checkoff(userId,groupName,checkinType,checkinDate,exceptionType,
+		insert into sap_checkoff(userId,groupName,checkinType,checkinDate,checkinDay,exceptionType,
 			checkinTime,locationTitle,locationDetail,wifiName,wifiMac) 
-		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{exceptionType},
+		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{checkinDay},#{exceptionType},
 			#{checkinTime},#{locationTitle},#{locationDetail},#{wifiName},#{wifiMac})
 	</insert>
 	
 	<insert id="saveCheckout">
-		insert into sap_checkout(userId,groupName,checkinType,checkinDate,exceptionType,
+		insert into sap_checkout(userId,groupName,checkinType,checkinDate,checkinDay,exceptionType,
 			checkinTime,locationTitle,locationDetail,wifiName,wifiMac) 
-		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{exceptionType},
+		values (#{userId},#{groupName},#{checkinType},#{checkinDate},#{checkinDay},#{exceptionType},
 			#{checkinTime},#{locationTitle},#{locationDetail},#{wifiName},#{wifiMac})
 	</insert>
 </mapper>

+ 11 - 12
code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -1,5 +1,6 @@
 package org.fouram.service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,12 +58,16 @@ public class SapCheckService extends BaseService {
 			int subCount = 0;
 			for (WxCpCheckinData data : checkinDatas) {
 				subCount = subCount + 1;
+				SapCheck check = new SapCheck();
+				BeanUtils.copyProperties(data, check);
+				check.setCheckinDate(new Date(check.getCheckinTime() * 1000));
+				check.setCheckinDay(DateUtil.getDay(check.getCheckinDate()));
 				if (data.getCheckinType().equals("上班打卡")) {
-					saveCheckin(data);
+					saveCheckin(check);
 				} else if (data.getCheckinType().equals("下班打卡")) {
-					saveCheckoff(data);
+					saveCheckoff(check);
 				} else if (data.getCheckinType().equals("外出打卡")) {
-					saveCheckout(data);
+					saveCheckout(check);
 				} else {
 					System.out.println(data);
 				}
@@ -72,21 +77,15 @@ public class SapCheckService extends BaseService {
 		}
 	}
 
-	public void saveCheckin(WxCpCheckinData data) throws Exception {
-		SapCheck check = new SapCheck();
-		BeanUtils.copyProperties(data, check);
+	public void saveCheckin(SapCheck check) throws Exception {
 		save("SapCheckMapper.saveCheckin", check);
 	}
 
-	public void saveCheckoff(WxCpCheckinData data) throws Exception {
-		SapCheck check = new SapCheck();
-		BeanUtils.copyProperties(data, check);
+	public void saveCheckoff(SapCheck check) throws Exception {
 		save("SapCheckMapper.saveCheckoff", check);
 	}
 
-	public void saveCheckout(WxCpCheckinData data) throws Exception {
-		SapCheck check = new SapCheck();
-		BeanUtils.copyProperties(data, check);
+	public void saveCheckout(SapCheck check) throws Exception {
 		save("SapCheckMapper.saveCheckout", check);
 	}
 }