Merge remote-tracking branch 'origin/master'

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/remark/RemarkController.java

@@ -47,7 +47,6 @@ public class RemarkController {
 
     @GetMapping("/list")
     @Operation(summary = "获得备注列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('infra:remark:query')")
     public CommonResult<List<RemarkRespVO>> getRemarkList(@Valid RemarkListReqVO listVO) {
         List<RemarkDO> list = remarkService.getRemarkList(listVO);

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/TrendsController.java

@@ -25,7 +25,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.List;
 
 import static com.win.framework.common.pojo.CommonResult.success;
@@ -51,10 +50,9 @@ public class TrendsController {
 
     @GetMapping("/list")
     @Operation(summary = "获得动态记录列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('infra:trends:query')")
-    public CommonResult<List<TrendsRespVO>> getTrendsList(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<List<TrendsRespVO>> getTrendsList(@Valid TrendsExportReqVO exportReqVO) {
-        List<TrendsDO> list = trendsService.getTrendsList(ids);
+        List<TrendsDO> list = trendsService.getTrendsList(exportReqVO);
         return success(TrendsConvert.INSTANCE.convertList(list));
     }
 

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsExportReqVO.java

@@ -1,12 +1,11 @@
 package com.win.module.infra.controller.trends.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
+import lombok.Data;
-import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 动态记录 Excel 导出 Request VO，参数和 TrendsPageReqVO 是一致的")
@@ -19,7 +18,7 @@ public class TrendsExportReqVO {
     @Schema(description = "表数据id", example = "9210")
     private Long tableId;
 
-    @Schema(description = "类型1增加2删除3修改", example = "2")
+    @Schema(description = "类型", example = "2")
     private Byte type;
 
     @Schema(description = "创建时间")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java

@@ -107,8 +107,12 @@ public class CarrierController {
         // 手动创建导出 demo
         List<CarrierImportExcelVo> list = Arrays.asList();
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(10, currency);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CARRIER_TYPE);
+        mapDropDown.put(12, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(2, available);
+        mapDropDown.put(13, available);
         // 输出
         ExcelUtils.write(response, "承运商导入模板.xls", "承运商列表", CarrierImportExcelVo.class, list,mapDropDown);
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierImportExcelVo.java

@@ -1,15 +1,20 @@
 package com.win.module.wms.controller.carrier.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
 import com.win.module.wms.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -23,7 +28,53 @@ public class CarrierImportExcelVo {
     @ExcelProperty("简称")
     private String shortName;
 
+    @ExcelProperty("地址")
+    private String address;
+
+    @ExcelProperty("国家")
+    private String country;
+
+    @ExcelProperty("城市")
+    private String city;
+
+    @ExcelProperty("电话")
+    private String phone;
+
+    @ExcelProperty("传真")
+    private String fax;
+
+    @ExcelProperty("邮编")
+    private String postId;
+
+    @ExcelProperty("联系人")
+    private String contacts;
+
+    @ExcelProperty("银行")
+    private String bank;
+
+    @ExcelProperty(value = "币种", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.CURRENCY)
+    private String currency;
+
+    @ExcelProperty("税率")
+    private BigDecimal taxRate;
+
+    @ExcelProperty(value = "类型", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.CARRIER_TYPE)
+    private String type;
+    
     @ExcelProperty(value = "是否可用", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.TRUE_FALSE)
     private String available;
+
+    @ExcelProperty("生效时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime activeTime;
+
+    @ExcelProperty("失效时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime expireTime;
+
+    @ExcelProperty("备注")
+    private String remark;
 }