diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java index e03a4ac6..6aaf7882 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/domain/SltAgreementReduce.java @@ -113,6 +113,7 @@ public class SltAgreementReduce extends BaseEntity { @ApiModelProperty(value = "减免租赁费用") private BigDecimal reduceLeaseMoney; + private Integer taskId; @ApiModelProperty(value = "减免天数") private Long reduceDays; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java index b9967cef..6d58873a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementReduceServiceImpl.java @@ -212,6 +212,7 @@ public class SltAgreementReduceServiceImpl implements ISltAgreementReduceService SltAgreementReduce sltAgreement = new SltAgreementReduce(); sltAgreement.setId(Long.valueOf(workflowAuditDto.getTaskId())); sltAgreement.setStatus("1"); + sltAgreementRecudceMapper.updateReduce(sltAgreement); return AjaxResult.success("执行完成"); } catch (Exception e) { return AjaxResult.error("修改任务状态失败,SQL执行异常"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java index aeb8a14c..b0ad5138 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/controller/SysWorkflowNodeController.java @@ -88,8 +88,10 @@ public class SysWorkflowNodeController extends BaseController { */ @ApiOperation(value = "根据任务id查询工作流详情列表") @GetMapping("/listByTaskId") - public TableDataInfo listByTaskId(SysWorkflowNode sysWorkflowNode) - { + public TableDataInfo listByTaskId(SysWorkflowNode sysWorkflowNode) { + if (sysWorkflowNode == null || sysWorkflowNode.getTaskId() == null) { + throw new RuntimeException("查询参数不能为空"); + } try { startPage(); List list = sysWorkflowNodeService.listByTaskId(sysWorkflowNode); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java index 8caa46dc..fff60178 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Optional; @Service public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { @@ -108,6 +109,7 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService { SysWorkflowRecordHistory sysWorkflowRecordHistory = new SysWorkflowRecordHistory(); sysWorkflowRecordHistory.setRecordId(SysWorkflowNode.getRecordId()); sysWorkflowRecordHistory.setNodeId(SysWorkflowNode.getNodeId()); + System.out.println(sysWorkflowRecordHistory); SysWorkflowRecordHistory sysWorkflowRecordHistoryNew = sysWorkflowRecordHistoryMapper.seleteSysWorkflowRecordHistory(sysWorkflowRecordHistory); if (StringUtils.isNotNull(sysWorkflowRecordHistoryNew)){ SysWorkflowNode.setIsAccept(sysWorkflowRecordHistoryNew.getIsAccept()); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml index 492e12c6..1e983ab4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml @@ -120,7 +120,7 @@ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml index 268e3a8b..158afeff 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml @@ -26,10 +26,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, - select swrh.is_accept as isAccept,swrh.create_time as createTime,swrh.remark as remark from sys_workflow_record_history swrh where swrh.record_id=#{recordId} and swrh.node_id= #{nodeId} + limit 1