Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!473

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

@@ -376,7 +376,7 @@ public class CrmController {
 	public Result<Object> addClient(@CurrentUser UserBean userBean, @RequestBody CrmClientData crmClientData) {
 	public Result<Object> addClient(@CurrentUser UserBean userBean, @RequestBody CrmClientData crmClientData) {
 		Integer empNum = getEmpNum(userBean);
 		Integer empNum = getEmpNum(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
-		crmClientData.setClientStatus(1);
+		crmClientData.setClientStatus(0);
 		crmClientData.setCreateUser(empNum);
 		crmClientData.setCreateUser(empNum);
 		SysRegion district = getSysRegion(crmClientData.getDistrictId());
 		SysRegion district = getSysRegion(crmClientData.getDistrictId());
 //		crmClientData.setZipCode(district.getZipCode());
 //		crmClientData.setZipCode(district.getZipCode());

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

@@ -333,7 +333,7 @@ public class AttController {
 			int qyid = userBean.getOrgCode();//坏小孩【企业id】
 			int qyid = userBean.getOrgCode();//坏小孩【企业id】
 			int userid = userBean.getEmpNum();//用户id	
 			int userid = userBean.getEmpNum();//用户id	
 			
 			
-			String dastr = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).toString();//
+			String dastr = new SimpleDateFormat("yyyy-MM").format(new Date()).toString();//
 			
 			
 			AttendanceGroup qttgrop = attendancegroupservice.selectByPrimaryKey(Integer.valueOf(attass.getAttgroupid()));
 			AttendanceGroup qttgrop = attendancegroupservice.selectByPrimaryKey(Integer.valueOf(attass.getAttgroupid()));
 			 boolean xiugai = true;
 			 boolean xiugai = true;
@@ -344,7 +344,7 @@ public class AttController {
 				
 				
 				String date = String.valueOf(schedules[0].getData());
 				String date = String.valueOf(schedules[0].getData());
 				Date dt=new Date(date);
 				Date dt=new Date(date);
-				SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM-dd");
+				SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM");
 				System.out.println(famt.format(dt));
 				System.out.println(famt.format(dt));
 				
 				
 				if(!(famt.format(dt)).equals(dastr)) {
 				if(!(famt.format(dt)).equals(dastr)) {