朱园亮 / xingyun-erp · Commits

Commit 7ae6449ab1ec6f041775d0ccfd20c1b4c2ec62ab

Authored by 杨鸣坤
1 parent ca3a955e

楚江ERP：合同框架导出功能调整

Inline Side-by-side
Showing 3 changed files with 15 additions and 2 deletions
@@ -25,6 +25,7 @@ import com.lframework.xingyun.basedata.service.product.ProductVarietyService; @@ -25,6 +25,7 @@ import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
25 import com.lframework.xingyun.sc.bo.contract.QueryContractFrameworkBo; 25 import com.lframework.xingyun.sc.bo.contract.QueryContractFrameworkBo;
26 import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool; 26 import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool;
27 import com.lframework.xingyun.sc.entity.ContractFramework; 27 import com.lframework.xingyun.sc.entity.ContractFramework;
  28 +import com.lframework.xingyun.sc.enums.ExportType;
28 import com.lframework.xingyun.sc.excel.contract.ContractFrameworkExportTaskWorker; 29 import com.lframework.xingyun.sc.excel.contract.ContractFrameworkExportTaskWorker;
29 import com.lframework.xingyun.sc.excel.contract.ContractFrameworkImportListener; 30 import com.lframework.xingyun.sc.excel.contract.ContractFrameworkImportListener;
30 import com.lframework.xingyun.sc.excel.contract.ContractFrameworkImportModel; 31 import com.lframework.xingyun.sc.excel.contract.ContractFrameworkImportModel;
@@ -269,7 +270,7 @@ public class ContractFrameworkController extends DefaultBaseController { @@ -269,7 +270,7 @@ public class ContractFrameworkController extends DefaultBaseController {
269 @HasPermission({"contract:contractFramework:export"}) 270 @HasPermission({"contract:contractFramework:export"})
270 @PostMapping("/export") 271 @PostMapping("/export")
271 public InvokeResult<Void> export(@Valid QueryContractFrameworkVo vo) { 272 public InvokeResult<Void> export(@Valid QueryContractFrameworkVo vo) {
272 - 273 + vo.setExportType(ExportType.CONTRACT_FRAMEWORK.getCode());
273 ExportTaskUtil.exportTask("合同框架", ContractFrameworkExportTaskWorker.class, vo); 274 ExportTaskUtil.exportTask("合同框架", ContractFrameworkExportTaskWorker.class, vo);
274 275
275 return InvokeResultBuilder.success(); 276 return InvokeResultBuilder.success();
@@ -6,7 +6,12 @@ import com.lframework.starter.web.core.enums.BaseEnum; @@ -6,7 +6,12 @@ import com.lframework.starter.web.core.enums.BaseEnum;
6 public enum ExportType implements BaseEnum<String> { 6 public enum ExportType implements BaseEnum<String> {
7 7
8 8
9 - CUSTOMER_DEVELOP("CUSTOMER_DEVELOP", "客户开发"), CUSTOMER_CREDIT("CUSTOMER_CREDIT", "客户资信"); 9 + CUSTOMER_DEVELOP("CUSTOMER_DEVELOP", "客户开发"),
  10 + CUSTOMER_CREDIT("CUSTOMER_CREDIT", "客户资信"),
  11 + CONTRACT_FRAMEWORK("CONTRACT_FRAMEWORK", "合同框架"),
  12 +
  13 +
  14 + ;
10 15
11 16
12 @EnumValue 17 @EnumValue
@@ -32,6 +37,7 @@ public enum ExportType implements BaseEnum<String> { @@ -32,6 +37,7 @@ public enum ExportType implements BaseEnum<String> {
32 37
33 /** 38 /**
34 * 通过code获取desc 39 * 通过code获取desc
  40 + *
35 * @param code 状态码 41 * @param code 状态码
36 * @return 描述信息 42 * @return 描述信息
37 */ 43 */
@@ -72,4 +72,10 @@ public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializ @@ -72,4 +72,10 @@ public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializ
72 @ApiModelProperty("期限查询结束时间") 72 @ApiModelProperty("期限查询结束时间")
73 @JsonFormat(pattern = StringPool.DATE_PATTERN) 73 @JsonFormat(pattern = StringPool.DATE_PATTERN)
74 private LocalDate validityTimeEnd; 74 private LocalDate validityTimeEnd;
  75 +
  76 + /**
  77 + * 导出类型
  78 + */
  79 + @ApiModelProperty("导出类型")
  80 + private String exportType;
75 } 81 }