审核

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

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;
 }

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;
 }

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

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);
+}

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;
+    }
+}

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}
     </select>
     <select id="selectAuditLeaseApplyInfoList" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo">
-        <include refid="selectLeaseApplyInfoVo"/>
+        select
+        lai.id, lai.code, lai.task_id, lai.lease_person, lai.phone, lai.type, lai.company_audit_by,lai.apply_code,
+        lai.company_audit_time, lai.company_audit_remark, lai.dept_audit_by, lai.dept_audit_time,
+        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,tt.task_id as taskId,
+        bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name,bai.agreement_id, bai.agreement_code, swr.workflow_status as taskStatus,
+
+        case tt.task_status
+        when 0 then '待审核'
+        when 1 then '执行中'
+        when 2 then '执行完成'
+        when 3 then '执行中断'
+        end as taskStatusName,
+        IFNULL(sum(lad.pre_num),0) as preCountNum,
+        IFNULL(sum(lad.al_num),0) as alNum,
+        GROUP_CONCAT(DISTINCT mt1.type_name) AS maTypeNames,
+        bp.contract_part as contractPart,
+        sd.dept_name as impUnitName
+        from
+        lease_apply_info lai
+        left join tm_task tt on lai.task_id = tt.task_id
+        left join lease_apply_details lad on lai.id = lad.parent_id
+        left join tm_task_agreement tta on lai.task_id = tta.task_id
+        left join bm_agreement_info bai on tta.agreement_id = bai.agreement_id
+        left join bm_unit bu on bu.unit_id = bai.unit_id
+        left join bm_project bp on bp.pro_id = bai.project_id
+        left join sys_dept sd on sd.dept_id = bp.imp_unit
+        left join sys_dict_data sda on tt.task_status = sda.dict_value
+        and sda.dict_type = 'lease_task_status'
+        left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
+        left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
         left join sys_workflow_record swr on tt.task_id = swr.task_id
         left join sys_workflow_type swt on swr.workflow_id = swt.id
         left join sys_workflow_node swn on swt.id = swn.type_id

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

@@ -22,4 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workflowStatus != null">#{workflowStatus},</if>
         </trim>
     </insert>
+    <update id="updateSysWorkflowRecord">
+        update sys_workflow_record set workflow_status = #{workflowStatus} where task_id = #{taskId}
+    </update>
 </mapper>