whycxzp
2022-07-29 51a54c31b1fb937d23e1b1ddd0777076da009fe5
更新工作流
2个文件已修改
8 ■■■■■ 已修改文件
src/main/java/com/whyc/service/WorksheetMainService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WorksheetLinkMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WorksheetMainService.java
@@ -262,7 +262,7 @@
    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);
        query.eq("create_user_id",user.getId()).in("status",1,2).orderByDesc("id");
        List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
        //查询主表状态对应的子表
        worksheetMainList.forEach(main -> {
@@ -275,7 +275,7 @@
    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);
        query.eq("create_user_id",user.getId()).in("status",0).orderByDesc("id");
        List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
@@ -288,7 +288,7 @@
        //自己的工单
        if(!user.getRoleId().equals("1003")){
            QueryWrapper<WorksheetMain> query = Wrappers.query();
            query.eq("create_user_id",user.getId()).in("status",5);
            query.eq("create_user_id",user.getId()).in("status",5).orderByDesc("id");
            worksheetMainList = mainMapper.selectList(query);
        }else{
src/main/resources/mapper/WorksheetLinkMapper.xml
@@ -60,6 +60,7 @@
                AND link_status in(1,2)
            </otherwise>
        </choose>
        order by m.id desc
    </select>
    <select id="getInfoList3" resultMap="com.whyc.mapper.WorksheetMainMapper.Map_WorksheetMain">
        SELECT
@@ -78,6 +79,7 @@
                AND link_status in(1,2)
            </otherwise>
        </choose>
        order by m.id desc
    </select>
    <select id="getApprovingUser" resultType="com.whyc.pojo.DocUser">
        SELECT u.* FROM db_doc.tb_worksheet_link l,db_doc.tb_doc_user u,db_doc.tb_doc_depart d where l.deal_user_id = u.id and u.depart_id = d.depart_id and  l.main_id = #{mainId} and link_status = 0