From 09ccc004da24adab29461c1b1d94a2707f9ea000 Mon Sep 17 00:00:00 2001 From: zfh <15856818120@163.com> Date: Thu, 20 Feb 2025 22:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysWorkflowRecordHisController.java | 40 ++++++++++++++ .../material/work/domain/SysWorkflowNode.java | 2 +- .../work/domain/SysWorkflowRecordHistory.java | 7 ++- .../work/mapper/SysWorkflowRecordMapper.java | 2 + .../SysWorkflowRecordHistoryService.java | 10 ++++ .../SysWorkflowRecordHistoryServiceImpl.java | 52 +++++++++++++++++++ .../mapper/material/lease/LeaseTaskMapper.xml | 37 ++++++++++++- .../material/work/SysWorkflowRecordMapper.xml | 3 ++ 8 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowRecordHistoryService.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java new file mode 100644 index 00000000..9e2fc866 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowRecordHisController.java @@ -0,0 +1,40 @@ +package com.bonus.material.work.controller; + + +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.work.domain.SysWorkflowNode; +import com.bonus.material.work.domain.SysWorkflowRecordHistory; +import com.bonus.material.work.service.SysWorkflowRecordHistoryService; +import com.bonus.material.work.service.SysWorkflowRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Api(tags = "工作流详情表") +@RestController +@RequestMapping("/sysWorkflowRecordHistory") +public class SysWorkflowRecordHisController extends BaseController { + + + @Resource + private SysWorkflowRecordHistoryService sysWorkflowRecordHistoryService; + + /** + * 修改工作流详情 + */ + @ApiOperation(value = "修改工作流详情") + @PostMapping("/update") + public AjaxResult update(@RequestBody SysWorkflowRecordHistory sysWorkflowRecordHistory) + { + try { + sysWorkflowRecordHistoryService.updateSysWorkflowRecordHistory(sysWorkflowRecordHistory); + return new AjaxResult(200,"修改成功！"); + }catch (Exception e){ + return error(); + } + } + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java index 7c91c69e..b8af9372 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowNode.java @@ -80,5 +80,5 @@ public class SysWorkflowNode { /** * 审批结果，0拒绝 1通过 */ - private Integer isAccept; + private int isAccept; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java index b56496d1..e9ac4bd0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/domain/SysWorkflowRecordHistory.java @@ -32,7 +32,7 @@ public class SysWorkflowRecordHistory { private Integer nextNodeId; /** - * 审批结果，0拒绝 1通过 + * 审批结果， 1通过 2拒绝 */ private Integer isAccept; @@ -51,4 +51,9 @@ public class SysWorkflowRecordHistory { * 备注 意见 驳回原因 */ private String remark; + + /** + * 任务Id + */ + private Integer taskId; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java index d1528594..6ff7ae93 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/mapper/SysWorkflowRecordMapper.java @@ -7,4 +7,6 @@ public interface SysWorkflowRecordMapper { int addSysWorkflowRecord(SysWorkflowRecord sysWorkflowRecord); + + int updateSysWorkflowRecord(SysWorkflowRecord sysWorkflowRecord); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowRecordHistoryService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowRecordHistoryService.java new file mode 100644 index 00000000..1c09b390 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/SysWorkflowRecordHistoryService.java @@ -0,0 +1,10 @@ +package com.bonus.material.work.service; + + +import com.bonus.material.work.domain.SysWorkflowRecordHistory; + +public interface SysWorkflowRecordHistoryService { + + + int updateSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java new file mode 100644 index 00000000..9eb80cd0 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowRecordHistoryServiceImpl.java @@ -0,0 +1,52 @@ +package com.bonus.material.work.service.impl; + +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.work.domain.SysWorkflowNode; +import com.bonus.material.work.domain.SysWorkflowRecord; +import com.bonus.material.work.domain.SysWorkflowRecordHistory; +import com.bonus.material.work.domain.SysWorkflowType; +import com.bonus.material.work.mapper.SysWorkflowNodeMapper; +import com.bonus.material.work.mapper.SysWorkflowRecordHistoryMapper; +import com.bonus.material.work.mapper.SysWorkflowRecordMapper; +import com.bonus.material.work.mapper.SysWorkflowTypeMapper; +import com.bonus.material.work.service.SysWorkflowRecordHistoryService; +import com.bonus.material.work.service.SysWorkflowRecordService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SysWorkflowRecordHistoryServiceImpl implements SysWorkflowRecordHistoryService { + + @Resource + private SysWorkflowRecordMapper sysWorkflowRecordMapper; + + @Resource + private SysWorkflowTypeMapper sysWorkflowTypeMapper; + + @Resource + private SysWorkflowRecordHistoryMapper sysWorkflowRecordHistoryMapper; + + @Resource + private SysWorkflowNodeMapper sysWorkflowNodeMapper; + + + @Override + public int updateSysWorkflowRecordHistory(SysWorkflowRecordHistory sysWorkflowRecordHistory) { + sysWorkflowRecordHistoryMapper.addSysWorkflowRecordHistory(sysWorkflowRecordHistory); + //根据当前审批状态，修改流程状态 + if ("1".equals(sysWorkflowRecordHistory.getIsAccept())){ + + }else { + SysWorkflowRecord sysWorkflowRecord = new SysWorkflowRecord(); + sysWorkflowRecord.setTaskId(sysWorkflowRecordHistory.getTaskId()); + sysWorkflowRecord.setWorkflowStatus(3); + sysWorkflowRecordMapper.updateSysWorkflowRecord(sysWorkflowRecord); + } + return 0; + } +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml index 56d52592..69479745 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml @@ -109,8 +109,9 @@ lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark, lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id, lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, lai.lease_sign_url, - lai.lease_sign_type, + lai.lease_sign_type,tt.task_id as taskId, bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name,bai.agreement_id, bai.agreement_code, tt.task_status as taskStatus, + case tt.task_status when 0 then '待审核' when 1 then '待审核' @@ -392,7 +393,39 @@ and m.parent_id = #{typeId}