Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!476

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());
@@ -801,7 +801,7 @@ public class CrmController {
 				List<CrmClientData> datas = CrmClientData.builder().build().selectList(new QueryWrapper<CrmClientData>()
 				List<CrmClientData> datas = CrmClientData.builder().build().selectList(new QueryWrapper<CrmClientData>()
 						.lambda().eq(CrmClientData::getBelongGroup, gid)
 						.lambda().eq(CrmClientData::getBelongGroup, gid)
 						.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
 						.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
-						.eq(type != null && type >= 0, CrmClientData::getClientType, type)
+						.eq(type != null && type >= 0, CrmClientData::getClientType, type).like(!StrUtil.isBlank(customerowner), CrmClientData::getBelongUserName, customerowner)
 						.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
 						.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
 						.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
 						.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
 						.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
 						.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
@@ -1113,6 +1113,11 @@ public class CrmController {
 			@RequestParam(required = false) Integer groupId, @RequestParam(required = false) Integer belonger,
 			@RequestParam(required = false) Integer groupId, @RequestParam(required = false) Integer belonger,
 			@RequestParam(required = false) String startCreateTime,
 			@RequestParam(required = false) String startCreateTime,
 			@RequestParam(required = false) String endCreateTime) {
 			@RequestParam(required = false) String endCreateTime) {
+		
+		if(endCreateTime != null && !("").equals(endCreateTime)) {
+			endCreateTime = endCreateTime.substring(0, 10)+" 23:59:59";
+		}
+		
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		List<Object> listAll = new ArrayList<Object>();
 		List<Object> listAll = new ArrayList<Object>();
 		listAll.add(cartogram(orgCode, groupId, 1, belonger, startCreateTime, endCreateTime));// 图1
 		listAll.add(cartogram(orgCode, groupId, 1, belonger, startCreateTime, endCreateTime));// 图1

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)) {