liupeng 4 years ago
parent
commit
2110f3644d

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

@@ -6,12 +6,12 @@
 			firstOrgId,secondOrgId,thirdOrgId,fourthOrgId,
 			firstOrgName,secondOrgName,thirdOrgName,fourthOrgName,
 			position,formatPosition,mobile,formatMobile,businessPhone,formatBusinessPhone,gender,
-			email,formatEmail,isPrimary,delFlag,createDate,result,sortNumber,startData,endData) 
+			email,formatEmail,isPrimary,delFlag,createDate,result,sortNumber,startDate,endDate) 
 		values (#{userId},#{personId},#{username},#{name},
 			#{firstOrgId},#{secondOrgId},#{thirdOrgId},#{fourthOrgId},
 			#{firstOrgName},#{secondOrgName},#{thirdOrgName},#{fourthOrgName},
 			#{position},#{formatPosition},#{mobile},#{formatMobile},#{businessPhone},#{formatBusinessPhone},#{gender},
-			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate},#{result},#{sortNumber},#{startData},#{endData})
+			#{email},#{formatEmail},#{isPrimary},#{delFlag},#{createDate},#{result},#{sortNumber},#{startDate},#{endDate})
 	</insert>
 	
 	<update id="updateOne">
@@ -26,7 +26,7 @@
 			businessPhone=#{businessPhone},formatBusinessPhone=#{formatBusinessPhone},
 			gender=#{gender},email=#{email},formatEmail=#{formatEmail},
 			isPrimary=#{isPrimary},result=#{result},delFlag=#{delFlag},
-			startData=#{startData},endData=#{endData}
+			startDate=#{startDate},endDate=#{endDate}
 		where userId=#{userId}
 	</update>
 	

+ 7 - 0
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -13,8 +13,10 @@ import org.fouram.core.base.service.RequestService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpUserUtil;
 import org.fouram.core.util.Base64Util;
 import org.fouram.core.util.ConfConfig;
+import org.fouram.core.util.DateUtil;
 import org.fouram.core.util.JSONUtil;
 import org.fouram.core.util.JsonNodeUtil;
+import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.Tools;
 import org.fouram.dto.input.GetIngoreListDTO;
 import org.fouram.dto.input.GetToBeConfirmedListDTO;
@@ -90,14 +92,19 @@ public class SapUserService extends BaseService {
 		}
 		// 获取用户对应机构
 		sapOrgService.setOrg(sapUsers);
+		LoggerUtil.info("saveWxDeparts->setOrg:" + DateUtil.getTime());
 		// 获取用户对应性别
 		sapPersonalService.setGender(sapUsers);
+		LoggerUtil.info("saveWxDeparts->setGender:" + DateUtil.getTime());
 		// 获取用户对应职务
 		sapEmpJobService.setPosition(sapUsers);
+		LoggerUtil.info("saveWxDeparts->setPosition:" + DateUtil.getTime());
 		// EmpEmployment->startDate 
 		sapEmpEmploymentService.setStartDate(sapUsers);
+		LoggerUtil.info("saveWxDeparts->setStartDate:" + DateUtil.getTime());
 		// EmpEmploymentTermination->endDate
 		sapEmpEmploymentTerminationService.setEndDate(sapUsers);
+		LoggerUtil.info("saveWxDeparts->setEndDate:" + DateUtil.getTime());
 		// 更新用户
 		SapUser sapUserDb = null;
 		SapUser sapUser = null;

+ 7 - 0
code/sapparent/sapservice/src/main/java/org/fouram/service/SyncSapUserToWxService.java

@@ -47,18 +47,25 @@ public class SyncSapUserToWxService extends BaseService {
 			WebConstants.CACHE.put(WebConstants.CACHE_SYNC_SAP, DateUtil.getTime());
 			// 更新微信部门
 			wxDepartService.saveWxDeparts();
+			LoggerUtil.info("saveWxDeparts:" + DateUtil.getTime());
 			// 更新微信用户
 			wxUserService.saveWxUsers();
+			LoggerUtil.info("saveWxUsers:" + DateUtil.getTime());
 			// 更新所有数据无效
 			sapUserService.updateAllDelFlag(DelFlagEnum.UNABLE.getCode());
+			LoggerUtil.info("updateAllDelFlag:" + DateUtil.getTime());
 			// 保存SAP用户数据
 			sapUserService.saveOrUpdateSapUsers();
+			LoggerUtil.info("saveOrUpdateSapUsers:" + DateUtil.getTime());
 			// 更新异常情况,敏感数据、入职等
 			sapUserService.updateAbnormalResult();
+			LoggerUtil.info("updateAbnormalResult:" + DateUtil.getTime());
 			// 更新用户头像
 			sapUserService.updateAvatars();
+			LoggerUtil.info("updateAvatars:" + DateUtil.getTime());
 			// NORMAL数据更新同步企业微信
 			sapUserService.updateAllNormalSyncWxResult();
+			LoggerUtil.info("updateAllNormalSyncWxResult:" + DateUtil.getTime());
 		} catch (Exception e) {
 			LoggerUtil.error(e);
 		} finally {