Skip to content

8
8timerapiv200
Commit 19f0472d by ilal
Options

提交

parent 47c8a0da
Showing with 37 additions and 32 deletions
src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
...@@ -2805,36 +2805,38 @@ public class ClockInController { ...@@ -2805,36 +2805,38 @@ public class ClockInController {
//目前为止应出勤天数 //目前为止应出勤天数
int w = 0,x=0; int w = 0,x=0;
int zj = 6; int zj = 6;
for(String num : nextrange) { if(!(nextrange[0]).equals("")) {
if(Arrays.binarySearch(needfig, String.valueOf(ClockInTool.dateToWeek(num))) >= 0) {//对比排班应打卡时间 for(String num : nextrange) {
String[] ycqtst = new String[ycqts.length + zj]; if(Arrays.binarySearch(needfig, String.valueOf(ClockInTool.dateToWeek(num))) >= 0) {//对比排班应打卡时间
System.arraycopy(ycqts, 0, ycqtst, 0, ycqts.length); String[] ycqtst = new String[ycqts.length + zj];
ycqtst[w] = num; System.arraycopy(ycqts, 0, ycqtst, 0, ycqts.length);
ycqts = ycqtst; ycqtst[w] = num;
w++; ycqts = ycqtst;
}else { w++;
String[] xxtst = new String[xxts.length + zj]; }else {
System.arraycopy(xxts, 0, xxtst, 0, xxts.length); String[] xxtst = new String[xxts.length + zj];
xxtst[x] = num; System.arraycopy(xxts, 0, xxtst, 0, xxts.length);
xxts = xxtst; xxtst[x] = num;
x++; xxts = xxtst;
} x++;
if(Arrays.binarySearch(bxdkss, num) >= 0) {//检查是否存在 必须打卡名单中 }
String[] ycqtst = new String[ycqts.length + zj]; if(Arrays.binarySearch(bxdkss, num) >= 0) {//检查是否存在 必须打卡名单中
System.arraycopy(ycqts, 0, ycqtst, 0, ycqts.length); String[] ycqtst = new String[ycqts.length + zj];
ycqtst[w] = num; System.arraycopy(ycqts, 0, ycqtst, 0, ycqts.length);
ycqts = ycqtst; ycqtst[w] = num;
w++; ycqts = ycqtst;
xxts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除 w++;
} xxts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(xxts), num);//为必须上班的话从休息日期中去除
if(Arrays.binarySearch(appmaps, num) >= 0) {//检查是否存在 无需打卡名单中 }
ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除 if(Arrays.binarySearch(appmaps, num) >= 0) {//检查是否存在 无需打卡名单中
String[] xxtst = new String[xxts.length + zj]; ycqts = ClockInTool.doChinFilters(ClockInTool.deleteArrayNull(ycqts), num);//为必须休息的话从上班日期中去除
System.arraycopy(xxts, 0, xxtst, 0, xxts.length); String[] xxtst = new String[xxts.length + zj];
xxtst[x] = num; System.arraycopy(xxts, 0, xxtst, 0, xxts.length);
xxts = xxtst; xxtst[x] = num;
x++; xxts = xxtst;
} 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);
......
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
...@@ -302,7 +302,7 @@ public class CmsController { ...@@ -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 { ...@@ -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; ...@@ -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{ ...@@ -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;
......
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