更新工作流

whycxzp

2022-07-28 5c33f948a28f49b7c47b646541d90d756ba805fb

更新工作流

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

@@ -50,7 +50,7 @@
    @ApiModelProperty("上传人")
    private String     upUser;
    private Date    createDate;
    private Date updateDate;
    //private Date updateDate;
    @ApiModelProperty("起始版本号")
    private Integer   sVersion;
    @ApiModelProperty("终止版本号")
@@ -219,14 +219,6 @@

    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }

    public Date getUpdateDate() {
        return updateDate;
    }

    public void setUpdateDate(Date updateDate) {
        this.updateDate = updateDate;
    }

    public Integer getSVersion() {

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

@@ -78,20 +78,20 @@
        linkMapper.updateById(link);
        if(link.getLinkStatus() == 2){ //驳回
            //驳回到员工进行处理
            //查询工单的员工
            Long createUserId = mainService.getInfoById(link.getMainId()).getCreateUserId();
            //查询对应的项目经理
            Long createUserId = linkMapper.selectById(link.getParentId()).getDealUserId();
            WorksheetLink link2 = new WorksheetLink();
            link2.setMainId(link.getMainId());
            link2.setParentId(link.getId());
            link2.setDealUserId(createUserId);
            link2.setDealType(0);
            link2.setDealDesc("工单被经理驳回,驳回信息:"+link.getDealReason());
            link2.setDealDesc("工单被总经理驳回,驳回信息:"+link.getDealReason());
            link2.setLinkStatus(0);
            link2.setEnableArchive(0);
            link2.setRejectVersion(link.getRejectVersion());
            linkMapper.insert(link2);
            //更新主表状态
            mainService.updateStatusById(link.getMainId(),0);
            mainService.updateStatusById(link.getMainId(),1);
        }else{
            //审批通过,更新主表状态
            mainService.updateEndStatusById(link.getMainId(),"完结",5);
@@ -147,7 +147,6 @@
                his.setThickness(approvingBom.getThickness());
                his.setType(approvingBom.getType());
                his.setUnit(approvingBom.getUnit());
                his.setUpdateDate(approvingBom.getUpdateDate());
                his.setUpUser(approvingBom.getUpUser());

                newHistoryList.add(his);

 src/main/resources/mapper/WorksheetMainMapper.xml

@@ -17,6 +17,7 @@
        </association>
        <collection property="links" ofType="com.whyc.pojo.WorksheetLink">
            <id column="lid" property="id"/>
            <result column="parent_id" property="parentId"/>
            <result column="deal_user_id" property="dealUserId"/>
            <result column="deal_type" property="dealType"/>
            <result column="deal_desc" property="dealDesc"/>
@@ -59,7 +60,7 @@
    <select id="getLinkList" resultMap="Map_WorksheetMain">
        SELECT
            m.id mid,m.title,m.description,m.file,m.create_user_id,m.begin_time,m.end_time,m.level,m.status,m.end_reason,
            l.id lid,deal_user_id,deal_type,deal_desc,deal_reason,link_file,link_status,enable_archive,create_time,deal_time,
            l.id lid,l.parent_id,deal_user_id,deal_type,deal_desc,deal_reason,link_file,link_status,enable_archive,create_time,deal_time,
            b.*
        FROM
            tb_worksheet_main m