Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-server-bpm

src/main/java/com/dk/bpm/controller/WaitingForApprovalController.java

@@ -0,0 +1,82 @@
+package com.dk.bpm.controller;
+
+import com.dk.bpm.service.WaitingForApprovalService;
+import com.dk.common.response.ResponseResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @desc   : 待审中心模块
+ * @author : 周兴
+ * @date   : 2023/9/15 11:29
+ */
+@Api(tags = "待审中心")
+@RestController
+@RequestMapping("/bpm/waiting_for_approval")
+public class WaitingForApprovalController {
+
+    @Autowired
+    private WaitingForApprovalService waitingForApprovalService;
+
+    /**
+     * @desc   : 查询待审审批列表
+     * @author : 周兴
+     * @date   : 2023/9/15 11:30
+     */
+    @ApiOperation(value = "查询待审审批列表", notes = "查询待审审批列表")
+    @PostMapping("list")
+    ResponseResultVO<Object> list(@RequestBody Map<String,Object> param){
+        return waitingForApprovalService.list(param);
+    }
+
+    /**
+     * @desc   : 查询待审审批明细列表
+     * @author : 周兴
+     * @date   : 2023/9/15 11:30
+     */
+    @ApiOperation(value = "查询待审审批明细列表", notes = "查询待审审批明细列表")
+    @PostMapping("list_detail")
+    ResponseResultVO<Object> listDetail(@RequestBody Map<String,Object> param){
+        return waitingForApprovalService.listDetail(param);
+    }
+
+    /**
+     * @desc   : 查询审批进度
+     * @author : 周兴
+     * @date   : 2023/9/15 11:30
+     */
+    @ApiOperation(value = "查询审批进度", notes = "查询审批进度")
+    @PostMapping("list_process/{id}")
+    ResponseResultVO<Object> listProcess(@PathVariable Integer id){
+        return waitingForApprovalService.listProcess(id);
+    }
+
+    /**
+     * @desc   : 查询已审
+     * @author : 周兴
+     * @date   : 2023/9/15 11:30
+     */
+    @ApiOperation(value = "查询已审", notes = "查询已审")
+    @PostMapping("list_approvaled")
+    ResponseResultVO<Object> listApprovaled(@RequestBody Map<String,Object> param){
+        return waitingForApprovalService.listApprovaled(param);
+    }
+
+    /**
+     * @desc   : 查询已审条数
+     * @author : 周兴
+     * @date   : 2023/9/15 11:30
+     */
+    @ApiOperation(value = "查询已审条数", notes = "查询已审条数")
+    @PostMapping("list_count")
+    ResponseResultVO<Object> listCount(@RequestBody Map<String,Object> param){
+        return waitingForApprovalService.listCount(param);
+    }
+
+
+}

src/main/java/com/dk/bpm/mapper/WaitingForApprovalMapper.java

@@ -0,0 +1,25 @@
+package com.dk.bpm.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.postgresql.util.PGobject;
+
+import java.util.Map;
+
+/**
+ * @desc   : 待审中心
+ * @author : 周兴
+ * @date   : 2023/9/15 11:27
+ */
+@Mapper
+public interface WaitingForApprovalMapper {
+
+   Map<String, PGobject> list(@Param("param") Map<String,Object> param);
+
+   Map<String, PGobject> listDetail(@Param("param") Map<String,Object> param);
+
+   Map<String,PGobject> listProcess(@Param("id")Integer id);
+
+   Map<String, PGobject> listApprovaled(@Param("param") Map<String,Object> param);
+
+}

src/main/java/com/dk/bpm/mapper/WaitingForApprovalMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dk.bpm.mapper.WaitingForApprovalMapper">
+    <select id="list" resultType="Map">
+        select f_get_wait_approval as data from sale.f_get_wait_approval(#{param.cpId},#{param.userId},#{param.querys,typeHandler=JsonTypeHandler})
+    </select>
+
+    <select id="listDetail" resultType="Map">
+        select f_get_wait_item_approval as data from sale.f_get_wait_item_approval(#{param.invoiceId},#{param.docCode},#{param.pageCurrent},#{param.pageSize})
+    </select>
+
+    <select id="listProcess" resultType="Map">
+        select f_get_wait_process as data from sale.f_get_wait_process(#{id})
+    </select>
+
+    <select id="listApprovaled" resultType="Map">
+        select f_get_approvaled as data from sale.f_get_approvaled(#{param.cpId},#{param.userId},#{param.pageCurrent},#{param.pageSize},#{param.querys,typeHandler=JsonTypeHandler})
+    </select>
+
+</mapper>

src/main/java/com/dk/bpm/service/WaitingForApprovalService.java

@@ -0,0 +1,75 @@
+package com.dk.bpm.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.dk.bpm.mapper.WaitingForApprovalMapper;
+import com.dk.common.response.ResponseResultUtil;
+import com.dk.common.response.ResponseResultVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @desc   : 待审中心服务
+ * @author : 周兴
+ * @date   : 2023/9/15 11:29
+ */
+@Service
+public class WaitingForApprovalService {
+
+    @Autowired
+    private WaitingForApprovalMapper waitingForApprovalMapper;
+
+    /**
+     * @desc   : 获取待审数据
+     * @author : 周兴
+     * @date   : 2023/9/15 11:29
+     */
+    public ResponseResultVO<Object> list(Map<String, Object> param) {
+        Map<String,Object> dataMap = JSONObject.parseObject(waitingForApprovalMapper.list(param).get("data").getValue());
+        return ResponseResultUtil.success(dataMap.get("data")==null?new ArrayList<>():dataMap.get("data"));
+    }
+
+    /**
+     * @desc   : 获取待审数据明细
+     * @author : 周兴
+     * @date   : 2023/9/15 11:29
+     */
+    public ResponseResultVO<Object> listDetail(Map<String, Object> param) {
+        Map<String,Object> dataMap = JSONObject.parseObject(waitingForApprovalMapper.listDetail(param).get("data").getValue());
+        return ResponseResultUtil.success(dataMap);
+    }
+
+    /**
+     * @desc   : 获取审批进度
+     * @author : 周兴
+     * @date   : 2023/9/15 11:29
+     */
+    public ResponseResultVO<Object> listProcess(Integer id) {
+        Map<String,Object> dataMap = JSONObject.parseObject(waitingForApprovalMapper.listProcess(id).get("data").getValue());
+        return ResponseResultUtil.success(dataMap.get("data")==null?new ArrayList<>():dataMap.get("data"));
+    }
+
+    /**
+     * @desc   : 获取已审数据
+     * @author : 周兴
+     * @date   : 2023/9/15 11:29
+     */
+    public ResponseResultVO<Object> listApprovaled(Map<String, Object> param) {
+        Map<String,Object> dataMap = JSONObject.parseObject(waitingForApprovalMapper.listApprovaled(param).get("data").getValue());
+        return ResponseResultUtil.success(dataMap);
+    }
+
+    /**
+     * @desc   : 获取待审条数
+     * @author : 周兴
+     * @date   : 2023/9/15 11:29
+     */
+    public ResponseResultVO<Object> listCount(Map<String, Object> param) {
+        Map<String,Object> dataMap = JSONObject.parseObject(waitingForApprovalMapper.list(param).get("data").getValue());
+        Integer count  = Integer.parseInt(dataMap.get("count").toString());
+        return ResponseResultUtil.success(count);
+    }
+}