From 77bcb17b0d59f5a21500eb0c6589ccbe693b9bea Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 9 May 2023 17:39:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basic/entity/BasicForkliftEntity.java | 5 ++++- .../main/java/com/logpm/basic/entity/BasicPdaEntity.java | 3 +++ .../java/com/logpm/basic/entity/BasicPdarecordsEntity.java | 3 +++ .../src/main/java/com/logpm/basic/vo/BasicPdaVO.java | 5 +++++ .../logpm/basic/controller/BasicForkliftController.java | 6 +++++- .../com/logpm/basic/controller/BasicPdaController.java | 7 ++++++- .../java/com/logpm/basic/mapper/BasicForkliftMapper.java | 3 ++- .../logpm/basic/mapper/{ => xml}/BasicForkliftMapper.xml | 0 .../com/logpm/basic/mapper/{ => xml}/BasicPdaMapper.xml | 0 9 files changed, 28 insertions(+), 4 deletions(-) rename blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/{ => xml}/BasicForkliftMapper.xml (100%) rename blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/{ => xml}/BasicPdaMapper.xml (100%) diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java index cee10053a..f05331072 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java @@ -17,6 +17,7 @@ package com.logpm.basic.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -76,7 +77,7 @@ public class BasicForkliftEntity extends TenantEntity { * 载重;单位（T） */ @ApiModelProperty(value = "载重;单位（T）") - private BigDecimal load; + private BigDecimal loads; /** * 载高;单位（M） */ @@ -131,11 +132,13 @@ public class BasicForkliftEntity extends TenantEntity { * 租赁开始时间 */ @ApiModelProperty(value = "租赁开始时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date leaseStartTime; /** * 租赁结束时间 */ @ApiModelProperty(value = "租赁结束时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date leaseEndTime; /** * 付款周期;(月) diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdaEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdaEntity.java index 6f118e66e..23f46f5d9 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdaEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdaEntity.java @@ -18,6 +18,7 @@ package com.logpm.basic.entity; */ import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -102,11 +103,13 @@ public class BasicPdaEntity extends TenantEntity { * 购买时间 */ @ApiModelProperty(value = "购买时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date buyingTime; /** * 保修截止时间 */ @ApiModelProperty(value = "保修截止时间") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date warrantyPeriodEndTime; /** * 备注 diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdarecordsEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdarecordsEntity.java index b80bd46c8..72dd0e564 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdarecordsEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicPdarecordsEntity.java @@ -17,6 +17,7 @@ package com.logpm.basic.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -71,6 +72,7 @@ public class BasicPdarecordsEntity extends TenantEntity { * 反馈日期 */ @ApiModelProperty(value = "反馈日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date feedbackTime; /** * 营业部 @@ -116,6 +118,7 @@ public class BasicPdarecordsEntity extends TenantEntity { * 寄回日期 */ @ApiModelProperty(value = "寄回日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date returnDate; /** * 维修寄回单号 diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicPdaVO.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicPdaVO.java index ff3114e5f..78356e736 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicPdaVO.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicPdaVO.java @@ -16,11 +16,16 @@ */ package com.logpm.basic.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.logpm.basic.entity.BasicPdaEntity; +import io.swagger.annotations.ApiModelProperty; import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.util.Date; + /** * pda信息 视图实体类 * diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicForkliftController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicForkliftController.java index b74d4c2dd..912a2f45e 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicForkliftController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicForkliftController.java @@ -16,6 +16,10 @@ */ package com.logpm.basic.controller; + + + + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -23,6 +27,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -37,7 +42,6 @@ import com.logpm.basic.excel.BasicForkliftExcel; import com.logpm.basic.service.IBasicForkliftService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java index a464d1d83..0f1bf53fc 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java @@ -34,6 +34,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.system.feign.IDictBizClient; import org.springframework.cloud.commons.util.IdUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -61,6 +62,8 @@ public class BasicPdaController extends BladeController { private final IBasicPdaService basicPdaService; + private final IDictBizClient iDictBizClient; + /** * pda信息 详情 */ @@ -78,6 +81,9 @@ public class BasicPdaController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入BasicPda") public R> list(@ApiIgnore @RequestParam Map basicPda, Query query) { + + basicPdaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicPda, BasicPdaEntity.class)); + IPage pages = basicPdaService.page(Condition.getPage(query), Condition.getQueryWrapper(basicPda, BasicPdaEntity.class)); // IPage pages = basicPdaService.page(Condition.getPage(query)); return R.data(pages); @@ -102,7 +108,6 @@ public class BasicPdaController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入BasicPda") public R save(@Valid @RequestBody BasicPdaEntity BasicPda) { - return R.status(basicPdaService.save(BasicPda)); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.java index 50b685077..e467fe4cc 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.java @@ -17,8 +17,9 @@ package com.logpm.basic.mapper; import com.logpm.basic.entity.BasicForkliftEntity; -import com.logpm.basic.vo.BasicForkliftVO; import com.logpm.basic.excel.BasicForkliftExcel; +import com.logpm.basic.vo.BasicForkliftVO; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/xml/BasicForkliftMapper.xml similarity index 100% rename from blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicForkliftMapper.xml rename to blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/xml/BasicForkliftMapper.xml diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPdaMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/xml/BasicPdaMapper.xml similarity index 100% rename from blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicPdaMapper.xml rename to blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/xml/BasicPdaMapper.xml From 16a8614fbebf365b294a9c3eef7a780d92dc7dc0 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 9 May 2023 18:05:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9entity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basic/entity/BasicForkliftEntity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java index f05331072..474de7d4c 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicForkliftEntity.java @@ -42,7 +42,7 @@ public class BasicForkliftEntity extends TenantEntity { * 事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线 */ @ApiModelProperty(value = "事业线;1-川渝事业线,2-广东事业线,3-湖北事业线,4-云贵事业线") - private Integer businessLine; + private String businessLine; /** * 使用单位 */ @@ -57,17 +57,17 @@ public class BasicForkliftEntity extends TenantEntity { * 供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛 */ @ApiModelProperty(value = "供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛") - private Integer supplier; + private String supplier; /** * 资产类型;1-自有,2-租凭 */ @ApiModelProperty(value = "资产类型;1-自有,2-租凭") - private Integer assetType; + private String assetType; /** * 类型;1-高叉,2-托盘车,3-坐叉 */ @ApiModelProperty(value = "类型;1-高叉,2-托盘车,3-坐叉") - private Integer forkliftType; + private String forkliftType; /** * 摘要 */ @@ -154,7 +154,7 @@ public class BasicForkliftEntity extends TenantEntity { * 付款方式;1-先付后租,2-先租后付 */ @ApiModelProperty(value = "付款方式;1-先付后租,2-先租后付") - private Integer paymentMethod; + private String paymentMethod; /** * 备注 */