Skip to content

8
8timerapiv200
Commit 09830dc0 by 翁国栋
Options

审批移除人员bug

parent b2e8519f
Showing with 43 additions and 35 deletions
src/main/java/cn/timer/api/controller/spmk/SpmkController.java
...@@ -835,7 +835,7 @@ public class SpmkController { ...@@ -835,7 +835,7 @@ public class SpmkController {
// 查询 SpmkApproveSummary 状态, // 查询 SpmkApproveSummary 状态,
SpmkApproveSummary aSummary = spmkApproveSummaryMapper.selectOne(new QueryWrapper<SpmkApproveSummary>().lambda() SpmkApproveSummary aSummary = spmkApproveSummaryMapper.selectOne(new QueryWrapper<SpmkApproveSummary>().lambda()
.select(SpmkApproveSummary::getSts,SpmkApproveSummary::getAssoType,SpmkApproveSummary::getEmpNum,SpmkApproveSummary::getOrgCode) .select(SpmkApproveSummary::getSts, SpmkApproveSummary::getAssoType, SpmkApproveSummary::getEmpNum, SpmkApproveSummary::getOrgCode)
.eq(SpmkApproveSummary::getId, asId)); .eq(SpmkApproveSummary::getId, asId));
if (aSummary.getSts() > ApproveSummarySts.IN.ordinal()) { if (aSummary.getSts() > ApproveSummarySts.IN.ordinal()) {
...@@ -872,8 +872,8 @@ public class SpmkController { ...@@ -872,8 +872,8 @@ public class SpmkController {
} }
//判断是否是请假审批 //判断是否是请假审批
if(aSummary.getAssoType()==ApproveEnum.LEAVE.getType()){ if (aSummary.getAssoType() == ApproveEnum.LEAVE.getType()) {
if(approvingDto.getSts()==2) { if (approvingDto.getSts() == 2) {
JSONObject jSONObject = jsonObject.parseObject(ad.getRequestData(), JSONObject.class); JSONObject jSONObject = jsonObject.parseObject(ad.getRequestData(), JSONObject.class);
// 请假类型 - 前端传中文 // 请假类型 - 前端传中文
String LeaveType = ObjectUtil.isNull(jSONObject.get("__LeaveType", FromData.class)) ? null : jSONObject.get("__LeaveType", FromData.class).getValue(); String LeaveType = ObjectUtil.isNull(jSONObject.get("__LeaveType", FromData.class)) ? null : jSONObject.get("__LeaveType", FromData.class).getValue();
...@@ -883,7 +883,7 @@ public class SpmkController { ...@@ -883,7 +883,7 @@ public class SpmkController {
KqglAssoLeaveEmployeeBalance emba = KqglAssoLeaveEmployeeBalance.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveEmployeeBalance>().lambda().eq(KqglAssoLeaveEmployeeBalance::getLeaveRulesId, Convert.toInt(LeaveType)) KqglAssoLeaveEmployeeBalance emba = KqglAssoLeaveEmployeeBalance.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveEmployeeBalance>().lambda().eq(KqglAssoLeaveEmployeeBalance::getLeaveRulesId, Convert.toInt(LeaveType))
.eq(KqglAssoLeaveEmployeeBalance::getUserid, aSummary.getEmpNum()).eq(KqglAssoLeaveEmployeeBalance::getOrgCode, aSummary.getOrgCode())); .eq(KqglAssoLeaveEmployeeBalance::getUserid, aSummary.getEmpNum()).eq(KqglAssoLeaveEmployeeBalance::getOrgCode, aSummary.getOrgCode()));
if (emba != null) { if (emba != null) {
if (emba.getBalanceDays()!=-1&&emba.getBalanceDays() < Convert.toInt(longTime)) { if (emba.getBalanceDays() != -1 && emba.getBalanceDays() < Convert.toInt(longTime)) {
return ResultUtil.error("当前发起人假期余额不足"); return ResultUtil.error("当前发起人假期余额不足");
} }
} }
...@@ -1527,8 +1527,13 @@ public class SpmkController { ...@@ -1527,8 +1527,13 @@ public class SpmkController {
} else if (listFlowChildren.get(spmkApproveDetailDto.getIndex() + 1).getClassName().equals("copy")) { } else if (listFlowChildren.get(spmkApproveDetailDto.getIndex() + 1).getClassName().equals("copy")) {
isFinal = true; isFinal = true;
} }
//执行中的人会存在操作记录 SpmkApproveExecuteRecord spmkApproveExecuteRecord;
SpmkApproveExecuteRecord spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(currentUser.getId()), spmkApproveDetailSummary.getApproveSummaryId()); //执行中的人会存在操作记录/spmk/delteApprove
if (spmkApproveDetailDto.getApproveExecuteRecordId()!=null) {
spmkApproveExecuteRecord = SpmkApproveExecuteRecord.builder().id(spmkApproveDetailDto.getApproveExecuteRecordId()).build().selectById();
} else {
spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(currentUser.getId()), spmkApproveDetailSummary.getApproveSummaryId());
}
//删除操作人记录 //删除操作人记录
if (spmkApproveExecuteRecord != null) { if (spmkApproveExecuteRecord != null) {
SpmkExecutor spmkExecutor = SpmkExecutor.builder().build().selectOne(new LambdaQueryWrapper<SpmkExecutor>() SpmkExecutor spmkExecutor = SpmkExecutor.builder().build().selectOne(new LambdaQueryWrapper<SpmkExecutor>()
......
src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java
...@@ -17,52 +17,55 @@ import lombok.NoArgsConstructor; ...@@ -17,52 +17,55 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class SpmkApproveDetailDto { public class SpmkApproveDetailDto {
@ApiModelProperty(value = "编号 编号", example = "101") @ApiModelProperty(value = "编号 编号", example = "101")
private Integer id; private Integer id;
@ApiModelProperty(value = "审批汇总id 审批汇总id", example = "101") @ApiModelProperty(value = "审批汇总id 审批汇总id", example = "101")
private Integer approveSummaryId; private Integer approveSummaryId;
@ApiModelProperty(value = "标题 ", example = "标题") @ApiModelProperty(value = "标题 ", example = "标题")
private String name; private String name;
@ApiModelProperty(value = "副标题 ", example = "副标题") @ApiModelProperty(value = "副标题 ", example = "副标题")
private String digest; private String digest;
@ApiModelProperty(value = "所在部门名称 ", example = "所在部门名称") @ApiModelProperty(value = "所在部门名称 ", example = "所在部门名称")
private String departmentName; private String departmentName;
@ApiModelProperty(value = "申请数据 ", example = "申请数据") @ApiModelProperty(value = "申请数据 ", example = "申请数据")
private JSONObject requestData; private JSONObject requestData;
@ApiModelProperty(value = "审批表单 ", example = "审批表单") @ApiModelProperty(value = "审批表单 ", example = "审批表单")
private List<JSONObject> froms; private List<JSONObject> froms;
@ApiModelProperty(value = "审批流程 ", example = "审批流程") @ApiModelProperty(value = "审批流程 ", example = "审批流程")
private Router router; private Router router;
@ApiModelProperty(value = "通过节点", example = "通过节点") @ApiModelProperty(value = "通过节点", example = "通过节点")
private List<FlowChildren> flowChildren; private List<FlowChildren> flowChildren;
@ApiModelProperty(value = "审批执行记录 ", example = "审批执行记录") @ApiModelProperty(value = "审批执行记录 ", example = "审批执行记录")
private List<SpmkApproveExecuteRecord> approveExecuteRecord; private List<SpmkApproveExecuteRecord> approveExecuteRecord;
private Integer empNum; private Integer empNum;
private Integer sts; private Integer sts;
private Integer executeEmpNum;//当前审批中 当前执行人的id private Integer executeEmpNum;//当前审批中 当前执行人的id
private Integer executeSts; private Integer executeSts;
private Integer exeid; private Integer exeid;
private Integer exereid; private Integer exereid;
private Date launchTime; //审批发起时间 private Date launchTime; //审批发起时间
private Integer index;//插入审批人的索引 private Integer index;//插入审批人的索引
private Integer userIndex;//插入审批人的当前用户索引 private Integer userIndex;//插入审批人的当前用户索引
private Integer approveExecuteId;
private Integer approveExecuteRecordId;
} }
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