更新工作流

whycxzp

2022-07-26 d4e2085bc9792233e55791a380ebfec6262dff73

更新工作流

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

@@ -10,4 +10,6 @@

    List<WorksheetMain> getInfoList2(Long userId, int statusExp);

    List<WorksheetMain> getInfoList3(Long userId, int statusExp);

}

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

@@ -30,6 +30,11 @@
    @Autowired
    private ProductBomApprovingMapper approvingMapper;

    @Autowired
    private ProductBomService bomService;

    @Autowired
    private ProductBomHistoryService historyService;

    @Transactional
    public void audit(WorksheetLink link) {
@@ -98,7 +103,16 @@
            //增加->增加部件(增加记录,同时所有eVersion+1)
            //修改->修改部件图纸,修改部件非图纸(增加记录,同时修改非原部件的所有eVersion+1)
            //删除? TODO 需要约定逻辑
            //更新到product_bom_history

            //查询部件最新的版本号
            Integer version = bomService.getProduct(approvingList.get(0).getParentModel()).getVersion();
            if(version==null){
                version = 0;
            }
            Integer nextVersion = version+1;
            //更新到product_bom_history,需要sVersion和eVersion
            //增加所有部件,排查出相关的原部件,非也是更新
            //historyService.get

            //更新到product_bom

@@ -128,4 +142,14 @@
    public List<WorksheetMain> getInfoList2(Long userId, int statusExp) {
        return linkMapper.getInfoList2(userId,statusExp);
    }

    /**
     *
     * @param userId 总经理对应的userId
     * @param statusExp 0:未审批,1:已审批(包含状态值1,2)
     * @return
     */
    public List<WorksheetMain> getInfoList3(Long userId, int statusExp) {
        return linkMapper.getInfoList3(userId,statusExp);
    }
}

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

@@ -41,9 +41,6 @@
    @Autowired
    private ProductBomApprovingService approvingService;

    @Autowired
    private ProductBomService bomService;

    @Transactional
    public boolean submit(WorksheetMain main, DocUser user) {
        List<ProductBomApproving> bomList = main.getApprovingBomList();
@@ -88,16 +85,8 @@
            return false;
        }
        //产品bom/图纸图片提交

        //查询部件最新的版本号
        Integer version = bomService.getProduct(bomList.get(0).getParentModel()).getVersion();
        if(version==null){
            version = 0;
        }
        Integer finalVersion = version;
        bomList.forEach(bom->{
            bom.setMainId(main.getId());
            bom.setVersion(finalVersion+1);
        });
        approvingService.insert(bomList);
        return true;
@@ -294,7 +283,7 @@

    public Response<PageInfo<WorksheetMain>> getHandledListPage(DocUser user, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),1);
        List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),1);
        PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
        return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
    }

 src/main/resources/mapper/WorksheetLinkMapper.xml

@@ -61,4 +61,22 @@
            </otherwise>
        </choose>
    </select>
    <select id="getInfoList3" resultMap="com.whyc.mapper.WorksheetMainMapper.Map_WorksheetMain">
        SELECT
        m.id mid,m.*,l.deal_reason,l.deal_time
        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>