whycxzp
2022-07-23 5847766e26dcc206edf001b3677d084b1bafd912
更新工作流
2个文件已修改
60 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/WorksheetMainController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WorksheetMainService.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -36,9 +36,9 @@
    @GetMapping("list")
    @ApiOperation("获取工作流-各角色用户对应的工作台数据分类统计")
    public Response getPhaseStatistic(){
    public Response<Map<String,Integer>> getPhaseStatistic(){
        DocUser user = ActionUtil.getUser();
        Map<String,List<WorksheetMain>> map = service.getList(user);
        Map<String,Integer> map = service.getList(user);
        return new Response().set(1,map);
    }
src/main/java/com/whyc/service/WorksheetMainService.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Page;
import com.whyc.dto.Response;
import com.whyc.mapper.DocUserMapper;
import com.whyc.mapper.WorksheetLinkMapper;
@@ -13,6 +12,7 @@
import com.whyc.pojo.ProductBomApproving;
import com.whyc.pojo.WorksheetLink;
import com.whyc.pojo.WorksheetMain;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -112,14 +112,17 @@
    /**
     * 用户对应的工作台数据分类
     * @param user
     * */
    public Map<String, List<WorksheetMain>> getList(DocUser user) {
        Map<String,List<WorksheetMain>> map = new HashMap<>();
     * @return*/
    public Map<String, Integer> getList(DocUser user) {
        Map<String,Integer> map = new HashMap<>();
        switch (user.getRoleId()){
            //普通员工
            case "1001":
                {
                    //未处理(审批中)/已驳回/已审批
                    map.put("rejected",0);
                    map.put("approving",0);
                    map.put("approved",0);
                    QueryWrapper<WorksheetMain> query = Wrappers.query();
                    query.eq("create_user_id",user.getId());
                    List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
@@ -127,20 +130,19 @@
                    groupingList.forEach((status,mainList)->{
                        switch (status){
                            case 0:{
                                map.put("rejected",mainList);
                                map.put("rejected",mainList.size());
                            }break;
                            case 1:
                            case 2:{
                                List<WorksheetMain> addedMainList = map.get("approving");
                                if(addedMainList ==null){
                                    map.put("approving",mainList);
                                Integer addedMainCount= map.get("approving");
                                if(addedMainCount ==0){
                                    map.put("approving",mainList.size());
                                }else{
                                    addedMainList.addAll(mainList);
                                    map.put("approving",addedMainList);
                                    map.put("approving",addedMainCount+mainList.size());
                                }
                            }break;
                            case 5:{
                                map.put("approved",mainList);
                                map.put("approved",mainList.size());
                            }break;
                        }
                    });
@@ -151,6 +153,12 @@
                {
                    //待处理/已处理/属于自己-审批中/已驳回/已审批
                    //属于自己-审批中/已驳回/已审批
                    map.put("rejected",0);
                    map.put("approving",0);
                    map.put("approved",0);
                    map.put("handling",0);
                    map.put("handled",0);
                    QueryWrapper<WorksheetMain> query = Wrappers.query();
                    query.eq("create_user_id",user.getId());
                    List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
@@ -158,13 +166,13 @@
                    groupingList.forEach((status,mainList)->{
                        switch (status){
                            case 0:{
                                map.put("rejected",mainList);
                                map.put("rejected",mainList.size());
                            }break;
                            case 2:{
                                map.put("approving",mainList);
                                map.put("approving",mainList.size());
                            }break;
                            case 5:{
                                map.put("approved",mainList);
                                map.put("approved",mainList.size());
                            }break;
                        }
                    });
@@ -176,11 +184,16 @@
                        linkList.forEach(link -> {mainList.add(link.getMain());});
                        switch (linkStatus){
                            case 0:{
                                map.put("handling",mainList);
                                map.put("handling",mainList.size());
                            }break;
                            case 1:
                            case 2:{
                                map.put("handled",mainList);
                                Integer addedMainCount= map.get("handled");
                                if(addedMainCount ==0){
                                    map.put("handled",mainList.size());
                                }else{
                                    map.put("handled",addedMainCount+mainList.size());
                                }
                            }break;
                        }
                    });
@@ -190,6 +203,8 @@
            case "1003":
                {
                    //待处理/已审批
                    map.put("handling",0);
                    map.put("approved",0);
                    List<WorksheetLink> WorksheetLinkList = linkService.getInfoList(user.getId());
                    Map<Integer, List<WorksheetLink>> groupingLinkList = WorksheetLinkList.stream().collect(Collectors.groupingBy(WorksheetLink::getLinkStatus));
                    groupingLinkList.forEach((linkStatus,linkList)->{
@@ -197,11 +212,16 @@
                        linkList.forEach(link -> {mainList.add(link.getMain());});
                        switch (linkStatus){
                            case 0:{
                                map.put("handling",mainList);
                                map.put("handling",mainList.size());
                            }break;
                            case 1:
                            case 2:{
                                map.put("handled",mainList);
                                Integer addedMainCount= map.get("approved");
                                if(addedMainCount ==0){
                                    map.put("approved",mainList.size());
                                }else{
                                    map.put("approved",addedMainCount+mainList.size());
                                }
                            }break;
                        }
                    });