账期日历Vo数据字典类型修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarBaseVO.java

@@ -47,7 +47,7 @@ public class AccountcalendarBaseVO {
 
     @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否可用不能为空")
-    private Integer available;
+    private String available;
 
     @Schema(description = "生效时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarExcelVO.java

@@ -40,7 +40,7 @@ public class AccountcalendarExcelVO {
 
     @ExcelProperty(value = "是否可用", converter = DictConvert.class)
     @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private Integer available;
+    private String available;
 
 
     @ExcelProperty("生效时间")
@@ -59,6 +59,6 @@ public class AccountcalendarExcelVO {
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者ID")
-    private String creatorId;
+    private String creator;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarExportReqVO.java

@@ -34,7 +34,7 @@ public class AccountcalendarExportReqVO {
     private LocalDateTime[] converttotime;
 
     @Schema(description = "是否可用")
-    private Integer available;
+    private String available;
 
     @Schema(description = "生效时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -52,6 +52,6 @@ public class AccountcalendarExportReqVO {
     private LocalDateTime[] createTime;
 
     @Schema(description = "创建者ID")
-    private String creatorId;
+    private String creator;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarPageReqVO.java

@@ -57,6 +57,6 @@ public class AccountcalendarPageReqVO extends PageParam {
     private LocalDateTime[] createTime;
 
     @Schema(description = "创建者ID")
-    private String creatorId;
+    private String creator;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarRespVO.java

@@ -17,6 +17,6 @@ public class AccountcalendarRespVO extends AccountcalendarBaseVO {
     private LocalDateTime createTime;
 
     @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String creatorId;
+    private String creator;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@@ -6,6 +6,7 @@ import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
@@ -45,6 +46,9 @@ public class ItembasicController {
     @Resource
     private ItembasicMapper itembasicMapper;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建物品基本信息")
     @PreAuthorize("@ss.hasPermission('wms:itembasic:create')")
@@ -106,9 +110,16 @@ public class ItembasicController {
     @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
     public CommonResult<PageResult<ItembasicRespVO>> getItembasicPage(@Valid ItembasicPageReqVO pageVO) {
         PageResult<ItembasicDO> pageResult = itembasicService.getItembasicPage(pageVO);
+        PageResult<ItembasicRespVO> result = ItembasicConvert.INSTANCE.convertPage(pageResult);
+        for(ItembasicRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            String nickname = userApi.getUser(Long.valueOf(vo.getCreator())).getNickname();
+        }
         return success(ItembasicConvert.INSTANCE.convertPage(pageResult));
     }
 
+
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出物品基本信息 Excel")
     @PreAuthorize("@ss.hasPermission('wms:itembasic:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/accountcalendar/AccountcalendarDO.java

@@ -1,17 +1,13 @@
 package com.win.module.wms.dal.dataobject.accountcalendar;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 账期日历 DO
@@ -62,7 +58,7 @@ public class AccountcalendarDO extends BaseDO {
      *
      * 枚举 {@link TODO true_false 对应的类}
      */
-    private Integer available;
+    private String available;
     /**
      * 生效时间
      */
@@ -78,7 +74,7 @@ public class AccountcalendarDO extends BaseDO {
     /**
      * 创建者ID
      */
-    private String creatorId;
+    private String creator;
     /**
      * 删除时间
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/accountcalendar/AccountcalendarMapper.java

@@ -1,15 +1,15 @@
 package com.win.module.wms.dal.mysql.accountcalendar;
 
-import java.util.*;
-
 import com.win.framework.common.pojo.PageResult;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarExportReqVO;
 import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarPageReqVO;
 import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 账期日历 Mapper
  *
@@ -31,7 +31,7 @@ public interface AccountcalendarMapper extends BaseMapperX<AccountcalendarDO> {
                 .betweenIfPresent(AccountcalendarDO::getExpireTime, reqVO.getExpireTime())
                 .eqIfPresent(AccountcalendarDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(AccountcalendarDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(AccountcalendarDO::getCreatorId, reqVO.getCreatorId())
+                .eqIfPresent(AccountcalendarDO::getCreator, reqVO.getCreator())
                 .orderByDesc(AccountcalendarDO::getId));
     }
 
@@ -48,7 +48,7 @@ public interface AccountcalendarMapper extends BaseMapperX<AccountcalendarDO> {
                 .betweenIfPresent(AccountcalendarDO::getExpireTime, reqVO.getExpireTime())
                 .eqIfPresent(AccountcalendarDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(AccountcalendarDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(AccountcalendarDO::getCreatorId, reqVO.getCreatorId())
+                .eqIfPresent(AccountcalendarDO::getCreator, reqVO.getCreator())
                 .orderByDesc(AccountcalendarDO::getId));
     }