更新

whycxzp

2022-07-22 c4d9ae6a4fb641e310863b421700c28b9bf3d1ba

更新

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

@@ -1,7 +1,6 @@
package com.whyc.controller;

import com.whyc.dto.Response;
import com.whyc.dto.WorksheetMainDTO;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.WorksheetMain;
import com.whyc.service.WorksheetMainService;
@@ -24,9 +23,9 @@

    @PostMapping("submit")
    @ApiOperation("产品图纸及bom提交")
    public Response submit(@RequestBody WorksheetMainDTO mainDTO){
    public Response submit(@RequestBody WorksheetMain main){
        DocUser user = ActionUtil.getUser();
        boolean res = service.submit(mainDTO,user);
        boolean res = service.submit(main,user);
        if(res) {
            return new Response().set(1,true, "提交完成");
        }else{

 src/main/java/com/whyc/dto/WorksheetMainDTO.java

File was deleted

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

@@ -51,7 +51,7 @@

    @ApiModelProperty("待审批产品bom")
    @TableField(exist = false)
    private List<ProductBomApproving> approvingBom;
    private List<ProductBomApproving> approvingBomList;

    private LinkedList<WorksheetLink> links;

@@ -167,11 +167,11 @@
        this.links = links;
    }

    public List<ProductBomApproving> getApprovingBom() {
        return approvingBom;
    public List<ProductBomApproving> getApprovingBomList() {
        return approvingBomList;
    }

    public void setApprovingBom(List<ProductBomApproving> approvingBom) {
        this.approvingBom = approvingBom;
    public void setApprovingBomList(List<ProductBomApproving> approvingBomList) {
        this.approvingBomList = approvingBomList;
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.WorksheetMainDTO;
import com.whyc.mapper.DocUserMapper;
import com.whyc.mapper.WorksheetLinkMapper;
import com.whyc.mapper.WorksheetMainMapper;
@@ -14,7 +13,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import sun.print.PSPrinterJob;

import javax.annotation.Resource;
import java.util.*;
@@ -40,9 +38,8 @@
    private ProductBomApprovingService approvingService;

    @Transactional
    public boolean submit(WorksheetMainDTO mainDTO, DocUser user) {
        WorksheetMain main = mainDTO.getMain();
        List<ProductBomApproving> bomList = mainDTO.getBomList();
    public boolean submit(WorksheetMain main, DocUser user) {
        List<ProductBomApproving> bomList = main.getApprovingBomList();
        //提交主表
        main.setCreateUserId(user.getId());
        //提交人角色来判断工作流层级