Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!486

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

@@ -528,7 +528,7 @@ public class CrmController {
 
 	// 我协作的客户
 	private List<CrmClientData> getMyAssociateCilent(Integer empNum, Integer orgCode, Integer groupId, Integer status,
-			String like,Integer typei,String startFollowTime, String endFollowTime) {
+			String like,Integer typei,String startFollowTime, String endFollowTime,String startCreateTime,  String endCreateTime) {
 		List<CrmClientAssociate> crmClientAssociates = CrmClientAssociate.builder().build().selectList(
 				new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getAssociateId, empNum)
 						.eq(CrmClientAssociate::getOrgCode, orgCode).select(CrmClientAssociate::getCid));
@@ -539,6 +539,8 @@ public class CrmController {
 					.selectOne(new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getId, cid)
 							.eq(groupId != null && groupId >0, CrmClientData::getBelongGroup, groupId)
 							.eq(status != null && status >0, CrmClientData::getClientStatus, status).eq(typei != null && typei > 0, CrmClientData::getClientType, typei)
+							.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
+							.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
 							
 							.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getLastFollowTime, startFollowTime)
 							.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getLastFollowTime, endFollowTime)
@@ -554,7 +556,7 @@ public class CrmController {
 	private List<CrmClientData> getMyTotalCilent(Integer empNum, Integer orgCode, Integer groupId, Integer status,
 			String like,Integer typei) {
 		return CheckUtil.distinct(getMyCilent(empNum, orgCode, groupId, status, like,null,null,null,null,null),
-				getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,null,null), true);
+				getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,null,null,null,null), true);
 	}
 
 	// 我关注的客户
@@ -604,13 +606,13 @@ public class CrmController {
 		List<CrmClientData> crmClientDatas = null;
 		if (type == null || type == 0) { // 全部客户(去重)
 			List<CrmClientData> myClient = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,typei);
-			List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,startFollowTime,endFollowTime);
+			List<CrmClientData> myAsso = getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,startFollowTime,endFollowTime,startCreateTime,endCreateTime);
 			crmClientDatas = CheckUtil.distinct(myClient, myAsso, true).stream()
 					.filter(CheckUtil.distinctByKey(CrmClientData::getId)).collect(Collectors.toList());
 		} else if (type == 1) // 我负责的客户
 			crmClientDatas = getMyCilent(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,type);
 		else if (type == 2) // 我协作的客户
-			crmClientDatas = getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,startFollowTime,endFollowTime);
+			crmClientDatas = getMyAssociateCilent(empNum, orgCode, groupId, status, like,typei,startFollowTime,endFollowTime,startCreateTime,endCreateTime);
 		else if (type == 3) // 我关注的客户
 			crmClientDatas = getMyStarCilent(empNum, orgCode, groupId, status,typei);
 		else if (type == 4) // 七天未跟进的客户

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

@@ -1970,7 +1970,7 @@ public class ClockInController {
 											 
 											 //班次的休息时间
 											 long rest_time = 0;
-											 if(shif.getStartTime() != null && shif.getEndTime() != null) {
+											 if(shif.getStartTime() != null && !("").equals(shif.getStartTime()) && shif.getEndTime() != null && !("").equals(shif.getEndTime())) {
 												 long kaishixiuxi = Long.valueOf(ClockInTool.dateToStamp(putime + " " +shif.getStartTime()+":00"));
 											     long jieshuxiuxi = Long.valueOf(ClockInTool.dateToStamp(putime + " " +shif.getEndTime()+":00"));
 											     rest_time = (jieshuxiuxi - kaishixiuxi)/1000/60;//休息时间
@@ -3144,13 +3144,14 @@ public class ClockInController {
 								 .eq(KqglAssoDkjl::getUserId, userBean.getEmpNum()).ge(KqglAssoDkjl::getDktime, startDate).le(KqglAssoDkjl::getDktime, endDate)
 								 .ne(KqglAssoDkjl::getSort, 0).ne(KqglAssoDkjl::getStatus, 2).ne(KqglAssoDkjl::getStatus, 0)
 								 .orderByDesc(KqglAssoDkjl::getSort).last("LIMIT 1"));
-						 
+						 if(dk != null) {
 							 AttSchedule att = attsch.get(dk.getSort()-1);
 							 att.setIsupdate(1);
 							 
 							 AttSchedule attw = attsch.get(dk.getSort()-2);
 							 attw.setIsupdate(0);
 						 }
+					 }
 					 
 					 //全部为缺卡时 没有打卡按钮显示
 					 if(attsch.get(0).getDajl().getId() != null && iscrdk) {
@@ -3921,7 +3922,9 @@ public class ClockInController {
 											xxts =	ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除
 										}
 										if(Arrays.binarySearch(appmaps, num) >= 0) {//检查是否存在 无需打卡名单中
+											if(ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num) != null) {
 												ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
+											}
 											String[] xxtst = new String[xxts.length + zj];
 											System.arraycopy(xxts, 0, xxtst, 0, xxts.length);
 											xxtst[x] = num;