Skip to content

8
8timerapiv200
Commit f7b0d9d5 by 邓实川
Options

Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc

parents e435759f 59ffc686
Showing with 206 additions and 248 deletions
src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkmx.java
...@@ -48,36 +48,54 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> { ...@@ -48,36 +48,54 @@ public class KqglAssoDkmx extends Model<KqglAssoDkmx> {
@ApiModelProperty(value = "上班1打卡结果 上班1打卡结果", example = "101") @ApiModelProperty(value = "上班1打卡结果 上班1打卡结果", example = "101")
private Integer sbdk1jg; private Integer sbdk1jg;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj1;
@ApiModelProperty(value = "下班1打卡时间 下班1打卡时间", example = "101") @ApiModelProperty(value = "下班1打卡时间 下班1打卡时间", example = "101")
private Long xbdk1; private Long xbdk1;
@ApiModelProperty(value = "下班1打卡结果 下班1打卡结果", example = "101") @ApiModelProperty(value = "下班1打卡结果 下班1打卡结果", example = "101")
private Integer xbdk1jg; private Integer xbdk1jg;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj2;
@ApiModelProperty(value = "上班2打卡时间 上班2打卡时间", example = "101") @ApiModelProperty(value = "上班2打卡时间 上班2打卡时间", example = "101")
private Long sbdk2; private Long sbdk2;
@ApiModelProperty(value = "上班2打卡结果 上班2打卡结果", example = "101") @ApiModelProperty(value = "上班2打卡结果 上班2打卡结果", example = "101")
private Integer sbdk2jg; private Integer sbdk2jg;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj3;
@ApiModelProperty(value = "下班2打卡时间 下班2打卡时间", example = "101") @ApiModelProperty(value = "下班2打卡时间 下班2打卡时间", example = "101")
private Long xbdk2; private Long xbdk2;
@ApiModelProperty(value = "下班2打卡结果 下班2打卡结果", example = "101") @ApiModelProperty(value = "下班2打卡结果 下班2打卡结果", example = "101")
private Integer xbdk2jg; private Integer xbdk2jg;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj4;
@ApiModelProperty(value = "上班3打卡时间 上班3打卡时间", example = "101") @ApiModelProperty(value = "上班3打卡时间 上班3打卡时间", example = "101")
private Long sbdk3; private Long sbdk3;
@ApiModelProperty(value = "上班3打卡结果 上班3打卡结果", example = "101") @ApiModelProperty(value = "上班3打卡结果 上班3打卡结果", example = "101")
private Integer sbdk3jg; private Integer sbdk3jg;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj5;
@ApiModelProperty(value = "下班3打卡时间 下班3打卡时间", example = "101") @ApiModelProperty(value = "下班3打卡时间 下班3打卡时间", example = "101")
private Long xbdk3; private Long xbdk3;
@ApiModelProperty(value = "下班3打卡结果 下班3打卡结果", example = "101") @ApiModelProperty(value = "下班3打卡结果 下班3打卡结果", example = "101")
private Integer xbdk3jg; private Integer xbdk3jg;
@ApiModelProperty(value = "打卡途径（1：补卡；2：管理员更改）", example = "0")
private Integer dktj6;
@ApiModelProperty(value = "应打卡次数 应打卡次数", example = "101") @ApiModelProperty(value = "应打卡次数 应打卡次数", example = "101")
private Integer ydkcs; private Integer ydkcs;
......
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -584,6 +584,7 @@ public class LoginController { ...@@ -584,6 +584,7 @@ public class LoginController {
System.out.println("重复初始化数据！"); System.out.println("重复初始化数据！");
} }
// 绩效设置初始化
JxglBasicSetting bS = jxglService.selectAT(qyId); JxglBasicSetting bS = jxglService.selectAT(qyId);
if (bS == null) { if (bS == null) {
boolean res = jxglService.initJxglBasicSetting(qyId); boolean res = jxglService.initJxglBasicSetting(qyId);
......
src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java
...@@ -40,6 +40,7 @@ public class JxglServiceImpl implements JxglService { ...@@ -40,6 +40,7 @@ public class JxglServiceImpl implements JxglService {
res = !performanceRating.insert() && res ? false : res; res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
performanceRating.setBasicSettingId(bC.getId()); performanceRating.setBasicSettingId(bC.getId());
performanceRating.setName("B"); performanceRating.setName("B");
performanceRating.setSectionMinScore(60); performanceRating.setSectionMinScore(60);
...@@ -47,6 +48,7 @@ public class JxglServiceImpl implements JxglService { ...@@ -47,6 +48,7 @@ public class JxglServiceImpl implements JxglService {
performanceRating.setRanks(0); performanceRating.setRanks(0);
res = !performanceRating.insert() && res ? false : res; res = !performanceRating.insert() && res ? false : res;
performanceRating.setId(null);
performanceRating.setBasicSettingId(bC.getId()); performanceRating.setBasicSettingId(bC.getId());
performanceRating.setName("A"); performanceRating.setName("A");
performanceRating.setSectionMinScore(80); performanceRating.setSectionMinScore(80);
......
src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
...@@ -2215,6 +2215,10 @@ public class TimeCardController { ...@@ -2215,6 +2215,10 @@ public class TimeCardController {
@ApiOperation(value = "更改打卡结果", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "更改打卡结果", httpMethod = "POST", notes = "接口发布说明")
public Result<Object> ChangePunchResults(@CurrentUser UserBean userBean,@RequestBody ChangePunchResultsDto chpunchr) throws ParseException { public Result<Object> ChangePunchResults(@CurrentUser UserBean userBean,@RequestBody ChangePunchResultsDto chpunchr) throws ParseException {
String data = chpunchr.getData();//应更改时间yyyy-MMM-dd String data = chpunchr.getData();//应更改时间yyyy-MMM-dd
Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(data,"yyyy-MM-dd")).getTime();
String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDate));//转换打卡时间格式
String minutes = chpunchr.getMinutes();//更改分钟数 String minutes = chpunchr.getMinutes();//更改分钟数
KqglAssoBcsz dkbc = kqglassobcszmapper.selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, chpunchr.getBcszid())); KqglAssoBcsz dkbc = kqglassobcszmapper.selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, chpunchr.getBcszid()));
...@@ -2251,61 +2255,112 @@ public class TimeCardController { ...@@ -2251,61 +2255,112 @@ public class TimeCardController {
long sbdk1 = 0,xbdk1 = 0,sbdk2 = 0,xbdk2 = 0,sbdk3 = 0,xbdk3 = 0; long sbdk1 = 0,xbdk1 = 0,sbdk2 = 0,xbdk2 = 0,sbdk3 = 0,xbdk3 = 0;
int sbdk1jg = 0,xbdk1jg = 0,sbdk2jg = 0,xbdk2jg = 0,sbdk3jg = 0,xbdk3jg = 0; int sbdk1jg = 0,xbdk1jg = 0,sbdk2jg = 0,xbdk2jg = 0,sbdk3jg = 0,xbdk3jg = 0;
int dkmxid = 0;
//kqgl_asso_dkmx 打卡明细是否存在打卡记录 //kqgl_asso_dkmx 打卡明细是否存在打卡记录
KqglAssoDkmx dkmx = kqglassodkmxmapper.selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getData, chpunchr.getData()).eq(KqglAssoDkmx::getUserid, chpunchr.getNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode())); KqglAssoDkmx dkmx = kqglassodkmxmapper.selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getData, chpunchr.getData()).eq(KqglAssoDkmx::getUserid, chpunchr.getNum()).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode()));
if(dkmx != null) { if(dkmx != null) {
dkmxid = dkmx.getId();
if(chpunchr.getClocktype() == 1) {
sbdk1 = changed_time;
sbdk1jg = results;
KqglAssoDkmx.builder().id(dkmx.getId()).sbdk1(sbdk1).sbdk1jg(sbdk1jg).dktj1(2).build().updateById();
}else if(chpunchr.getClocktype() == 2) {
xbdk1 = changed_time;
xbdk1jg = results;
KqglAssoDkmx.builder().id(dkmx.getId()).xbdk1(xbdk1).xbdk1jg(xbdk1jg).dktj2(2).build().updateById();
}else if(chpunchr.getClocktype() == 3) {
sbdk2 = changed_time;
sbdk2jg = results;
KqglAssoDkmx.builder().id(dkmx.getId()).sbdk2(sbdk2).sbdk2jg(sbdk2jg).dktj3(2).build().updateById();
}else if(chpunchr.getClocktype() == 4) {
xbdk2 = changed_time;
xbdk2jg = results;
KqglAssoDkmx.builder().id(dkmx.getId()).xbdk2(xbdk2).xbdk2jg(xbdk2jg).dktj4(2).build().updateById();
}else if(chpunchr.getClocktype() == 5) {
sbdk3 = changed_time;
sbdk3jg = results;
KqglAssoDkmx.builder().id(dkmx.getId()).sbdk3(sbdk3).sbdk3jg(sbdk3jg).dktj5(2).build().updateById();
}else {
xbdk3 = changed_time;
xbdk3jg = results;
KqglAssoDkmx.builder().id(dkmx.getId()).xbdk3(xbdk3).xbdk3jg(xbdk3jg).dktj6(2).build().updateById();
}
}else {
KqglAssoDkmx pcd = KqglAssoDkmx.builder().userid(chpunchr.getNum()).data(data).qyid(userBean.getOrgCode()).dksj(startDate).ydkcs(dkbc.getSxbcs()*2)
.gzsc(0d).build();
if(chpunchr.getClocktype() == 1) { if(chpunchr.getClocktype() == 1) {
sbdk1 = changed_time; sbdk1 = changed_time;
sbdk1jg = results; sbdk1jg = results;
if(results == 0) {
sbdk1jg = -1;
}
KqglAssoDkmx.builder().id(dkmx.getId()).sbdk1(sbdk1).sbdk1jg(sbdk1jg).build().updateById(); pcd.setSbdk1(sbdk1);
pcd.setSbdk1jg(sbdk1jg);
pcd.setDktj1(2);
if (!pcd.insert()) {
throw new CustomException("打卡明细-新增异常-1");
}
}else if(chpunchr.getClocktype() == 2) { }else if(chpunchr.getClocktype() == 2) {
xbdk1 = changed_time; xbdk1 = changed_time;
xbdk1jg = results; xbdk1jg = results;
if(results == 0) {
xbdk1jg = -1;
}
KqglAssoDkmx.builder().id(dkmx.getId()).xbdk1(xbdk1).xbdk1jg(xbdk1jg).build().updateById(); pcd.setXbdk1(xbdk1);
pcd.setXbdk1jg(xbdk1jg);
pcd.setDktj2(2);
if (!pcd.insert()) {
throw new CustomException("打卡明细-新增异常-1");
}
}else if(chpunchr.getClocktype() == 3) { }else if(chpunchr.getClocktype() == 3) {
sbdk2 = changed_time; sbdk2 = changed_time;
sbdk2jg = results; sbdk2jg = results;
if(results == 0) {
sbdk2jg = -1; pcd.setSbdk2(sbdk2);
} pcd.setSbdk2jg(sbdk2jg);
KqglAssoDkmx.builder().id(dkmx.getId()).sbdk2(sbdk2).sbdk2jg(sbdk2jg).build().updateById(); pcd.setDktj3(2);
if (!pcd.insert()) {
throw new CustomException("打卡明细-新增异常-1");
}
}else if(chpunchr.getClocktype() == 4) { }else if(chpunchr.getClocktype() == 4) {
xbdk2 = changed_time; xbdk2 = changed_time;
xbdk2jg = results; xbdk2jg = results;
if(results == 0) {
xbdk2jg = -1; pcd.setXbdk2(xbdk2);
} pcd.setXbdk2jg(xbdk2jg);
KqglAssoDkmx.builder().id(dkmx.getId()).xbdk2(xbdk2).xbdk2jg(xbdk2jg).build().updateById(); pcd.setDktj4(2);
if (!pcd.insert()) {
throw new CustomException("打卡明细-新增异常-1");
}
}else if(chpunchr.getClocktype() == 5) { }else if(chpunchr.getClocktype() == 5) {
sbdk3 = changed_time; sbdk3 = changed_time;
sbdk3jg = results; sbdk3jg = results;
if(results == 0) {
sbdk3jg = -1; pcd.setSbdk3(sbdk3);
} pcd.setSbdk3jg(sbdk3jg);
KqglAssoDkmx.builder().id(dkmx.getId()).sbdk3(sbdk3).sbdk3jg(sbdk3jg).build().updateById(); pcd.setDktj5(2);
if (!pcd.insert()) {
throw new CustomException("打卡明细-新增异常-1");
}
}else { }else {
xbdk3 = changed_time; xbdk3 = changed_time;
xbdk3jg = results; xbdk3jg = results;
if(results == 0) {
xbdk3jg = -1; pcd.setXbdk3(xbdk3);
} pcd.setXbdk3jg(xbdk3jg);
KqglAssoDkmx.builder().id(dkmx.getId()).xbdk3(xbdk3).xbdk3jg(xbdk3jg).build().updateById(); pcd.setDktj6(2);
if (!pcd.insert()) {
throw new CustomException("打卡明细-新增异常-1");
}
} }
dkmxid = pcd.getId();
} }
//打卡记录表 //打卡记录表
clock_time_ = Long.valueOf(ClockInTool.dateToStamp(clock_time)); clock_time_ = Long.valueOf(ClockInTool.dateToStamp(clock_time));
Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(data,"yyyy-MM-dd")).getTime();
String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDate));//转换打卡时间格式
int type = 0; int type = 0;
if((chpunchr.getClocktype())%2 > 0){ if((chpunchr.getClocktype())%2 > 0){
type = 1; type = 1;
...@@ -2314,7 +2369,7 @@ public class TimeCardController { ...@@ -2314,7 +2369,7 @@ public class TimeCardController {
} }
KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(changed_time).results(results).userId(chpunchr.getNum()).type(type).status(9).sort(chpunchr.getClocktype()) KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(changed_time).results(results).userId(chpunchr.getNum()).type(type).status(9).sort(chpunchr.getClocktype())
.cardType(3).qyid(userBean.getOrgCode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(data)).attime(clock_time_).dkmxid(dkmx.getId()).bcid(chpunchr.getBcszid()).remarks("管理员改为正常").punchmode(0) .cardType(0).qyid(userBean.getOrgCode()).attdate(attdate_+" "+ClockInTool.dateToWeek2(data)).attime(clock_time_).dkmxid(dkmxid).bcid(chpunchr.getBcszid()).remarks("管理员更改操作").punchmode(0)
.punchequipment("").build(); .punchequipment("").build();
if (!pre.insert()) { if (!pre.insert()) {
throw new CustomException("打卡记录-新增异常"); throw new CustomException("打卡记录-新增异常");
......
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
...@@ -34,6 +35,7 @@ import cn.hutool.core.util.StrUtil; ...@@ -34,6 +35,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.aspect.lang.annotation.Log; import cn.timer.api.aspect.lang.annotation.Log;
import cn.timer.api.aspect.lang.enums.BusinessType; import cn.timer.api.aspect.lang.enums.BusinessType;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.spmk.SpmkApprovalG; import cn.timer.api.bean.spmk.SpmkApprovalG;
import cn.timer.api.bean.spmk.SpmkApprovalTemplate; import cn.timer.api.bean.spmk.SpmkApprovalTemplate;
import cn.timer.api.bean.spmk.SpmkApprovalTemplateG; import cn.timer.api.bean.spmk.SpmkApprovalTemplateG;
...@@ -52,6 +54,7 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface; ...@@ -52,6 +54,7 @@ import cn.timer.api.config.enuminterface.SpmkEnumInterface;
import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts; import cn.timer.api.config.enuminterface.SpmkEnumInterface.ApproveSummarySts;
import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts; import cn.timer.api.config.enuminterface.SpmkEnumInterface.ExecutorSts;
import cn.timer.api.config.enums.CommonEnum; import cn.timer.api.config.enums.CommonEnum;
import cn.timer.api.config.enums.SysRoleType;
import cn.timer.api.config.exception.CustomException; import cn.timer.api.config.exception.CustomException;
import cn.timer.api.config.validation.Insert; import cn.timer.api.config.validation.Insert;
import cn.timer.api.config.validation.Ranks; import cn.timer.api.config.validation.Ranks;
...@@ -60,6 +63,7 @@ import cn.timer.api.config.validation.ValidList; ...@@ -60,6 +63,7 @@ import cn.timer.api.config.validation.ValidList;
import cn.timer.api.controller.spmk.service.SpmkService; import cn.timer.api.controller.spmk.service.SpmkService;
import cn.timer.api.controller.yggl.service.YgglService; import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.controller.zzgl.service.ZzglBmgwMService; import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
import cn.timer.api.dao.spmk.SpmkApprovalGMapper; import cn.timer.api.dao.spmk.SpmkApprovalGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper; import cn.timer.api.dao.spmk.SpmkApprovalTemplateGMapper;
import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper; import cn.timer.api.dao.spmk.SpmkApprovalTemplateMapper;
...@@ -103,6 +107,8 @@ public class SpmkController { ...@@ -103,6 +107,8 @@ public class SpmkController {
private ZzglBmgwMService zzglBmgwMService; private ZzglBmgwMService zzglBmgwMService;
@Autowired @Autowired
private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper;
@Autowired
private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper; private SpmkApprovalTemplateGMapper spmkApprovalTemplateGMapper;
@Autowired @Autowired
private SpmkApprovalTemplateMapper spmkApprovalTemplateMapper; private SpmkApprovalTemplateMapper spmkApprovalTemplateMapper;
...@@ -691,7 +697,17 @@ public class SpmkController { ...@@ -691,7 +697,17 @@ public class SpmkController {
.eq(SpmkExecutor::getId, approvingDto.getExecutorId()) .eq(SpmkExecutor::getId, approvingDto.getExecutorId())
.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum()) .eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
.eq(SpmkExecutor::getSts, SpmkEnumInterface.ExecutorSts.IN_EXECUTION.ordinal())) == 0) { .eq(SpmkExecutor::getSts, SpmkEnumInterface.ExecutorSts.IN_EXECUTION.ordinal())) == 0) {
return ResultUtil.error("非当前审批人,无法审批!");
Integer adminNum = new LambdaQueryChainWrapper<QyzxEmpEntAsso>(qyzxEmpEntAssoMapper)
.eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum())
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
.in(QyzxEmpEntAsso::getUserType, SysRoleType.U_TYPE_ADMIN,SysRoleType.U_TYPE_C_ADMIN)
.count();
if (adminNum <= 0) {
return ResultUtil.error("非当前审批人 或 管理员,无法操作!");
}
} }
if (aSummary.getSts() == 0) { if (aSummary.getSts() == 0) {
......
src/main/java/cn/timer/api/controller/yggl/YgglController.java
...@@ -1309,8 +1309,7 @@ public class YgglController { ...@@ -1309,8 +1309,7 @@ public class YgglController {
LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda() LambdaQueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum) .eq(QyzxEmpEntAsso::getEmpNum, empNum)
.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode()) .eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode());
;
// 确认离职 删除员工关联表 // 确认离职 删除员工关联表
qyzxEmpEntAssoMapper.delete(queryWrapper); qyzxEmpEntAssoMapper.delete(queryWrapper);
...@@ -1322,7 +1321,8 @@ public class YgglController { ...@@ -1322,7 +1321,8 @@ public class YgglController {
.eq(ZzglBmgwM::getLeader, empNum)); .eq(ZzglBmgwM::getLeader, empNum));
// 更新当前企业 // 更新当前企业
List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(queryWrapper); List<QyzxEmpEntAsso> listEEA = qyzxEmpEntAssoMapper.selectList(new QueryWrapper<QyzxEmpEntAsso>().lambda()
.eq(QyzxEmpEntAsso::getEmpNum, empNum));
if (listEEA != null && listEEA.size() > 0) { if (listEEA != null && listEEA.size() > 0) {
QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById(); QyzxEmpLogin.builder().id(empNum).orgId(CollUtil.getFirst(listEEA).getOrgCode()).build().updateById();
} }
......
src/main/java/cn/timer/api/dto/kqmk/DailyDetailsDto.java
...@@ -38,6 +38,13 @@ public class DailyDetailsDto { ...@@ -38,6 +38,13 @@ public class DailyDetailsDto {
private String bcxbdk2; private String bcxbdk2;
private String bcsbdk3; private String bcsbdk3;
private String bcxbdk3; private String bcxbdk3;
private Integer dktj1;
private Integer dktj2;
private Integer dktj3;
private Integer dktj4;
private Integer dktj5;
private Integer dktj6;
private String sbdk1;// 上班1打卡时间 private String sbdk1;// 上班1打卡时间
private Integer sbdk1jg;// 上班1打卡结果 private Integer sbdk1jg;// 上班1打卡结果
......
src/main/java/cn/timer/api/utils/DateUtil.java
...@@ -99,6 +99,35 @@ public class DateUtil { ...@@ -99,6 +99,35 @@ public class DateUtil {
return 0; return 0;
} }
/**
* 将String时间转换为时间戳
*
* @param time
* @return
* @throws ParseException
*/
public static Date getFormatDate(String time) throws ParseException {
if (StrUtil.isNotBlank(time)) {
switch (time.length()) {
case 10:
return getStringDate(time, "yyyy-MM-dd");
case 16:
return getStringDate(time, "yyyy-MM-dd HH:mm");
case 19:
return getStringDate(time, "yyyy-MM-dd HH:mm:ss");
default:
break;
}
return null;
}
return null;
}
/** /**
* 将String时间转换为时间戳 * 将String时间转换为时间戳
...@@ -107,6 +136,19 @@ public class DateUtil { ...@@ -107,6 +136,19 @@ public class DateUtil {
* @return * @return
* @throws ParseException * @throws ParseException
*/ */
public static Date getStringDate(String time, String format)
throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
return simpleDateFormat.parse(time);
}
/**
* 将String时间转换为 Date
*
* @param time
* @return
* @throws ParseException
*/
public static long getStringTime(String time, String format) public static long getStringTime(String time, String format)
throws ParseException { throws ParseException {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
......
src/main/java/cn/timer/api/utils/router/business/GoOutBusiness.java
...@@ -50,8 +50,8 @@ public class GoOutBusiness extends SpmkAssoBusiness { ...@@ -50,8 +50,8 @@ public class GoOutBusiness extends SpmkAssoBusiness {
.orgcode(orgCode) .orgcode(orgCode)
.evectionid(Convert.toInt(approveId)) .evectionid(Convert.toInt(approveId))
.evectiontype(2) .evectiontype(2)
.starttime(DateUtil.getStringTime(startTime, "yyyy-MM-dd HH:mm:ss")) .starttime(DateUtil.getFormat(startTime))
.endtime(DateUtil.getStringTime(endTime, "yyyy-MM-dd HH:mm:ss")) .endtime(DateUtil.getFormat(endTime))
.duration(Convert.toDouble(longTime)) .duration(Convert.toDouble(longTime))
.build(); .build();
......
src/main/java/cn/timer/api/utils/router/business/RegularizationBusiness.java
...@@ -15,6 +15,7 @@ import cn.timer.api.controller.yggl.service.YgglService; ...@@ -15,6 +15,7 @@ import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.dto.spmk.FromData; import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.yggl.YgzzDto; import cn.timer.api.dto.yggl.YgzzDto;
import cn.timer.api.utils.DateFormatUtils; import cn.timer.api.utils.DateFormatUtils;
import cn.timer.api.utils.DateUtil;
import lombok.Builder; import lombok.Builder;
/** /**
...@@ -60,8 +61,8 @@ public class RegularizationBusiness extends SpmkAssoBusiness { ...@@ -60,8 +61,8 @@ public class RegularizationBusiness extends SpmkAssoBusiness {
YgzzDto ygzzDto = YgzzDto.builder() YgzzDto ygzzDto = YgzzDto.builder()
.empNum(id) .empNum(id)
.orgCode(orgCode) .orgCode(orgCode)
.zzTime(DateFormatUtils.getDateByString(confirmationTime)) .zzTime(DateUtil.getFormatDate(confirmationTime))
.sjzzTime(DateFormatUtils.getDateByString(newConfirmationTime)) .sjzzTime(DateUtil.getFormatDate(newConfirmationTime))
.zzRemark(Remarks) .zzRemark(Remarks)
.build(); .build();
System.out.println("转正:"+ygzzDto); System.out.println("转正:"+ygzzDto);
......
src/main/java/cn/timer/api/utils/router/business/ResignationBusiness.java
...@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.controller.yggl.service.YgglService; import cn.timer.api.controller.yggl.service.YgglService;
import cn.timer.api.dto.spmk.FromData; import cn.timer.api.dto.spmk.FromData;
import cn.timer.api.dto.yggl.LzygQueryDto; import cn.timer.api.dto.yggl.LzygQueryDto;
import cn.timer.api.utils.DateFormatUtils; import cn.timer.api.utils.DateFormatUtils;
import cn.timer.api.utils.DateUtil;
import lombok.Builder; import lombok.Builder;
/** /**
...@@ -46,7 +46,7 @@ public class ResignationBusiness extends SpmkAssoBusiness { ...@@ -46,7 +46,7 @@ public class ResignationBusiness extends SpmkAssoBusiness {
LzygQueryDto dtO = LzygQueryDto.builder() LzygQueryDto dtO = LzygQueryDto.builder()
.orgCode(orgCode) .orgCode(orgCode)
.empNum(id) .empNum(id)
.lzTime(DateFormatUtils.getDateByString(terminationDate)) .lzTime(DateUtil.getFormatDate(terminationDate))
.lzyy(ReasonForResignation) .lzyy(ReasonForResignation)
.lzbz(Remarks) .lzbz(Remarks)
.build(); .build();
......
src/main/resources/mapping/kqmk/KqglAssoDkmxMapper.xml
...@@ -9,16 +9,27 @@ ...@@ -9,16 +9,27 @@
<result column="data" property="data" /> <result column="data" property="data" />
<result column="sbdk1" property="sbdk1" /> <result column="sbdk1" property="sbdk1" />
<result column="sbdk1jg" property="sbdk1jg" /> <result column="sbdk1jg" property="sbdk1jg" />
<result column="dktj1" property="dktj1" />
<result column="xbdk1" property="xbdk1" /> <result column="xbdk1" property="xbdk1" />
<result column="xbdk1jg" property="xbdk1jg" /> <result column="xbdk1jg" property="xbdk1jg" />
<result column="dktj2" property="dktj2" />
<result column="sbdk2" property="sbdk2" /> <result column="sbdk2" property="sbdk2" />
<result column="sbdk2jg" property="sbdk2jg" /> <result column="sbdk2jg" property="sbdk2jg" />
<result column="dktj3" property="dktj3" />
<result column="xbdk2" property="xbdk2" /> <result column="xbdk2" property="xbdk2" />
<result column="xbdk2jg" property="xbdk2jg" /> <result column="xbdk2jg" property="xbdk2jg" />
<result column="dktj4" property="dktj4" />
<result column="sbdk3" property="sbdk3" /> <result column="sbdk3" property="sbdk3" />
<result column="sbdk3jg" property="sbdk3jg" /> <result column="sbdk3jg" property="sbdk3jg" />
<result column="dktj5" property="dktj5" />
<result column="xbdk3" property="xbdk3" /> <result column="xbdk3" property="xbdk3" />
<result column="xbdk3jg" property="xbdk3jg" /> <result column="xbdk3jg" property="xbdk3jg" />
<result column="dktj6" property="dktj6" />
<result column="ydkcs" property="ydkcs" /> <result column="ydkcs" property="ydkcs" />
<result column="gzsc" property="gzsc" /> <result column="gzsc" property="gzsc" />
<result column="qyid" property="qyid" /> <result column="qyid" property="qyid" />
...@@ -35,55 +46,6 @@ ...@@ -35,55 +46,6 @@
<result column="kgcdfzstotal" property="kgcdfzstotal" /> <result column="kgcdfzstotal" property="kgcdfzstotal" />
</resultMap> </resultMap>
<sql id="Base_Column_List">
id,
userid,
data,
sbdk1,
sbdk1jg,
xbdk1,
xbdk1jg,
sbdk2,
sbdk2jg,
xbdk2,
xbdk2jg,
sbdk3,
sbdk3jg,
xbdk3,
xbdk3jg,
ydkcs,
gzsc,
qyid,
dksj,
yzcdcs,
yzcdsc,
kgcdfzs
</sql>
<sql id="Base_Column_List_Alias">
id KqglAssoDkmx_id,
userid KqglAssoDkmx_userid,
data KqglAssoDkmx_data,
sbdk1 KqglAssoDkmx_sbdk1,
sbdk1jg KqglAssoDkmx_sbdk1jg,
xbdk1 KqglAssoDkmx_xbdk1,
xbdk1jg KqglAssoDkmx_xbdk1jg,
sbdk2 KqglAssoDkmx_sbdk2,
sbdk2jg KqglAssoDkmx_sbdk2jg,
xbdk2 KqglAssoDkmx_xbdk2,
xbdk2jg KqglAssoDkmx_xbdk2jg,
sbdk3 KqglAssoDkmx_sbdk3,
sbdk3jg KqglAssoDkmx_sbdk3jg,
xbdk3 KqglAssoDkmx_xbdk3,
xbdk3jg KqglAssoDkmx_xbdk3jg,
ydkcs KqglAssoDkmx_ydkcs,
gzsc KqglAssoDkmx_gzsc,
qyid KqglAssoDkmx_qyid,
dksj KqglAssoDkmx_dksj,
yzcdcs KqglAssoDkmx_yzcdcs,
yzcdsc KqglAssoDkmx_yzcdsc,
kgcdfzs KqglAssoDkmx_kgcdfzs
</sql>
<select id="subsidiary" resultMap="AttSubsidiary"> <select id="subsidiary" resultMap="AttSubsidiary">
select SUM(dk.gzsc) as gzsctotalgzsc, select SUM(dk.gzsc) as gzsctotalgzsc,
...@@ -124,165 +86,5 @@ ...@@ -124,165 +86,5 @@
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoDkmx">
INSERT INTO kqgl_asso_dkmx
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test ='null != userid'>
userid,
</if>
<if test ='null != data'>
data,
</if>
<if test ='null != sbdk1'>
sbdk1,
</if>
<if test ='null != sbdk1jg'>
sbdk1jg,
</if>
<if test ='null != xbdk1'>
xbdk1,
</if>
<if test ='null != xbdk1jg'>
xbdk1jg,
</if>
<if test ='null != sbdk2'>
sbdk2,
</if>
<if test ='null != sbdk2jg'>
sbdk2jg,
</if>
<if test ='null != xbdk2'>
xbdk2,
</if>
<if test ='null != xbdk2jg'>
xbdk2jg,
</if>
<if test ='null != sbdk3'>
sbdk3,
</if>
<if test ='null != sbdk3jg'>
sbdk3jg,
</if>
<if test ='null != xbdk3'>
xbdk3,
</if>
<if test ='null != xbdk3jg'>
xbdk3jg,
</if>
<if test ='null != ydkcs'>
ydkcs,
</if>
<if test ='null != gzsc'>
gzsc,
</if>
<if test ='null != qyid'>
qyid,
</if>
<if test ='null != dksj'>
dksj,
</if>
<if test ='null != yzcdcs'>
yzcdcs,
</if>
<if test ='null != yzcdsc'>
yzcdsc,
</if>
<if test ='null != kgcdfzs'>
kgcdfzs
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test ='null != userid'>
#{userid},
</if>
<if test ='null != data'>
#{data},
</if>
<if test ='null != sbdk1'>
#{sbdk1},
</if>
<if test ='null != sbdk1jg'>
#{sbdk1jg},
</if>
<if test ='null != xbdk1'>
#{xbdk1},
</if>
<if test ='null != xbdk1jg'>
#{xbdk1jg},
</if>
<if test ='null != sbdk2'>
#{sbdk2},
</if>
<if test ='null != sbdk2jg'>
#{sbdk2jg},
</if>
<if test ='null != xbdk2'>
#{xbdk2},
</if>
<if test ='null != xbdk2jg'>
#{xbdk2jg},
</if>
<if test ='null != sbdk3'>
#{sbdk3},
</if>
<if test ='null != sbdk3jg'>
#{sbdk3jg},
</if>
<if test ='null != xbdk3'>
#{xbdk3},
</if>
<if test ='null != xbdk3jg'>
#{xbdk3jg},
</if>
<if test ='null != ydkcs'>
#{ydkcs},
</if>
<if test ='null != gzsc'>
#{gzsc},
</if>
<if test ='null != qyid'>
#{qyid},
</if>
<if test ='null != dksj'>
#{dksj},
</if>
<if test ='null != yzcdcs'>
#{yzcdcs},
</if>
<if test ='null != yzcdsc'>
#{yzcdsc},
</if>
<if test ='null != kgcdfzs'>
#{kgcdfzs}
</if>
</trim>
</insert>
<delete id="delete" >
DELETE FROM kqgl_asso_dkmx
WHERE id = #{id}
</delete>
<select id="load" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkmx
WHERE id = #{id}
</select>
<select id="pageList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
FROM kqgl_asso_dkmx
LIMIT #{offset}, #{pageSize}
</select>
<select id="pageListCount" resultType="java.lang.Integer">
SELECT count(1)
FROM kqgl_asso_dkmx
</select>
-->
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapping/kqmk/KqglAssoMonthPunchSummaryMapper.xml
...@@ -165,6 +165,13 @@ ...@@ -165,6 +165,13 @@
<result column="bcxbdk2" property="bcxbdk2" /> <result column="bcxbdk2" property="bcxbdk2" />
<result column="bcsbdk3" property="bcsbdk3" /> <result column="bcsbdk3" property="bcsbdk3" />
<result column="bcxbdk3" property="bcxbdk3" /> <result column="bcxbdk3" property="bcxbdk3" />
<result column="dktj1" property="dktj1" />
<result column="dktj2" property="dktj2" />
<result column="dktj3" property="dktj3" />
<result column="dktj4" property="dktj4" />
<result column="dktj5" property="dktj5" />
<result column="dktj6" property="dktj6" />
<result column="attname" property="attname" /> <result column="attname" property="attname" />
<result column="attpbfs" property="attpbfs" /> <result column="attpbfs" property="attpbfs" />
...@@ -463,6 +470,14 @@ ...@@ -463,6 +470,14 @@
IFNULL(rtj.sbdk3jg ,'') sbdk3jg, IFNULL(rtj.sbdk3jg ,'') sbdk3jg,
IFNULL(rtj.xbdk3,'') xbdk3, IFNULL(rtj.xbdk3,'') xbdk3,
IFNULL(rtj.xbdk3jg ,'') xbdk3jg, IFNULL(rtj.xbdk3jg ,'') xbdk3jg,
IFNULL(rtj.dktj1,'') dktj1,
IFNULL(rtj.dktj2,'') dktj2,
IFNULL(rtj.dktj3,'') dktj3,
IFNULL(rtj.dktj4,'') dktj4,
IFNULL(rtj.dktj5,'') dktj5,
IFNULL(rtj.dktj6,'') dktj6,
IFNULL(rtj.gzsc ,'') gzsc, IFNULL(rtj.gzsc ,'') gzsc,
IFNULL(rtj.qyid,'') qyid, IFNULL(rtj.qyid,'') qyid,
IFNULL(rtj.dksj ,'') dksj, IFNULL(rtj.dksj ,'') dksj,
...@@ -489,7 +504,7 @@ ...@@ -489,7 +504,7 @@
bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3, bcsz.`name` as bcname,bcsz.sbdk1 as bcsbdk1,bcsz.xbdk1 as bcxbdk1,bcsz.sbdk2 as bcsbdk2,bcsz.xbdk2 as bcxbdk2,bcsz.sbdk3 as bcsbdk3,bcsz.xbdk3 as bcxbdk3,
dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` , dkmx.`userid`,dkmx.`data` ,dkmx.`sbdk1`,dkmx.`sbdk1jg`,dkmx.`xbdk1` ,dkmx.`xbdk1jg`,dkmx.`sbdk2` ,dkmx.`sbdk2jg` ,dkmx.`xbdk2` ,
dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` , dkmx.`xbdk2jg`,dkmx.`sbdk3` ,dkmx.`sbdk3jg` ,dkmx.`xbdk3`,dkmx.`xbdk3jg` ,dkmx.`ydkcs` ,dkmx.`gzsc` ,dkmx.`qyid`,dkmx.`dksj` ,
dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs` dkmx.`yzcdcs` ,dkmx.`yzcdsc` ,dkmx.`kgcdfzs`,dkmx.dktj1,dkmx.dktj2,dkmx.dktj3,dkmx.dktj4,dkmx.dktj5,dkmx.dktj6
from kqgl_asso_dkmx dkmx from kqgl_asso_dkmx dkmx
LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode} LEFT JOIN yggl_main_emp as info on info.emp_num = dkmx.userid and info.org_code = #{param.orgCode}
LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id LEFT JOIN kqgl_asso_dkjl as dkjl on dkjl.dkmxid = dkmx.id
......
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