Merge branch 'master' of https://git.jiinfo.cn/cmc-project/cmc_weixin_sap

code/sapparent/sapservice/src/main/java/org/fouram/entity/SapEmployeeTime.java

@@ -0,0 +1,24 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapEmployeeTime")
+public class SapEmployeeTime implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	private String externalCode;
+	private String timeType;
+	private String approvalStatus;
+	private String userId;
+}

code/sapparent/sapservice/src/main/java/org/fouram/entity/SapTimeType.java

@@ -0,0 +1,22 @@
+package org.fouram.entity;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Alias(value = "SapTimeType")
+public class SapTimeType implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	private String externalCode;
+	private String externalName;
+}

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

@@ -0,0 +1,4 @@
+<?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="SapEmployeeTimeMapper">
+</mapper>

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

@@ -0,0 +1,4 @@
+<?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="SapTimeTypeMapper">
+</mapper>

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

@@ -0,0 +1,9 @@
+package org.fouram.service;
+
+import org.fouram.core.base.service.BaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SapEmployeeTimeService extends BaseService {
+
+}

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

@@ -0,0 +1,9 @@
+package org.fouram.service;
+
+import org.fouram.core.base.service.BaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SapTimeTypeService extends BaseService {
+
+}

code/sapparent/sapservice/src/main/resources/env/develop/config.properties

@@ -24,9 +24,9 @@ wxCp.redirectUri = http://cmcadressbook.suggest.vip/sapcms
 wxCp.mailList.userId = 1,2,3,4,5,6,7,8,9,10,dd4d61108fecaa34918a555fd1d8cce1,1102
 
 #test
-#sapApi.user = APIADMIN@cmccoltdD:123456
+sapApi.user = APIADMIN@cmccoltdD:1234567
 #prod
-sapApi.user = API01@cmccoltd:cmccoltd123
+#sapApi.user = API01@cmccoltd:cmccoltd123
 
 ingorePersonIds = ,400023,400024,
 

code/sapparent/sapservice/src/main/resources/env/product/config.properties

@@ -20,7 +20,7 @@ wxCp.redirectUri = http://cmcadressbook.suggest.vip/sapcms
 wxCp.mailList.userId = 1,2,3,4,5,6,7,8,9,10,dd4d61108fecaa34918a555fd1d8cce1,1102
 
 #test
-#sapApi.user = APIADMIN@cmccoltdD:123456
+#sapApi.user = APIADMIN@cmccoltdD:1234567
 #prod
 sapApi.user = API01@cmccoltd:cmccoltd123