Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!571

src/main/java/cn/timer/api/bean/crm/CrmClientData.java

@@ -165,6 +165,9 @@ public class CrmClientData extends Model<CrmClientData> {
 	@ApiModelProperty(value = "跟进记录")
 	private String followuprecord;
 	
+	@ApiModelProperty(value = "隐藏客户（0：已隐藏；1：未隐藏）")
+	private Integer hidingcustomers;
+
 	@Transient
 	@TableField(exist = false)
 	@ApiModelProperty(value = "协作(0：否 1：是)")

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

@@ -704,6 +704,7 @@ public class CrmController {
 			List<CrmClientData> list = CrmClientData.builder().build()
 					.selectList(new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
 							.eq(CrmClientData::getBelongUser, 0)
+							.eq(CrmClientData::getHidingcustomers, 1)
 							.eq(type != null && type >= 0, CrmClientData::getClientType, type)
 							.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
 							.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
@@ -731,6 +732,7 @@ public class CrmController {
 				List<CrmClientData> datas = CrmClientData.builder().build()
 						.selectList(new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getBelongGroup, gid)
 								.eq(CrmClientData::getBelongUser, 0)
+								.eq(CrmClientData::getHidingcustomers, 1)
 								.eq(type != null && type >= 0, CrmClientData::getClientType, type)
 								.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
 								.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
@@ -1147,6 +1149,30 @@ public class CrmController {
 		return ResultUtil.success("转移失败");
 	}
 	
+	@GetMapping("hidingcustomers")
+	@ApiOperation(value = "隐藏客户", httpMethod = "GET", notes = "接口发布说明")
+	public Result<Void> HidingCustomers(@CurrentUser UserBean userBean,@RequestParam Integer yid) {
+		
+		CrmClientData crda = CrmClientData.builder().id(yid).build().selectById();
+		
+		if(crda != null) {
+			// 当前操作人是否管理员
+			CrmBusinessGroupMember nowManager = CrmBusinessGroupMember.builder().build()
+					.selectOne(new QueryWrapper<CrmBusinessGroupMember>().lambda().eq(CrmBusinessGroupMember::getGid, crda.getBelongGroup())
+							.eq(CrmBusinessGroupMember::getEmpNum, getEmpNum(userBean))
+							.eq(CrmBusinessGroupMember::getType, 1));
+			
+			if (nowManager == null)
+				return ResultUtil.error("没有操作权限，请联系组管理员进行操作");
+			
+			
+		  CrmClientData.builder().id(yid).hidingcustomers(0).build().updateById();
+		}
+		
+		
+		return ResultUtil.success("成功");
+	}
+
 	/**
 	 * 
 	 * @param userBean
@@ -1520,14 +1546,23 @@ public class CrmController {
 					if (crmBusinessGroup == null)
 						return ResultUtil.error("没有匹配的业务组名称");
 					
+					int industryid = 0;
 					if (StrUtil.isNotBlank(industryName)) {
 						// 行业字典
 						IndustryClass industryClass = IndustryClass.builder().build()
 								.selectOne(new LambdaQueryWrapper<IndustryClass>().eq(IndustryClass::getName, industryName)
 										.select(IndustryClass::getId));
-						if (industryClass == null)
-							return ResultUtil.error("没有匹配的行业名称");
-						crmClientData.setIndustry(industryClass.getId());
+						if (industryClass == null) {
+							
+							IndustryClass incls = IndustryClass.builder().build();
+							incls.setName(industryName);
+							incls.insert();
+							industryid = incls.getId();
+//							return ResultUtil.error("没有匹配的行业名称");
+						}else {
+							industryid = industryClass.getId();
+						}
+						crmClientData.setIndustry(industryid);
 					}
 
 					if (StrUtil.isNotBlank(clientTypeName)) {

src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java

@@ -101,7 +101,7 @@ public class AttendanceTaskTiming{
 	//typeid:1-员工  2-考勤组 
 
 //	@Scheduled(cron = "0 */5 * * * ?")
-//	@Scheduled(cron = "0 23 14 * * ?")
+//	@Scheduled(cron = "0 55 15 * * ?")
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行    
 	public void AttendanceTask() throws ParseException {
 
@@ -583,7 +583,11 @@ public class AttendanceTaskTiming{
 							//1:加班 2:请假 3:出差 4:外出 5:补卡
 							int u = 0;
 							int p = 1;
+							
 							for(String num : range) {
+								
+								
+								try {
 									String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = "";
 									if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) {
 										rowData.add("休息并打卡");
@@ -814,6 +818,11 @@ public class AttendanceTaskTiming{
 									
 									u++;
 									p++;
+								} catch (Exception e) {
+									System.err.println("出错");
+								}
+								
+								
 							}
 						}else {
 							for (String num2 : range) { 

src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java

@@ -569,6 +569,8 @@ public class LastMonthtimingExport {
 						//1:加班 2:请假 3:出差 4:外出 5:补卡
 						int u = 0,p=1;
 						for(String num : range) {
+							
+							try {
 								String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = "";
 								if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) {
 									rowData.add("休息并打卡");
@@ -730,10 +732,10 @@ public class LastMonthtimingExport {
 											if(!ClockInTool.contains(ClockInTool.deleteArrayNull(ycqts),num) && !ClockInTool.contains(ClockInTool.deleteArrayNull(xxts),num)) {
 												if(lea.getOvertimeTypeId() == 3) {
 													if(lea.getCompensateId() == 1 || lea.getCompensateId() == 3) {
-	//												holidayturncompenleave++;
+//												holidayturncompenleave++;
 														holidayturncompenleave = holidayturncompenleave + lea.getDuration();
 													}else if(lea.getCompensateId() == 2 || lea.getCompensateId() == 4) {
-	//												holidaytransferovertime++;
+//												holidaytransferovertime++;
 														holidaytransferovertime = holidaytransferovertime + lea.getDuration();
 													}
 												}
@@ -815,6 +817,9 @@ public class LastMonthtimingExport {
 								
 								u++;
 								p++;
+							} catch (Exception e) {
+								System.err.println("出错");
+							}
 						}
 					}else {
 						for (String num2 : range) { 

src/main/java/cn/timer/api/controller/kqgl/atttimer/RealTimeUpdate.java

@@ -560,6 +560,7 @@ public class RealTimeUpdate{
 					int p = 1;
 					for(String num : range) {
 						
+						try {
 							String sjs = "",qinjia = "",chuaca = "",waichu = "",buka = "",jiaban = "";
 							if(ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(xxts), num) && ClockInTool.useArrayUtils(ClockInTool.deleteArrayNull(dkjtts),num)) {
 								rowData.add("休息并打卡");
@@ -789,6 +790,9 @@ public class RealTimeUpdate{
 							
 							u++;
 							p++;
+						} catch (Exception e) {
+							System.err.println("出错");
+						}
 					}
 				}else {
 					for (String num2 : range) {