Commit 1809b8a6 by ilal Committed by chenzg

提交

parent acc1e0ab
......@@ -376,7 +376,7 @@ public class CrmController {
public Result<Object> addClient(@CurrentUser UserBean userBean, @RequestBody CrmClientData crmClientData) {
Integer empNum = getEmpNum(userBean);
Integer orgCode = getOrgCode(userBean);
crmClientData.setClientStatus(1);
crmClientData.setClientStatus(0);
crmClientData.setCreateUser(empNum);
SysRegion district = getSysRegion(crmClientData.getDistrictId());
// crmClientData.setZipCode(district.getZipCode());
......
......@@ -333,7 +333,7 @@ public class AttController {
int qyid = userBean.getOrgCode();//坏小孩【企业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()));
boolean xiugai = true;
......@@ -344,7 +344,7 @@ public class AttController {
String date = String.valueOf(schedules[0].getData());
Date dt=new Date(date);
SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM");
System.out.println(famt.format(dt));
if(!(famt.format(dt)).equals(dastr)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment