src/main/java/com/whyc/pojo/ComponentApproving.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ComponentApprovingService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ComponentService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetLinkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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审批中,2审批完成") @ApiModelProperty(value = "审批是否进行中",notes ="1审批中,2审批完结") private int status; @ApiModelProperty("工程图纸url") src/main/java/com/whyc/service/ComponentApprovingService.java
@@ -1,6 +1,7 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.dto.Response; import com.whyc.mapper.ComponentApprovingMapper; @@ -145,4 +146,16 @@ query.eq("status",status); return mapper.selectList(query); } public void endType(Integer mainId) { UpdateWrapper<ComponentApproving> update = Wrappers.update(); update.set("type",2).eq("main_id",mainId); mapper.update(null,update); } public List<ComponentApproving> getListByMainId(Integer mainId) { QueryWrapper<ComponentApproving> query = Wrappers.query(); query.eq("main_id",mainId); return mapper.selectList(query); } } src/main/java/com/whyc/service/ComponentService.java
@@ -43,4 +43,8 @@ public List<Component> getList() { return mapper.selectList(null); } public void insertBatch(List<Component> componentList) { mapper.insertBatchSomeColumn(componentList); } } src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -43,12 +43,22 @@ @Autowired private ComponentProductApprovingService cpAService; @Autowired private ComponentApprovingService cAService; @Autowired private ComponentService cService; @Transactional public void audit(WorksheetLink link) { link.setDealTime(new Date()); //更新节点信息 linkMapper.updateById(link); if(link.getLinkStatus() == 2){ //驳回 //查看是否为散装件审批,是则需要更新散装件审批表中的状态为完结 if(mainService.getInfoById(link.getMainId()).getType().equals(EnumWorksheetType.Component.getType())){ cAService.endType(link.getMainId()); } //项目经理驳回,驳回即终止 mainService.updateEndStatusById(link.getMainId(),"经理驳回,驳回原因:"+link.getDealReason(),0); //项目经理驳回前,还曾经过总经理,则需要增加总经理驳回原因 @@ -233,8 +243,25 @@ //更新正式bom的对应url bomService.updateUrl(fileBomApprovingList); } else if(type.intValue() == EnumWorksheetType.Component.getType()){ //散装件 TODO else if(type.intValue() == EnumWorksheetType.Component.getType()){ //散装件 //将散装件从审批表中转移到正式表 List<Component> componentList = new LinkedList<>(); List<ComponentApproving> approvingList = cAService.getListByMainId(link.getMainId()); approvingList.forEach(approve->{ Component component = new Component(); component.setCategory(approve.getCategory()); component.setSubCode(approve.getSubCode()); component.setSubName(approve.getSubName()); component.setSubModel(approve.getSubModel()); component.setUnit(approve.getUnit()); component.setQuantity(approve.getQuantity()); component.setProducer(approve.getProducer()); component.setNotes(approve.getNotes()); componentList.add(component); }); cService.insertBatch(componentList); //更新散装件审批子表中type为完结 cAService.endType(link.getMainId()); } else if(type.intValue() == EnumWorksheetType.ComponentProduct.getType()){ //更新散装件-产品关系 //查找到对应的散装件-产品关系数据