Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!335

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -1420,6 +1420,7 @@ public class CrmController {
 			crmClientData.setClientUrl(clientUrl);
 			crmClientData.setClientUrl(clientUrl);
 			crmClientData.setClientEmail(clientEmail);
 			crmClientData.setClientEmail(clientEmail);
 			crmClientData.setAddress(clientAddress);
 			crmClientData.setAddress(clientAddress);
+			crmClientData.setOrgCode(orgCode);
 			crmClientData.insert();
 			crmClientData.insert();
 
 
 			Integer cid = crmClientData.getId();
 			Integer cid = crmClientData.getId();

src/main/java/cn/timer/api/controller/kqgl/AttController.java

@@ -77,6 +77,7 @@ import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.Initialization.StaticVariable;
 import cn.timer.api.config.Initialization.StaticVariable;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.annotation.UserBean;
+import cn.timer.api.controller.kqgl.atttimer.RealTimeUpdate;
 import cn.timer.api.dao.kqgl.AttGroupBinPunchModeMapper;
 import cn.timer.api.dao.kqgl.AttGroupBinPunchModeMapper;
 import cn.timer.api.dao.kqgl.AttendanceGroupMapper;
 import cn.timer.api.dao.kqgl.AttendanceGroupMapper;
 import cn.timer.api.dao.kqgl.AttendanceMachineMapper;
 import cn.timer.api.dao.kqgl.AttendanceMachineMapper;
@@ -1291,6 +1292,8 @@ public class AttController {
 		return ResultUtil.data(tesulist);
 		return ResultUtil.data(tesulist);
 	}
 	}
 	
 	
+	@Autowired
+	private RealTimeUpdate realtimeupdate;
 	
 	
 	/**
 	/**
 	 *	 修改考勤基本信息
 	 *	 修改考勤基本信息
@@ -1551,6 +1554,12 @@ public class AttController {
 			}
 			}
 			
 			
 			
 			
+			try {
+				realtimeupdate.AttendanceTask(userBean.getOrgCode(), attgrpid, 1,null);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+			
 	//		if (shiftmanagementservice.updateByPrimaryKeySelective(shif) > 0) {
 	//		if (shiftmanagementservice.updateByPrimaryKeySelective(shif) > 0) {
 				return ResultUtil.data(null,"修改考勤组信息成功");
 				return ResultUtil.data(null,"修改考勤组信息成功");
 	//		}
 	//		}