diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java
new file mode 100644
index 00000000..20135145
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/BusProcessEvaluationHis.java
@@ -0,0 +1,84 @@
+package com.adc.da.slrs.sarBussStandAttrInfo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="BusProcessEvaluationHis对象", description="流程评分历史表")
+public class BusProcessEvaluationHis implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "ID", type = IdType.UUID)
+ private String id;
+
+ @ApiModelProperty(value = "标准id")
+ @TableField("STAND_ID")
+ private String standId;
+
+ @ApiModelProperty(value = "处理人")
+ @TableField("USER_ID")
+ private String userId;
+
+ @ApiModelProperty(value = "信息")
+ @TableField("MESG")
+ private String mesg;
+
+ @ApiModelProperty(value = "节点信息")
+ @TableField("TASK_INFO")
+ private String taskInfo;
+
+ @ApiModelProperty(value = "任务id")
+ @TableField("TASK_ID")
+ private String taskId;
+
+ @ApiModelProperty(value = "流程实例id")
+ @TableField("P_ID")
+ private String pId;
+
+ @ApiModelProperty(value = "流程名称")
+ @TableField("PRC_NAME")
+ private String prcName;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATE_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private String createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField("UPDATE_TIME")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private String updateTime;
+
+ @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑")
+ @TableField("EDIT_STATUS")
+ private String editStatus;
+
+ @ApiModelProperty(value = "onlyOffice 编辑文件存储路径")
+ @TableField("EDIT_FILE_PATH")
+ private String editFilePath;
+
+ @ApiModelProperty(value = "逻辑状态")
+ @TableField("FLAG")
+ private String flag;
+
+ @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径")
+ @TableField(exist = false)
+ private String downLoadUrl;
+
+ @ApiModelProperty(value = "处理人姓名")
+ @TableField(exist = false)
+ private String userName;
+}
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
new file mode 100644
index 00000000..581a256c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java
@@ -0,0 +1,153 @@
+package com.adc.da.slrs.sarBussStandAttrInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.scheduling.support.SimpleTriggerContext;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ *
+ *
+ *
+ *
+ * @author
+ * @since 2023-02-28
+ */
+@Data
+public class SarBussStandAttrInfoExecl extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ private String id;
+
+ @ApiModelProperty(value = "标准基础表主键")
+ private String standId;
+
+ private String creationUser;
+
+ @ApiModelProperty(value = "是否有效")
+ private String validFlag;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "修改时间")
+ private Date modifyTime;
+
+ @ApiModelProperty(value = "体系类别")
+ private String txlbbuss;
+
+ private String glwj;
+
+ private String svpps;
+
+ private String gfxyywj;
+
+ private String zrbm;
+
+ private Date fzrq;
+
+ private Date fsrq;
+
+ private String qbmj;
+
+ private String qbsq;
+
+ private String qbwb;
+
+ private String gcwb;
+
+ private String zyqcr;
+
+ private String qcfbw;
+
+ private String xglc;
+
+ private String xgbm;
+
+ private String xhqbm;
+
+ private String zqcbm;
+
+ private String qtqcr;
+
+ private String wfspjs;
+
+ private String xgjh;
+
+ //附件
+ private String fbgBuss;
+
+ //标准中文名称
+ private String standName;
+
+ //企标类型
+ private String standSort;
+
+ //标准年份
+ private String standYear;
+
+ //文本状态
+ private String textStatusBuss;
+
+ //起草部门
+ private String qcdw;
+
+ //起草人
+ private String qcrbuss;
+
+ //发布日期
+ private Date issueTime;
+
+ //标准编号
+ private String standCode;
+
+ //标准英文名称
+ private String standEnName;
+
+ //实施日期
+ private Date putTime;
+
+ //企标制修订状态
+ private String revisionStatus;
+
+ //废止日期
+ private String fzrqbuss;
+
+ //代替企标编号
+ private String dtqbbhbuss;
+
+ //复审日期
+ private String fsrqbuss;
+
+ //被代替企标编号
+ private String bdtqbbhbuss;
+
+ //文件上传人员
+ private String wjscrybuss;
+
+ //适用车型
+ private String sycxclass;
+
+ //能源类型
+ private String nylxclass;
+
+ //适用产品线
+ private String sycpxclass;
+
+ //上传时间
+ private String xcsjbuss;
+
+ @TableField(exist = false)
+ private Map attrInfoMap = new LinkedHashMap<>();
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index c5577125..06d18273 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -404,160 +404,17 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{
- @ApiOperation(value = "|SarBussionessStand|导入")
- @PostMapping("/importSarBussionessStand")
- public ResponseMessage importSarBussionessStandFile(@RequestParam(value = "file",required = false) MultipartFile file)throws Exception {
- //截取后缀名
- int pos = file.getOriginalFilename().lastIndexOf(".");
- String str = file.getOriginalFilename().substring(pos + 1).toLowerCase();
- String filenameorg = file.getOriginalFilename().substring(0, pos);
- //判断上传文件必须是zip
- if (!str.equals("zip")) {
- return Result.error("fail", "请上传zip文件");
- }
- String path = filePath + "/modal/" + filenameorg;
- File saveDirectory = new File(path);
- if (!saveDirectory.isDirectory()) {
- saveDirectory.mkdir();
- }
- FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + "/" + file.getOriginalFilename()));
- try {
- //解压缩
- String zipEntryName = FileUnZip.unZipFiles(path + "/" + file.getOriginalFilename(), path);
- // 数据相关处理,
- // 1.获取其中的Excel,
- List excelfilelist = FileUnZip.readImpExcelFile(zipEntryName);
- System.gc();
- if (excelfilelist.size() < 1) {
- int i = 0;
- for (File file1 : excelfilelist) {
- if (file1.getName().indexOf("导入模板") > -1) {
- i++;
- }
- }
- if (i == 0) {
- //删除原上传文件
- FileUnZip.deleteDir(saveDirectory);
- return Result.error("fail", "压缩包内没有上传导入模板Excel");
- }
- } else if (excelfilelist.size() > 1) {
- int i = 0;
- for (File file1 : excelfilelist) {
- if (file1.getName().indexOf("导入模板") > -1) {
- i++;
- }
- }
- if (i > 1) {
- //删除原上传文件
- FileUnZip.deleteDir(saveDirectory);
- return Result.error("fail", "压缩包内有多个导入模板Excel");
- }
+ ResponseMessage message = sarBussionessStandEOService.importSarBussionessStandFile(file);
+ if (message != null && ! message.equals("")){
+ return Result.success();
+ }else {
+ return Result.error("导入失败,导入的文件为空");
}
- File excelfile = excelfilelist.get(0);
- for (File file1 : excelfilelist) {
- if (file1.getName().indexOf("导入模板") > -1) {
- excelfile = file1;
- }
- }
- // 导入参数设置,默认即可
- Workbook workbook = null;
- try {
- workbook = WorkbookFactory.create(excelfile);
- List