From 61f37fb6376b37c6856772c206246229959f18b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chhk=E2=80=9D?= <“hhk@mail.com”> Date: Mon, 12 Aug 2024 11:27:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/custom/entity/Property.java | 5 +- .../module/custom/entity/PropertyDealDO.java | 2 +- .../custom/entity/PropertyDealItemDO.java | 2 +- .../module/custom/entity/PropertyKeep.java | 2 +- .../module/custom/entity/PropertyPosDO.java | 6 +- .../service/impl/PropertyServiceImpl.java | 6 +- .../custom/vo/PropertyDealItemReqVO.java | 6 +- .../custom/vo/PropertyDealItemRespVO.java | 58 +------------------ .../module/custom/vo/PropertyDealReqVO.java | 10 ++-- .../module/custom/vo/PropertyDealRespVO.java | 31 +--------- .../module/custom/vo/PropertyPosReqVO.java | 6 +- .../module/custom/vo/PropertyPosRespVO.java | 43 ++------------ .../yudao/module/custom/vo/PropertyReqVO.java | 11 ++-- 13 files changed, 40 insertions(+), 148 deletions(-) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java index 4fa8ccdd..8cfa56ae 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/Property.java @@ -9,6 +9,7 @@ import lombok.*; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; /** * 企业管理-资产 DO @@ -28,7 +29,7 @@ public class Property extends TenantBaseDO { /** * 主键标识 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_UUID) private String id; /** * 企业id @@ -105,7 +106,7 @@ public class Property extends TenantBaseDO { /** * 取得日期 */ - private LocalDate getDate; + private LocalDateTime getDate; /** * 出厂日期 */ diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java index f41253a9..03f07a41 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealDO.java @@ -27,7 +27,7 @@ public class PropertyDealDO extends BaseDO { /** * 主键标识 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_UUID) private String id; /** * 企业id（base_company表中的id） diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java index f1edfcad..3260df89 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyDealItemDO.java @@ -25,7 +25,7 @@ public class PropertyDealItemDO extends BaseDO { /** * 主键标识 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_UUID) private String id; /** * 处置单/变动单id diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java index 494cc79d..0caf2695 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyKeep.java @@ -27,7 +27,7 @@ public class PropertyKeep extends TenantBaseDO { /** * 主键标识 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_UUID) private String id; /** * 资产id diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java index 8fb6bf09..75362b2a 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/PropertyPosDO.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.custom.entity; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; @@ -22,12 +22,12 @@ import java.math.BigDecimal; @Builder @NoArgsConstructor @AllArgsConstructor -public class PropertyPosDO extends BaseDO { +public class PropertyPosDO extends TenantBaseDO { /** * 主键标识 */ - @TableId(type = IdType.INPUT) + @TableId(type = IdType.ASSIGN_UUID) private String id; /** * 企业id（base_company表中的id） diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java index cf2767ec..63b4805e 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/PropertyServiceImpl.java @@ -4,9 +4,11 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.custom.entity.Property; import cn.iocoder.yudao.module.custom.mapper.PropertyMapper; import cn.iocoder.yudao.module.custom.service.PropertyService; +import cn.iocoder.yudao.module.custom.vo.CarMainReqVO; import cn.iocoder.yudao.module.custom.vo.PropertyReqVO; import cn.iocoder.yudao.module.custom.vo.PropertyRespVO; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -49,7 +51,9 @@ public class PropertyServiceImpl extends ServiceImpl i @Override public IPage getPropertyPage(PropertyReqVO pageReqVO) { - return baseMapper.selectPage(pageReqVO); + Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + + return baseMapper.findPage(page,pageReqVO); } } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java index 38648b19..bbe0f0d8 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemReqVO.java @@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @Schema(description = "管理后台 - 企业管理-资产处置子分页 Request VO") @Data @@ -57,7 +57,7 @@ public class PropertyDealItemReqVO extends PageParam { private String remark; @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime createTime; } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java index 0a7fc4e9..dfdbb754 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealItemRespVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.custom.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.iocoder.yudao.module.custom.entity.PropertyDealItemDO; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; @@ -12,60 +11,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 企业管理-资产处置子 Response VO") @Data @ExcelIgnoreUnannotated -public class PropertyDealItemRespVO { - - @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "18095") - @ExcelProperty("主键标识") - private String id; - - @Schema(description = "处置单/变动单id", example = "12936") - @ExcelProperty("处置单/变动单id") - private String dealId; - - @Schema(description = "资产id", example = "14421") - @ExcelProperty("资产id") - private String propertyId; - - @Schema(description = "处置方式") - @ExcelProperty(value = "处置方式", converter = DictConvert.class) - @DictFormat("company_deal_way") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private String dealWay; - - @Schema(description = "原企业id", example = "17291") - @ExcelProperty("原企业id") - private String oldCorpId; - - @Schema(description = "调入企业id", example = "21009") - @ExcelProperty("调入企业id") - private String corpId; - - @Schema(description = "原部门id", example = "23846") - @ExcelProperty("原部门id") - private Long oldDeptId; - - @Schema(description = "调入部门id", example = "3881") - @ExcelProperty("调入部门id") - private Long deptId; - - @Schema(description = "原存放地id", example = "8837") - @ExcelProperty("原存放地id") - private String oldPosId; - - @Schema(description = "调入存放地id", example = "28147") - @ExcelProperty("调入存放地id") - private String posId; - - @Schema(description = "原使用人id", example = "23983") - @ExcelProperty("原使用人id") - private Long oldUserId; - - @Schema(description = "调入使用人id", example = "918") - @ExcelProperty("调入使用人id") - private Long userId; - - @Schema(description = "备注", example = "你说的对") - @ExcelProperty("备注") - private String remark; +public class PropertyDealItemRespVO extends PropertyDealItemDO { @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java index 1cebdff3..55b7c8fe 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealReqVO.java @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @Schema(description = "管理后台 - 企业管理-资产处置单/变动单分页 Request VO") @Data @@ -34,11 +34,11 @@ public class PropertyDealReqVO extends PageParam { private String dealNo; @Schema(description = "处置/变动日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDate[] dealDate; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate dealDate; @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime createTime; } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java index 27c5e635..72d4abce 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyDealRespVO.java @@ -1,44 +1,17 @@ package cn.iocoder.yudao.module.custom.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.iocoder.yudao.module.custom.entity.PropertyDealDO; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.time.LocalDate; import java.time.LocalDateTime; @Schema(description = "管理后台 - 企业管理-资产处置单/变动单 Response VO") @Data @ExcelIgnoreUnannotated -public class PropertyDealRespVO { - - @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "29577") - @ExcelProperty("主键标识") - private String id; - - @Schema(description = "企业id（base_company表中的id）", example = "21595") - @ExcelProperty("企业id（base_company表中的id）") - private String corpId; - - @Schema(description = "部门id（system_dept表中的id，用来做数据权限控制）", example = "19510") - @ExcelProperty("部门id（system_dept表中的id，用来做数据权限控制）") - private Long deptId; - - @Schema(description = "数据类型", example = "1") - @ExcelProperty(value = "数据类型", converter = DictConvert.class) - @DictFormat("property_data_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private String dataType; - - @Schema(description = "处置/变动单号") - @ExcelProperty("处置/变动单号") - private String dealNo; - - @Schema(description = "处置/变动日期") - @ExcelProperty("处置/变动日期") - private LocalDate dealDate; +public class PropertyDealRespVO extends PropertyDealDO { @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java index 26ccf5cd..820ba994 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosReqVO.java @@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @Schema(description = "管理后台 - 企业管理-资产存放位置分页 Request VO") @Data @@ -40,7 +40,7 @@ public class PropertyPosReqVO extends PageParam { private String depositType; @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime createTime; } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java index dd1605d7..b28525cb 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyPosRespVO.java @@ -1,48 +1,17 @@ package cn.iocoder.yudao.module.custom.vo; +import cn.iocoder.yudao.module.custom.entity.PropertyPosDO; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 企业管理-资产存放位置 Response VO") @Data @ExcelIgnoreUnannotated -public class PropertyPosRespVO { - - @Schema(description = "主键标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "19336") - @ExcelProperty("主键标识") - private String id; - - @Schema(description = "企业id（base_company表中的id）", example = "5018") - @ExcelProperty("企业id（base_company表中的id）") - private String corpId; - - @Schema(description = "部门id（system_dept表中的id，用来做数据权限控制）", example = "25943") - @ExcelProperty("部门id（system_dept表中的id，用来做数据权限控制）") - private Long deptId; - - @Schema(description = "存放地名称", example = "王五") - @ExcelProperty("存放地名称") - private String posName; - - @Schema(description = "存放地地址") - @ExcelProperty("存放地地址") - private String address; - - @Schema(description = "面积") - @ExcelProperty("面积") - private BigDecimal area; - - @Schema(description = "存放类型", example = "2") - @ExcelProperty(value = "存放类型", converter = DictConvert.class) - @DictFormat("company_deposit_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private String depositType; +public class PropertyPosRespVO extends PropertyPosDO { @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java index 117195ba..6b0cf464 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/PropertyReqVO.java @@ -8,7 +8,6 @@ import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @@ -75,18 +74,18 @@ public class PropertyReqVO extends PageParam { @Schema(description = "取得日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDate[] getDate; + private LocalDateTime getDate; @Schema(description = "出厂日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDate[] prodDate; + private LocalDateTime prodDate; @Schema(description = "供应商") private String supplier; @Schema(description = "启用日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDate[] openDate; + private LocalDateTime openDate; @Schema(description = "净值（元）") private BigDecimal netValue; @@ -102,11 +101,11 @@ public class PropertyReqVO extends PageParam { @Schema(description = "上次维修/保养日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDate[] lastKeepDate; + private LocalDateTime lastKeepDate; @Schema(description = "下次维修/保养日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDate[] nextKeepDate; + private LocalDateTime nextKeepDate; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)