src/main/java/com/whyc/pojo/ProductBomApproving.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/WorksheetMain.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/ProductBomApprovingService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/util/CommonUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/pojo/ProductBomApproving.java
@@ -1,6 +1,7 @@ package com.whyc.pojo; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.type.Alias; import java.util.Date; @@ -13,41 +14,43 @@ public class ProductBomApproving { private Integer id; /**母料编号*/ @ApiModelProperty("审批批次码") private String batchCode; @ApiModelProperty("母料编号") private String parentCode; /**母料名称*/ @ApiModelProperty("母料名称") private String parentName; /**母料型号*/ @ApiModelProperty("母料型号") private String parentModel; /** 类别*/ @ApiModelProperty("类别") private String category; /**子件编码*/ @ApiModelProperty("子件编码") private String subCode; /**子件名称*/ @ApiModelProperty("子件名称") private String subName; /**子件型号*/ @ApiModelProperty("子件型号") private String subModel; /**单位*/ @ApiModelProperty("单位") private String unit; /**子件数量*/ @ApiModelProperty("子件数量") private Integer quantity; /**生产商*/ @ApiModelProperty("生产商") private String producer; /**封装类型/材质*/ @ApiModelProperty("封装类型/材质") private String material; /**元件编号/料厚*/ @ApiModelProperty("元件编号/料厚") private String thickness; /**表面处理/物料详情*/ @ApiModelProperty("表面处理/物料详情") private String surfaceDetail; /** 备注*/ @ApiModelProperty("备注") private String notes; private String pictureUrl; private String fileUrl; /**上传人*/ @ApiModelProperty("上传人") private String upUser; private Date createDate; private Date updateDate; /**版本*/ @ApiModelProperty("版本") private Integer version; public Integer getId() { @@ -58,6 +61,14 @@ this.id = id; } public String getBatchCode() { return batchCode; } public void setBatchCode(String batchCode) { this.batchCode = batchCode; } public String getParentCode() { return parentCode; } src/main/java/com/whyc/pojo/WorksheetMain.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.type.Alias; import java.util.Date; @@ -11,19 +12,19 @@ @Alias("WorksheetMain") public class WorksheetMain { private Integer id; /**工单标题*/ @ApiModelProperty("工单标题") private String title; /**任务描述*/ @ApiModelProperty("任务描述") private String description; /**工单文件路径*/ @ApiModelProperty("工单文件路径") private String file; /**工单创建人id*/ @ApiModelProperty("工单创建人id") private Long createUserId; /**工单开始时间*/ @ApiModelProperty("工单开始时间") private Date beginTime; /**工单结束时间*/ @ApiModelProperty("工单结束时间") private Date endTime; /**工单级别*/ @ApiModelProperty("工单级别") private Integer level; /** * 工单状态: @@ -33,14 +34,17 @@ * 5:归档 * */ private Integer status; /**工单结束意见*/ @ApiModelProperty("工单结束意见") private String endReason; /**流程的下个处理人*/ @ApiModelProperty("审批批次码") private String approvingBatchCode; @ApiModelProperty("流程的下个处理人") @TableField(exist = false) private Long nextUser; /**提交人的意见描述*/ @ApiModelProperty("提交人的意见描述") @TableField(exist = false) private String dealDesc; @@ -121,6 +125,14 @@ this.endReason = endReason; } public String getApprovingBatchCode() { return approvingBatchCode; } public void setApprovingBatchCode(String approvingBatchCode) { this.approvingBatchCode = approvingBatchCode; } public Long getNextUser() { return nextUser; } src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -2,8 +2,10 @@ import com.whyc.pojo.ProductBomApproving; import com.whyc.pojo.WorksheetMain; import com.whyc.util.CommonUtil; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.*; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.io.IOException; @@ -52,7 +54,8 @@ int k = i-2; if(k<allPictures.size()){ PictureData pictureData = allPictures.get(k); //图片 //图片存储 CommonUtil.getRootFile(); bomApproving.setPictureUrl(bomApproving.getSubModel()+"."+pictureData.suggestFileExtension()); } }break; src/main/java/com/whyc/util/CommonUtil.java
@@ -1,5 +1,6 @@ package com.whyc.util; import com.whyc.constant.YamlProperties; import com.whyc.pojo.DocUser; import com.whyc.service.DocLogService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +34,24 @@ return jarFile.toString(); } /** * 获取存放文件的根路径 * @return 返回存放文件的根路径 */ public static File getRootFile(){ ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class); File jarFile = applicationHome.getDir(); String baseDirPath; if(YamlProperties.runModel == 1) { //开发路径 baseDirPath = jarFile.getParentFile().toString()+File.separator+"doc_file"+File.separator; }else { //打包路径 baseDirPath = jarFile.toString()+File.separator+"doc_file"+File.separator; } return new File(baseDirPath); } /**手动记录特定日志*/ public static void record(long uId, int operationType, String msg){ docLogService.record(uId,operationType,msg);