Commit f8a7efb0 by 翁国栋

修改审核内容

parent 6bffda18
......@@ -5,6 +5,8 @@ import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
import cn.hutool.db.sql.SqlBuilder;
import cn.timer.api.bean.crm.CrmBusinessGroupMember;
import cn.timer.api.bean.crm.CrmClientContacts;
import cn.timer.api.bean.sche.ScheduleTask;
import cn.timer.api.bean.spmk.*;
......@@ -1507,10 +1509,10 @@ public class SpmkController {
SpmkApproveExecuteRecord spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(currentUser.getId()), spmkApproveDetailSummary.getApproveSummaryId());
//删除操作人记录
if (spmkApproveExecuteRecord != null) {
SpmkExecutor spmkExecutor =SpmkExecutor.builder().build().selectOne(new LambdaQueryWrapper<SpmkExecutor>()
.eq(SpmkExecutor::getApproveExecuteRecordId,spmkApproveExecuteRecord.getId()).eq(SpmkExecutor::getEmpNum,currentUser.getId()));
SpmkExecutor spmkExecutor = SpmkExecutor.builder().build().selectOne(new LambdaQueryWrapper<SpmkExecutor>()
.eq(SpmkExecutor::getApproveExecuteRecordId, spmkApproveExecuteRecord.getId()).eq(SpmkExecutor::getEmpNum, currentUser.getId()));
if (onlyOne) {
if(spmkExecutor.getSts()!=4) {
if (spmkExecutor.getSts() != 4) {
spmkApproveExecuteRecordMapper.delExecuteRecordByRecordIds(spmkApproveExecuteRecord.getId(), Integer.parseInt(currentUser.getId()));
}
} else {
......@@ -1602,7 +1604,7 @@ public class SpmkController {
listFlowChildren.get(spmkApproveDetailDto.getIndex()).getRelation().get(0).getUsers().removeIf(u -> u == currentUser);
}
//如果是最终执行人
if (isFinal&&isNext&&isExecute) {
if (isFinal && isNext && isExecute) {
SpmkApproveSummary.builder().id(spmkApproveDetailSummary.getApproveSummaryId()).currentApprover(CommonEnum.NULL_STR.getDesc()).endTime(new Date()).sts(ApproveSummarySts.FINISH.ordinal()).build().updateById();
}
SpmkApproveDetailSummary.builder().id(spmkApproveDetailDto.getId())
......@@ -1799,5 +1801,15 @@ public class SpmkController {
return ResultUtil.data("删除附件成功");
}
@PostMapping(value = "/update_spmk_content")
@ApiOperation(value = "更新审批文本内容", httpMethod = "POST", notes = "更新审批文本内容")
@Log(title = "更新审批文本内容", businessType = BusinessType.OTHER)
public Result<Object> update_spmk_content(@CurrentUser UserBean userBean, @RequestBody SpmkApproveDetailDto sq) {
SpmkApproveSummary.builder().id(sq.getId()).digest(sq.getDigest()).build().updateById();
SpmkApproveDetailSummary spmks = SpmkApproveDetailSummary.builder().build().selectOne(new LambdaQueryWrapper<SpmkApproveDetailSummary>().eq(SpmkApproveDetailSummary::getApproveSummaryId, sq.getId()));
spmks.setRequestData(sq.getRequestData().toString());
spmks.updateById();
return ResultUtil.data("更新成功");
}
}
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