Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!362

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

@@ -2805,6 +2805,7 @@ public class ClockInController {
 							//目前为止应出勤天数
 							//目前为止应出勤天数
 							 int w = 0,x=0;
 							 int w = 0,x=0;
 							 int zj = 6;
 							 int zj = 6;
+							 if(!(nextrange[0]).equals("")) {
 								 for(String num : nextrange) {
 								 for(String num : nextrange) {
 										if(Arrays.binarySearch(needfig, String.valueOf(ClockInTool.dateToWeek(num))) >= 0) {//对比排班应打卡时间
 										if(Arrays.binarySearch(needfig, String.valueOf(ClockInTool.dateToWeek(num))) >= 0) {//对比排班应打卡时间
 											String[] ycqtst = new String[ycqts.length + zj];
 											String[] ycqtst = new String[ycqts.length + zj];
@@ -2836,6 +2837,7 @@ public class ClockInController {
 											x++;
 											x++;
 										}
 										}
 									 }
 									 }
+							 }
 						}else if(attgro.getPbfs() == 2){	//自由排班
 						}else if(attgro.getPbfs() == 2){	//自由排班
 							DateFormat df11 = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
 							DateFormat df11 = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
 							List<Schedule> ycqs = schedulemapper.getAttendanceShouldList(userBean.getEmpNum(),startMonth,endMonth);
 							List<Schedule> ycqs = schedulemapper.getAttendanceShouldList(userBean.getEmpNum(),startMonth,endMonth);

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -302,7 +302,7 @@ public class CmsController {
 				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
 				qyxxQueryDto.getTotalPage() == null ? 10 : qyxxQueryDto.getTotalPage());
 
 
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("organization_id", userBean.getOrgCode()).eq("status", 1)
+		queryWrapper.eq("organization_id", userBean.getOrgCode())
 				.eq(t != null && t > -1, "modularid", t).eq(r != null && r > -1, "releasestate", r)
 				.eq(t != null && t > -1, "modularid", t).eq(r != null && r > -1, "releasestate", r)
 				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
 				.between(!StrUtil.hasBlank(s) && !StrUtil.hasBlank(e), "releasetime",
 						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",
 						!StrUtil.hasBlank(s) ? s : "1000-01-01 00:00:00",

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -1787,7 +1787,7 @@ public class YgglController {
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		ArrayList<Integer> list = new ArrayList<Integer>();
 		Integer empNum = userBean.getEmpNum();
 		Integer empNum = userBean.getEmpNum();
 		Integer gw = empNumConfirm(orgCode, empNum).getBmgwId();
 		Integer gw = empNumConfirm(orgCode, empNum).getBmgwId();
-		if(gw > 0) {
+		if(gw != null && gw > 0) {
 			ZzglBmgwM buid = ZzglBmgwM.builder().id(gw).build().selectById();
 			ZzglBmgwM buid = ZzglBmgwM.builder().id(gw).build().selectById();
 			
 			
 			List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
 			List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)

src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java

@@ -12,6 +12,8 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Pattern;
 
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import cn.timer.api.config.exception.Regular;
 import cn.timer.api.config.exception.Regular;
 import cn.timer.api.config.exception.ValidationMsg;
 import cn.timer.api.config.exception.ValidationMsg;
 import cn.timer.api.utils.Page;
 import cn.timer.api.utils.Page;
@@ -56,6 +58,7 @@ public class AddygdaDto extends Page implements Serializable{
     private Integer jobType;
     private Integer jobType;
 	
 	
 //	@NotNull(message = ValidationMsg.NOTNULL)
 //	@NotNull(message = ValidationMsg.NOTNULL)
+	@JSONField(format="yyyy-MM-dd") 
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
     private Date rzTime;
     private Date rzTime;