工单节点查询修改

lxw

2023-08-14 0b0f75e63cc11f81c8429db4d7f7a55a211832b7

工单节点查询修改

 src/main/java/com/whyc/controller/WorkflowLinkController.java

@@ -50,4 +50,10 @@
    public Response searchLastHrById(@RequestParam int mid) {
        return service.searchLastHrById(mid);
    }

    @GetMapping("getFlowMain")
    @ApiOperation(value = "查询自己申请的工单(去除放电计划)")
    public Response getFlowMainByUid(@RequestParam int type, @RequestParam int status, @RequestParam int pageNum, @RequestParam int pageSize) {
        return service.getFlowMainByUid(type, status, pageNum, pageSize);
    }
}

 src/main/java/com/whyc/controller/WorkflowMainController.java

@@ -10,7 +10,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Map;

@@ -33,6 +36,7 @@

    //本人的单据: 已审批,审批中,已撤销,已驳回
    //接收到的单据: 待审核,(待接单审核?),已审核

    /**
     * 本人的单据:
     *  已审批,审批中,已撤销,已驳回
@@ -68,13 +72,13 @@

    /**
     * 接收到的单据:
     *  放电计划临时表中存在: 待审核,待接单审核,已审核
     * */
     * 放电计划临时表中存在: 待审核,待接单审核,已审核
     */
    @GetMapping("receivedListPage")
    @ApiOperation(value = "接收到的单据列表分页",notes = "status传参:0-全部,1-待接单,6-待审核,5|8-已审核(通过|驳回)")
    public Response<PageInfo<WorkflowMain>> getReceivedListPage(int type,int status,int pageNum,int pageSize){
    @ApiOperation(value = "接收到的单据列表分页", notes = "status传参:0-全部,1-待接单,6-待审核,5|8-已审核(通过|驳回)")
    public Response<PageInfo<WorkflowMain>> getReceivedListPage(int type, int status, int pageNum, int pageSize) {
        UserInf user = ActionUtil.getUser();
        return service.getReceivedListPage(type,status,user,pageNum,pageSize);
        return service.getReceivedListPage(type, status, user, pageNum, pageSize);
    }

}

 src/main/java/com/whyc/mapper/WorkflowLinkMapper.java

@@ -2,6 +2,7 @@

import com.whyc.pojo.UserInf;
import com.whyc.pojo.WorkflowLink;
import com.whyc.pojo.WorkflowMain;

import java.util.List;

@@ -11,4 +12,7 @@

    //查询自己需要处理或者审批的
    List<WorkflowLink> searchTmp(int uId, int uRole, int type);

    //查询自己申请的工单(去除放电计划)
    List<WorkflowMain> getFlowMainByUid(int userId, int type, int status);
}

 src/main/java/com/whyc/pojo/WorkflowMain.java

@@ -75,8 +75,9 @@
    private Integer auto;
    /**
     * 工单流类型
     *
     * @see com.whyc.constant.WorkflowEnum
     * */
     */
    private Integer type;

    @TableField(exist = false)
@@ -84,7 +85,10 @@
    @TableField(exist = false)
    private String createUserName;

    public WorkflowMain(Integer id, Integer status,String endReason,Date endTime) {
    @TableField(exist = false)
    private WorkflowLink workflowLink;

    public WorkflowMain(Integer id, Integer status, String endReason, Date endTime) {
        this.id = id;
        this.status = status;
        this.endReason = endReason;
@@ -278,4 +282,12 @@
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }

    public WorkflowLink getWorkflowLink() {
        return workflowLink;
    }

    public void setWorkflowLink(WorkflowLink workflowLink) {
        this.workflowLink = workflowLink;
    }
}

 src/main/java/com/whyc/service/WorkflowLinkService.java

@@ -246,4 +246,14 @@
        }
        return new Response().setII(1, true, map, "节点为二次放电时查询二次放电参数和本年上一次有效核容数据");
    }

    //查询自己申请的工单(去除放电计划)
    public Response getFlowMainByUid(int type, int status, int pageNum, int pageSize) {
        UserInf uinf = ActionUtil.getUser();
        //查询自己需要处理或者审批的
        PageHelper.startPage(pageNum, pageSize);
        List<WorkflowMain> list = mapper.getFlowMainByUid(uinf.getUId().intValue(), type, status);
        PageInfo pageInfo = new PageInfo(list);
        return new Response().setII(1, list == null ? false : true, list, "查询自己申请的工单(去除放电计划)");
    }
}

 src/main/java/com/whyc/service/WorkflowMainService.java

@@ -198,4 +198,5 @@
    public void addWorkMain(WorkflowMain main) {
        mapper.addWorkMain(main);
    }

}

 src/main/resources/mapper/BattInfMapper.xml

@@ -654,11 +654,4 @@
        where FBSDeviceId = #{devId}
        ORDER by GroupIndexInFBSDevice limit 1
    </select>
    <select id="getBattGroupIdByGroupNum" resultType="java.lang.Integer">
        select distinct battGroupId
        from db_battinf.tb_battinf
        where FBSDeviceId = #{devId}
          and GroupIndexInFBSDevice = #{battGroupNum} limit 1
    </select>

</mapper>

 src/main/resources/mapper/WorkflowLinkMapper.xml

@@ -191,4 +191,112 @@
        )
        ORDER BY lid
    </select>
    <resultMap id="Mainlink" type="WorkflowMain">
        <result column="mid" property="id"></result>
        <result column="order_id" property="orderId"></result>
        <result column="title" property="title"></result>
        <result column="task_desc" property="taskDesc"></result>
        <result column="create_user_id" property="createUserId"></result>
        <result column="mcreate_time" property="createTime"></result>
        <result column="plan_begin_time" property="planBeginTime"></result>
        <result column="plan_end_time" property="planEndTime"></result>
        <result column="begin_time" property="beginTime"></result>
        <result column="end_time" property="endTime"></result>
        <result column="task_level" property="taskLevel"></result>
        <result column="is_in_time" property="inTime"></result>
        <result column="mstatus" property="status"></result>
        <result column="file_name" property="fileName"></result>
        <result column="file_url" property="fileUrl"></result>
        <result column="pic_name" property="picName"></result>
        <result column="pic_url" property="picUrl"></result>
        <result column="end_reason" property="endReason"></result>
        <result column="is_auto" property="auto"></result>
        <result column="type" property="type"></result>
        <association property="workflowLink" javaType="WorkflowLink">
            <result column="lid" property="id"></result>
            <result column="lmain_id" property="mainId"></result>
            <result column="parent_id" property="parentId"></result>
            <result column="process_level" property="processLevel"></result>
            <result column="process_level_name" property="processLevelName"></result>
            <result column="lcreate_time" property="createTime"></result>
            <result column="deal_user_id" property="dealUserId"></result>
            <result column="deal_type" property="dealType"></result>
            <result column="deal_desc" property="dealDesc"></result>
            <result column="deal_file_name" property="dealFileName"></result>
            <result column="deal_file_url" property="dealFileUrl"></result>
            <result column="deal_pic_name" property="dealPicName"></result>
            <result column="deal_pic_url" property="dealPicUrl"></result>
            <result column="lstatus" property="status"></result>
            <result column="deal_role_id" property="dealRoleId"></result>
            <result column="deal_and_close" property="dealAndClose"></result>
            <result column="deal_reject_reason" property="dealRejectReason"></result>
            <result column="deal_task_num" property="dealTaskNum"></result>
            <result column="deal_task_reply_num" property="dealTaskReplyNum"></result>
            <result column="deal_reason" property="dealReason"></result>
            <result column="required_finish_time" property="requiredFinishTime"></result>
            <result column="deal_time" property="dealTime"></result>
            <result column="reply_content" property="replyContent"></result>
            <result column="reply_time" property="replyTime"></result>
        </association>
    </resultMap>
    <select id="getFlowMainByUid" resultMap="Mainlink">
        SELECT parent_id
        , process_level
        , process_level_name
        , deal_user_id
        , deal_type
        , deal_desc
        , deal_file_name
        , deal_file_url
        , deal_pic_name
        , deal_pic_url
        , deal_role_id
        , deal_and_close
        , deal_reject_reason
        , deal_task_num
        , deal_task_reply_num
        , deal_reason
        , required_finish_time
        , deal_time
        , reply_content
        , reply_time
        , l.main_id as lmain_id
        , l.id as lid
        , l.status as lstatus
        , l.create_time as lcreate_time
        , order_id
        , title
        , task_desc
        , create_user_id
        , plan_begin_time
        , plan_end_time
        , begin_time
        , end_time
        , task_level
        , is_in_time
        , file_name
        , file_url
        , pic_name
        , pic_url
        , end_reason
        , is_auto
        , m.type
        , m.id as mid
        , m.status as mstatus
        , m.create_time as mcreate_time
        FROM web_site.tb_workflow_main m
        LEFT OUTER JOIN web_site.tb_workflow_link l on m.id = l.main_id
        <where>
            m.create_user_id=#{userId}
            <if test="type!=0">
                and m.type = #{type}
            </if>
            <if test="type==0">
                and m.type != 1
            </if>
            <if test="status!=0">
                and m.status = #{status}
            </if>
        </where>
    </select>
</mapper>