更新

whycxzp

2023-05-18 21df40d59835394f350269898de1030a436a8052

更新

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

@@ -7,8 +7,6 @@

public interface WorkflowMainMapper extends CustomMapper<WorkflowMain>{

    WorkflowMain getBaseInfo(Integer mainId);

    List<WorkflowMain> getReceivedListByUserAndType(UserInf user, int type, int status);

}

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

@@ -81,6 +81,8 @@

    @TableField(exist = false)
    private List<BattDischargePlanTemp> tempList;
    @TableField(exist = false)
    private String createUserName;

    public WorkflowMain(Integer id, Integer status,String endReason,Date endTime) {
        this.id = id;
@@ -268,4 +270,12 @@
    public void setTempList(List<BattDischargePlanTemp> tempList) {
        this.tempList = tempList;
    }

    public String getCreateUserName() {
        return createUserName;
    }

    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
}

 src/main/resources/mapper/WorkflowMainMapper.xml

@@ -77,53 +77,43 @@
        </collection>
    </resultMap>

    <select id="getBaseInfo" resultMap="Map_WorkflowMain">
        select
            main.*,
            alarm.*,
            <include refid="linkColumn" />
        from
            web_site.tb_workflow_main main,
            web_site.tb_workflow_alarm alarm,
            web_site.tb_workflow_link link
        where
            main.alarm_order_id = alarm.id
        and link.main_id = main.id
        and main.id = #{mainId}
    </select>
    <select id="getReceivedListByUserAndType" resultMap="Map_WorkflowMain">
        <choose>
            <!--全部-->
            <when test="status==0">
                (SELECT m.*,<include refid="linkColumn" />
                    FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l
                (SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
                    FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
                    where m.id = l.main_id
                    and m.create_user_id = u.uId
                    and m.type = #{type}
                    and l.deal_role_id = #{user.uRole}
                    and l.deal_user_id is null
                )
                union all
                (SELECT m.*,<include refid="linkColumn" />
                    FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l
                (SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
                    FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
                    where m.id = l.main_id
                    and m.create_user_id = u.uId
                    and m.type = #{type}
                    and l.deal_user_id = #{user.uId}
                )
            </when>
            <!--待接单-->
            <when test="status==1">
                SELECT m.*,<include refid="linkColumn" />
                FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l
                SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
                FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
                where m.id = l.main_id
                and m.create_user_id = u.uId
                and m.type = #{type}
                and l.deal_role_id = #{user.uRole}
                and l.deal_user_id is null
                and l.status = #{status}
            </when>
            <otherwise>
                SELECT m.*,<include refid="linkColumn" />
                FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l
                SELECT m.*,u.uName as create_user_name,<include refid="linkColumn" />
                FROM web_site.tb_workflow_main m,web_site.tb_workflow_link l,db_user.tb_user_inf u
                where m.id = l.main_id
                and m.create_user_id = u.uId
                and m.type = #{type}
                and l.deal_user_id = #{user.uId}
                and l.status = #{status}