费用减免流程修改

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;

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执行异常");

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<SysWorkflowNode> list = sysWorkflowNodeService.listByTaskId(sysWorkflowNode);

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());

bonus-modules/bonus-material/src/main/resources/mapper/material/record/DerateRecordQueryMapper.xml

@@ -120,7 +120,7 @@
 
     <select id="getAuditList" resultType="com.bonus.material.settlement.domain.SltAgreementReduce">
         SELECT
-        sra.id as id,
+        sra.id as id,sra.id as taskId,
         sra.create_time as createTime,
         su.user_name as createBy,
         bu.unit_name as unitName,

bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowNodeMapper.xml

@@ -78,8 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_workflow_record swr on swr.workflow_id = swn.type_id
         left join sys_workflow_record_history swrh on swr.id = swrh.record_id
         where swr.task_id=#{taskId}
-        <if test="nodeName != null "> and type_name like concat('%', #{typeName}, '%')</if>
+        <if test="nodeName != null and nodeName != '' "> and type_name like concat('%', #{typeName}, '%')</if>
-        <if test="nodeSignType != null "> and node_sign_type = #{nodeSignType}</if>
+        <if test="nodeSignType != null and nodeSignType != ''"> and node_sign_type = #{nodeSignType}</if>
         GROUP BY swn.id
 
     </select>

bonus-modules/bonus-material/src/main/resources/mapper/material/work/SysWorkflowRecordhistoryMapper.xml

@@ -26,10 +26,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
-    <select id="seleteSysWorkflowRecordHistory"
+    <select id="seleteSysWorkflowRecordHistory" resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory">
-            resultType="com.bonus.material.work.domain.SysWorkflowRecordHistory">
         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
     </select>
 </mapper>