src/main/java/com/whyc/controller/WorksheetLinkController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/WorksheetMainController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/ProductBomApproving.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/WorksheetLink.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ProductBomApprovingService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetLinkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorksheetMainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/WorksheetLinkController.java
@@ -6,7 +6,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("worksheetLink") src/main/java/com/whyc/controller/WorksheetMainController.java
@@ -91,4 +91,11 @@ return new Response().set(1,main); } @PostMapping("info") @ApiOperation("查询工作流的标题及描述") public Response getInfo(@RequestParam int id){ WorksheetMain main = service.getInfo(id); return new Response().set(1,main); } } src/main/java/com/whyc/pojo/ProductBomApproving.java
@@ -60,6 +60,8 @@ @ApiModelProperty("工程图纸url") private String dwgUrl; @ApiModelProperty("驳回版本号") private Integer rejectVersion; @ApiModelProperty("工程图纸是否存在:0否1存在") @TableField(exist = false) @@ -272,4 +274,12 @@ public void setDwgExist(Integer dwgExist) { this.dwgExist = dwgExist; } public Integer getRejectVersion() { return rejectVersion; } public void setRejectVersion(Integer rejectVersion) { this.rejectVersion = rejectVersion; } } src/main/java/com/whyc/pojo/WorksheetLink.java
@@ -44,6 +44,8 @@ private Date createTime; /**节点处理时间*/ private Date dealTime; /**驳回版本*/ private Integer rejectVersion; /**流程的下个处理人*/ @TableField(exist = false) @@ -174,4 +176,12 @@ public void setMain(WorksheetMain main) { this.main = main; } public Integer getRejectVersion() { return rejectVersion; } public void setRejectVersion(Integer rejectVersion) { this.rejectVersion = rejectVersion; } } src/main/java/com/whyc/service/ProductBomApprovingService.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.FileUrlDTO; import com.whyc.dto.Response; import com.whyc.mapper.ProductBomApprovingMapper; @@ -265,4 +267,15 @@ return new Response().set(1,"doc_file"+dwgSubFileDirPath+File.separator+pdfFileName); } public int getRejectVersion(Integer mainId) { QueryWrapper<ProductBomApproving> query = Wrappers.query(); query.select("reject_version").eq("main_id",mainId).orderByDesc("id").last(" limit 1"); ProductBomApproving bomApproving = mapper.selectOne(query); if(bomApproving==null){ return -1; }else{ return bomApproving.getRejectVersion(); } } } src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -169,7 +169,7 @@ FileUtil.copyDir()*/ //将产品bom表的url修正,更新到正式表 //将产品bom表的url修正,更新到正式表 TODO } } src/main/java/com/whyc/service/WorksheetMainService.java
@@ -85,8 +85,12 @@ return false; } //产品bom/图纸图片提交 //查询当前驳回版本 int rejectVersion = approvingService.getRejectVersion(main.getId()); int nextRejectVersion = rejectVersion+1; bomList.forEach(bom->{ bom.setMainId(main.getId()); bom.setRejectVersion(nextRejectVersion); }); approvingService.insert(bomList); return true; @@ -291,4 +295,8 @@ PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList); return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo); } public WorksheetMain getInfo(int id) { return mainMapper.selectById(id); } }