ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 老法规外标导入逻辑

Browse Source
This commit is contained in:
mzaxd
2023-12-04 15:02:28 +08:00
parent 1b074eb4a7
commit 9cc05f3d5b
10 changed files with 572 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java
+13 -3
View File
@@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@ApiSupport(order = 10101)
@Api(tags="老法规系统")
@@ -52,11 +53,11 @@ public class OldSystemController {
private ILawsEnterpriseStandardService enterpriseStandardService;
@PostMapping("/importOldSystemExcel")
@AutoLog(value = "老法规系统-老法规企标国标数据导入")
@ApiOperation(value="老法规系统-老法规企标国标数据导入", notes="老法规系统-老法规企标国标数据导入", produces = "application/octet-stream")
@AutoLog(value = "老法规系统-老法规企标国标外标数据导入")
@ApiOperation(value="老法规系统-老法规企标国标外标数据导入", notes="老法规系统-老法规企标国标外标数据导入", produces = "application/octet-stream")
@ApiOperationSupport(order = 2)
public void importOldSystemESZip(@RequestParam("file") MultipartFile file,
@ApiParam(value = "0不导入 1导入企标 2导入国标 3一起导入", required = true)
@ApiParam(value = "0不导入 1导入企标 2导入国标 3外标", required = true)
@RequestParam("type") String type,
HttpServletResponse response) {
enterpriseStandardService.importExcelOldSystem(file, type, response);
@@ -88,4 +89,13 @@ public class OldSystemController {
enterpriseStandardService.importOldESAuthDeptExcel(file, response);
}
@PostMapping("/filterChineseStandardNo")
@AutoLog(value = "老法规系统-过滤带中文的标准号")
@ApiOperation(value="老法规系统-过滤带中文的标准号", notes="老法规系统-过滤带中文的标准号", produces = "application/octet-stream")
@ApiOperationSupport(order = 6)
public void filterChineseStandardNo(@RequestParam("file") MultipartFile file,
HttpServletResponse response) throws IOException {
enterpriseStandardService.filterChineseStandardNo(file, response);
}
}
laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/ESAuthDept.java
+2
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.oldSystem.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -42,6 +43,7 @@ public class ESAuthDept {
@Excel(name = "错误信息", width = 35)
@ApiModelProperty(value = "错误信息")
@TableField(exist = false)
private String errorInfo;
public boolean isEmptyRow() {
laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/ESAuthUser.java
+2
View File
@@ -1,5 +1,6 @@
package com.jero.modules.laws.oldSystem.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -43,6 +44,7 @@ public class ESAuthUser {
@Excel(name = "错误信息", width = 35, orderNum = "7")
@ApiModelProperty(value = "错误信息")
@TableField(exist = false)
private String errorInfo;
public boolean isEmptyRow() {
laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/OldSystemDepartRelation.java
+1
View File
@@ -80,6 +80,7 @@ public class OldSystemDepartRelation implements Serializable {
*/
@Excel(name = "错误信息", width = 35)
@ApiModelProperty(value = "错误信息")
@TableField(exist = false)
private String errorInfo;
@TableField(exist = false)