src/main/java/com/whyc/controller/WorksheetMainController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/mapper/WorksheetLinkMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetLinkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetMainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/WorksheetLinkMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -1,5 +1,6 @@ package com.whyc.controller; import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.pojo.DocUser; import com.whyc.pojo.WorksheetMain; @@ -34,13 +35,55 @@ } @GetMapping("list") @ApiOperation("获取工作流-各角色用户对应的工作台数据分类") public Response getList(){ @ApiOperation("获取工作流-各角色用户对应的工作台数据分类统计") public Response getPhaseStatistic(){ DocUser user = ActionUtil.getUser(); Map<String,List<WorksheetMain>> map = service.getList(user); return new Response().set(1,map); } /* ======待处理/已处理/属于自己-审批中/已驳回/已审批====== //属于自己-审批中/已驳回/已审批 //待处理/已处理 */ @GetMapping("approvingListPage") @ApiOperation("查看分页-审批中") public Response<PageInfo<WorksheetMain>> getApprovingListPage(@RequestParam int pageNum,@RequestParam int pageSize){ DocUser user = ActionUtil.getUser(); return service.getApprovingListPage(user,pageNum,pageSize); } @GetMapping("rejectedListPage") @ApiOperation("查看分页-已驳回") public Response<PageInfo<WorksheetMain>> getRejectedListPage(@RequestParam int pageNum,@RequestParam int pageSize){ DocUser user = ActionUtil.getUser(); return service.getRejectedListPage(user,pageNum,pageSize); } @GetMapping("approvedListPage") @ApiOperation("查看分页-已审批") public Response<PageInfo<WorksheetMain>> getApprovedListPage(@RequestParam int pageNum, @RequestParam int pageSize){ DocUser user = ActionUtil.getUser(); return service.getApprovedListPage(user,pageNum,pageSize); } @GetMapping("handlingListPage") @ApiOperation("查看分页-待处理") public Response<PageInfo<WorksheetMain>> getHandlingListPage(@RequestParam int pageNum, @RequestParam int pageSize){ DocUser user = ActionUtil.getUser(); return service.getHandlingListPage(user,pageNum,pageSize); } @GetMapping("handledListPage") @ApiOperation("查看分页-已处理") public Response<PageInfo<WorksheetMain>> getHandledListPage(@RequestParam int pageNum, @RequestParam int pageSize){ DocUser user = ActionUtil.getUser(); return service.getHandledListPage(user,pageNum,pageSize); } @GetMapping("linkInfo") @ApiOperation("获取工作流-单个审核流程完整信息流") public Response getLinkList(@RequestParam int id){ src/main/java/com/whyc/mapper/WorksheetLinkMapper.java
@@ -1,10 +1,13 @@ package com.whyc.mapper; import com.whyc.pojo.WorksheetLink; import com.whyc.pojo.WorksheetMain; import java.util.List; public interface WorksheetLinkMapper extends CustomMapper<WorksheetLink> { List<WorksheetLink> getInfoList(Long id); List<WorksheetMain> getInfoList2(Long userId, int statusExp); } src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -6,6 +6,7 @@ import com.whyc.mapper.WorksheetLinkMapper; import com.whyc.pojo.ProductBomApproving; import com.whyc.pojo.WorksheetLink; import com.whyc.pojo.WorksheetMain; import com.whyc.util.CommonUtil; import org.aspectj.util.FileUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -110,4 +111,14 @@ public List<WorksheetLink> getInfoList(Long id) { return linkMapper.getInfoList(id); } /** * * @param userId 总经理对应的userId * @param statusExp 0:未审批,1:已审批(包含状态值1,2) * @return */ public List<WorksheetMain> getInfoList2(Long userId, int statusExp) { return linkMapper.getInfoList2(userId,statusExp); } } src/main/java/com/whyc/service/WorksheetMainService.java
@@ -2,6 +2,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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; import com.whyc.mapper.WorksheetMainMapper; @@ -211,4 +215,52 @@ public WorksheetMain getLinkList(int id) { return mainMapper.getLinkList(id); } public Response<PageInfo<WorksheetMain>> getApprovingListPage(DocUser user, int pageNum, int pageSize) { PageHelper.startPage(pageNum,pageSize); QueryWrapper<WorksheetMain> query = Wrappers.query(); query.eq("create_user_id",user.getId()).in("status",1,2); List<WorksheetMain> worksheetMainList = mainMapper.selectList(query); PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList); return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo); } public Response<PageInfo<WorksheetMain>> getRejectedListPage(DocUser user, int pageNum, int pageSize) { PageHelper.startPage(pageNum,pageSize); QueryWrapper<WorksheetMain> query = Wrappers.query(); query.eq("create_user_id",user.getId()).in("status",0); List<WorksheetMain> worksheetMainList = mainMapper.selectList(query); PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList); return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo); } public Response<PageInfo<WorksheetMain>> getApprovedListPage(DocUser user, int pageNum, int pageSize) { Response<PageInfo<WorksheetMain>> response = new Response<>(); PageHelper.startPage(pageNum,pageSize); List<WorksheetMain> worksheetMainList = null; if(!user.getRoleId().equals("1003")){ QueryWrapper<WorksheetMain> query = Wrappers.query(); query.eq("create_user_id",user.getId()).in("status",5); worksheetMainList = mainMapper.selectList(query); }else{ worksheetMainList = linkService.getInfoList2(user.getId(),1); } PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList); return response.set(1,pageInfo); } public Response<PageInfo<WorksheetMain>> getHandlingListPage(DocUser user, int pageNum, int pageSize) { PageHelper.startPage(pageNum,pageSize); List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),0); PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList); return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo); } public Response<PageInfo<WorksheetMain>> getHandledListPage(DocUser user, int pageNum, int pageSize) { PageHelper.startPage(pageNum,pageSize); List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),1); PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList); return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo); } } src/main/resources/mapper/WorksheetLinkMapper.xml
@@ -43,4 +43,22 @@ <select id="getUser" resultType="com.whyc.pojo.DocUser"> select name from db_doc.tb_doc_user where id =#{create_user_id} </select> <select id="getInfoList2" resultType="WorksheetMain"> SELECT m.* FROM db_doc.tb_worksheet_main m, db_doc.tb_worksheet_link l WHERE l.main_id = m.id AND l.deal_user_id = #{userId} <choose> <when test="statusExp==0"> AND link_status = 0 </when> <otherwise> AND link_status in(1,2) </otherwise> </choose> </select> </mapper>