Skip to content

8
8timerapiv200
Commit e5d6ed8e by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!361
parents 01c3fe99 47c8a0da
Showing with 38 additions and 9 deletions
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
...@@ -2573,6 +2573,8 @@ public class TimeCardController { ...@@ -2573,6 +2573,8 @@ public class TimeCardController {
} }
} }
KqglAssoBcsz bcsts = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ashss.get(0).getId()));
if(ashss.get(0).getId() != 0) { if(ashss.get(0).getId() != 0) {
KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode()) KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode())
.ge(KqglAssoDkmx::getDksj, start_time).le(KqglAssoDkmx::getDksj, end_time)); .ge(KqglAssoDkmx::getDksj, start_time).le(KqglAssoDkmx::getDksj, end_time));
...@@ -2581,24 +2583,50 @@ public class TimeCardController { ...@@ -2581,24 +2583,50 @@ public class TimeCardController {
if(dkmc.getSbdk1() != null && dkmc.getSbdk1jg() == 0 && dkmc.getXbdk1() != null && dkmc.getXbdk1jg() == 0) { if(dkmc.getSbdk1() != null && dkmc.getSbdk1jg() == 0 && dkmc.getXbdk1() != null && dkmc.getXbdk1jg() == 0) {
wocal.setCalendar_status(1);//打卡正常 wocal.setCalendar_status(1);//打卡正常
}else { }else {
if(dkmc.getXbdk1() == null && attdate.getAttsch().size() == 2) {
if(bcsts.getIsXbdk()==1) {//下班不用打卡
wocal.setCalendar_status(1);//打卡正常
}else {
wocal.setCalendar_status(3);//打卡异常 wocal.setCalendar_status(3);//打卡异常
} }
}else {
wocal.setCalendar_status(3);//打卡异常
}
}
} }
if(attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) { if(attdate.getAttsch().size() == 4 || attdate.getAttsch().size() == 6) {
if(dkmc.getSbdk2() != null && dkmc.getSbdk2jg() == 0 && dkmc.getXbdk2() != null && dkmc.getXbdk2jg() == 0) { if(dkmc.getSbdk2() != null && dkmc.getSbdk2jg() == 0 && dkmc.getXbdk2() != null && dkmc.getXbdk2jg() == 0) {
wocal.setCalendar_status(1);//打卡正常 wocal.setCalendar_status(1);//打卡正常
}else { }else {
if(dkmc.getXbdk2() == null && attdate.getAttsch().size() == 4) {
if(bcsts.getIsXbdk()==1) {//下班不用打卡
wocal.setCalendar_status(1);//打卡正常
}else {
wocal.setCalendar_status(3);//打卡异常 wocal.setCalendar_status(3);//打卡异常
} }
}else {
wocal.setCalendar_status(3);//打卡异常
}
}
} }
if(attdate.getAttsch().size() == 6) { if(attdate.getAttsch().size() == 6) {
if(dkmc.getSbdk3() != null && dkmc.getSbdk3jg() == 0 && dkmc.getXbdk3() != null && dkmc.getXbdk3jg() == 0) { if(dkmc.getSbdk3() != null && dkmc.getSbdk3jg() == 0 && dkmc.getXbdk3() != null && dkmc.getXbdk3jg() == 0) {
wocal.setCalendar_status(1);//打卡正常 wocal.setCalendar_status(1);//打卡正常
}else { }else {
if(dkmc.getXbdk3() == null && attdate.getAttsch().size() == 6) {
if(bcsts.getIsXbdk()==1) {//下班不用打卡
wocal.setCalendar_status(1);//打卡正常
}else {
wocal.setCalendar_status(3);//打卡异常 wocal.setCalendar_status(3);//打卡异常
} }
}else {
wocal.setCalendar_status(3);//打卡异常
}
}
} }
KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum()) KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
......
src/main/java/cn/timer/api/controller/qyxx/CmsController.java
...@@ -174,11 +174,11 @@ public class CmsController { ...@@ -174,11 +174,11 @@ public class CmsController {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
Integer empNum = userBean.getEmpNum(); Integer empNum = userBean.getEmpNum();
String str = StringUtils.join(cmsContentDto.getFilepath(), ","); // 数组转字符串(逗号分隔)(推荐) // String str = StringUtils.join(cmsContentDto.getFilepath(), ","); // 数组转字符串(逗号分隔)(推荐)
CmsContent qynr = new CmsContent(); CmsContent qynr = new CmsContent();
BeanUtil.copyProperties(cmsContentDto, qynr); BeanUtil.copyProperties(cmsContentDto, qynr);
qynr.setFilepath(str); // qynr.setFilepath(str);
// Integer i = 10000; // Integer i = 10000;
// qynr.setXxbh("XX" + i++); // qynr.setXxbh("XX" + i++);
...@@ -330,13 +330,13 @@ public class CmsController { ...@@ -330,13 +330,13 @@ public class CmsController {
QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>(); QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id", id); queryWrapper.eq("id", id);
CmsContent cmsContent = CmsContent.builder().build().selectOne(queryWrapper); CmsContent cmsContent = CmsContent.builder().build().selectOne(queryWrapper);
String[] f = null; // String[] f = null;
if (cmsContent != null && cmsContent.getFilepath() != null) { // if (cmsContent != null && cmsContent.getFilepath() != null) {
f = cmsContent.getFilepath().split(","); // f = cmsContent.getFilepath().split(",");
} // }
CmsContentDto cmsContentDto = new CmsContentDto(); CmsContentDto cmsContentDto = new CmsContentDto();
BeanUtil.copyProperties(cmsContent, cmsContentDto); BeanUtil.copyProperties(cmsContent, cmsContentDto);
cmsContentDto.setFilepath(f); // cmsContentDto.setFilepath(f);
return ResultUtil.data(cmsContentDto); return ResultUtil.data(cmsContentDto);
} }
...@@ -358,7 +358,7 @@ public class CmsController { ...@@ -358,7 +358,7 @@ public class CmsController {
QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>(); QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("organization_id", userBean.getOrgCode()) queryWrapper.eq("organization_id", userBean.getOrgCode())
.select("id", "publisher_name", "auditopinion", "modularid", "status", "title", "releasetime", .select("id", "publisher_name", "auditopinion", "modularid", "status", "title", "releasetime",
"addeddate", "author", "summary", "releasetype", "fmtpath") "addeddate", "author", "summary", "releasetype", "fmtpath","filepath")
.ne("status", 1).eq(t != null && t > -1, "modularid", t) .ne("status", 1).eq(t != null && t > -1, "modularid", t)
.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/dto/qyxx/CmsContentDto.java
...@@ -120,7 +120,8 @@ public class CmsContentDto extends Page implements Serializable{ ...@@ -120,7 +120,8 @@ public class CmsContentDto extends Page implements Serializable{
private String fmtpath;// private String fmtpath;//
@ApiModelProperty(value = "附件文件路径", example = "101") @ApiModelProperty(value = "附件文件路径", example = "101")
private String[] filepath;// private String filepath;//
// private String[] filepath;//
@ApiModelProperty(value = "发布者姓名", example = "101") @ApiModelProperty(value = "发布者姓名", example = "101")
private String publisherName;// 发布者姓名 private String publisherName;// 发布者姓名
......
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