更新散装件审批

whycxzp

2022-08-11 250eb9393c3356cc68d1c4c0664b80fd36ae7334

更新散装件审批

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

@@ -46,7 +46,7 @@
    private Long     upUserId;
    private Date    createDate;
    private Date updateDate;
    @ApiModelProperty(value = "是否可以表示",notes ="1可用，0不可用")
    @ApiModelProperty(value = "审批是否进行中",notes ="1审批中,2审批完成")
    private int status;

    @ApiModelProperty("工程图纸url")

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

@@ -1,5 +1,7 @@
package com.whyc.service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Response;
import com.whyc.mapper.ComponentApprovingMapper;
import com.whyc.pojo.ComponentApproving;
@@ -130,7 +132,9 @@
        mapper.insertBatchSomeColumn(cApprovingList);
    }

    public List<ComponentApproving> getList() {
        return mapper.selectList(null);
    public List<ComponentApproving> getListByStatus(int status) {
        QueryWrapper<ComponentApproving> query = Wrappers.query();
        query.eq("status",status);
        return mapper.selectList(query);
    }
}

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

@@ -215,10 +215,10 @@
        List<ComponentApproving> cApprovingList = main.getCApprovingList();
        //查询是否有 已生效或者已提交审批的 相同的散装件
        List<Component> existComponentList = new LinkedList<>();
        List<ComponentApproving> existCAList = cApprovingService.getList();
        List<ComponentApproving> existCAList = new LinkedList<>();

        List<Component> componentList = cService.getList();
        List<ComponentApproving> cAList = cApprovingService.getList();
        List<ComponentApproving> cAList = cApprovingService.getListByStatus(1);
        for (int i = 0; i < cApprovingList.size(); i++) {
            ComponentApproving componentApproving = cApprovingList.get(i);
            for (int j = 0; j < componentList.size(); j++) {
@@ -302,7 +302,9 @@
        }
        //散装件-审批提交
        cApprovingList.forEach(cApproving->{
            cApproving.setCreateDate(new Date());
            cApproving.setMainId(main.getId());
            cApproving.setStatus(1);
        });

        cApprovingService.insert(cApprovingList);