From 2efbfc676643aa3636e7b05eb3a0e5261726baa5 Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 31 Mar 2023 14:06:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/biz/controller/BizVisitController.java | 1 + .../serve/modules/bms/controller/BmsChannelController.java | 2 ++ .../modules/bms/controller/BmsCostCenterController.java | 2 +- .../serve/modules/bms/controller/BmsFactoryController.java | 1 + .../serve/modules/bms/controller/BmsSubjectController.java | 2 +- .../modules/bms/controller/BmsSubjectFormController.java | 1 + .../bms/controller/BmsSupplierVisitFormController.java | 1 + .../bms/controller/BmsSupplierVisitTypeController.java | 1 + .../java/com/qs/serve/modules/bms/entity/BmsChannel.java | 2 ++ .../com/qs/serve/modules/bms/entity/BmsChannelPoint.java | 3 +++ .../java/com/qs/serve/modules/bms/entity/BmsSupplier.java | 1 + .../qs/serve/modules/bms/entity/BmsSupplierVisitForm.java | 2 ++ .../modules/goods/controller/GoodsCategoryController.java | 1 + .../com/qs/serve/modules/goods/entity/GoodsSpecValue.java | 1 + .../java/com/qs/serve/modules/goods/entity/GoodsSpu.java | 2 ++ .../com/qs/serve/modules/pay/entity/so/PayPaymentSo.java | 4 ++++ .../qs/serve/modules/qms/controller/QmsGroupController.java | 3 +++ src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java | 5 +++++ .../serve/modules/tbs/controller/TbsCostApplyController.java | 2 ++ .../qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java | 1 + src/main/java/com/qs/serve/modules/wx/entity/WxUser.java | 3 +++ src/main/resources/mapper/bms/BmsChannelPointMapper.xml | 1 + src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml | 1 + src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml | 1 + src/main/resources/mapper/bms/BmsSupplierMapper.xml | 1 + src/main/resources/mapper/goods/GoodsSkuMapper.xml | 1 + src/main/resources/mapper/goods/GoodsSpuMapper.xml | 4 ++-- src/main/resources/mapper/sys/SysUserMapper.xml | 4 ++-- 28 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java index d9b82495..a9c1ff34 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java @@ -41,6 +41,7 @@ public class BizVisitController { public R> getPage(BizVisit param){ PageUtil.startPage(); LambdaQueryWrapper visitWrapper = new LambdaQueryWrapper<>(param); + visitWrapper.orderByDesc(BizVisit::getId); List list = bizVisitService.list(visitWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index d4a4796f..9f928bd9 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.bms.entity.BmsChannelPoint; +import com.qs.serve.modules.bms.entity.BmsSupplierVisitType; import com.qs.serve.modules.bms.service.BmsChannelPointService; import com.qs.serve.modules.tbs.entity.TbsActivityChannel; import com.qs.serve.modules.tbs.service.TbsActivityChannelService; @@ -48,6 +49,7 @@ public class BmsChannelController { public R> getPage(BmsChannel param){ PageUtil.startPage(); LambdaQueryWrapper channelWrapper = new LambdaQueryWrapper<>(param); + channelWrapper.orderByDesc(BmsChannel::getCreateTime); List list = bmsChannelService.list(channelWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java index bc99f3ea..bdab559b 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java @@ -58,7 +58,7 @@ public class BmsCostCenterController { if(loadByCurrent!=null&&loadByCurrent.equals(1)){ return getTreeByCurrentUser(); } - List list = bmsCostCenterService.list(); + List list = bmsCostCenterService.list(new LambdaQueryWrapper().orderByDesc(BmsCostCenter::getId)); List treeVoList = list.stream().map(obj->{ BmsCostCenterTreeVo treeNode = CopierUtil.copy(obj,new BmsCostCenterTreeVo()); treeNode.setId(obj.getId().toString()); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java index 750944dc..a413601f 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java @@ -48,6 +48,7 @@ public class BmsFactoryController { public R> getPage(BmsFactory param){ PageUtil.startPage(); LambdaQueryWrapper factoryWrapper = new LambdaQueryWrapper<>(param); + factoryWrapper.orderByDesc(BmsFactory::getCreateTime); List list = bmsFactoryService.list(factoryWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java index 771cc1a8..fb8815d6 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java @@ -55,7 +55,7 @@ public class BmsSubjectController { @GetMapping("/tree") @PreAuthorize("hasRole('bms:subject:query')") public R> getPage(String supplierId){ - List subjectList = bmsSubjectService.list(); + List subjectList = bmsSubjectService.list(new LambdaQueryWrapper().orderByDesc(BmsSubject::getId)); List treeVoList = subjectList.stream().map(subject->{ BmsSubjectTreeVo treeNode = CopierUtil.copy(subject,new BmsSubjectTreeVo()); treeNode.setId(subject.getId().toString()); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java index 33206958..49a165f4 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java @@ -44,6 +44,7 @@ public class BmsSubjectFormController { public R> getPage(BmsSubjectForm param){ BmsSubjectForm entity = CopierUtil.copy(param,new BmsSubjectForm()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + lqw.orderByDesc(BmsSubjectForm::getId); PageUtil.startPage(); List list = bmsSubjectFormService.list(lqw); return R.byPageHelperList(list); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java index ad1fd87f..6e3d021e 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java @@ -56,6 +56,7 @@ public class BmsSupplierVisitFormController { public R> getPage(BmsSupplierVisitForm param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); PageUtil.startPage(); + lqw.orderByDesc(BmsSupplierVisitForm::getCreateTime); List list = bmsSupplierVisitFormService.list(lqw); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java index 12c2ca65..3a5ced57 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java @@ -59,6 +59,7 @@ public class BmsSupplierVisitTypeController { public R> getPage(BmsSupplierVisitType param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); PageUtil.startPage(); + lqw.orderByDesc(BmsSupplierVisitType::getCreateTime); List list = bmsSupplierVisitTypeService.list(lqw); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java index 4ecd3968..1fc8056c 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java @@ -32,11 +32,13 @@ public class BmsChannel implements Serializable { /** 渠道编码 */ @NotBlank(message = "渠道编码不能为空") @Length(max = 50,message = "渠道编码长度不能超过50字") + @TableField(condition = SqlCondition.LIKE) private String channelCode; /** 渠道名称 */ @NotBlank(message = "渠道名称不能为空") @Length(max = 30,message = "渠道名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String channelName; /** 渠道类型(读取数据字典) */ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java index 3e9e494b..e0e4e68d 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java @@ -33,16 +33,19 @@ public class BmsChannelPoint implements Serializable { @NotNull(message = "渠道名称不能为空") private Long channelId; + @TableField(condition = SqlCondition.LIKE) private String channelName; /** 站点编码 */ @NotBlank(message = "站点编码不能为空") @Length(max = 50,message = "站点编码长度不能超过50字") + @TableField(condition = SqlCondition.LIKE) private String pointCode; /** 站点名称 */ @NotBlank(message = "站点名称不能为空") @Length(max = 30,message = "站点名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String pointName; /** 店铺面积 */ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index a1e5a44b..f1049106 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -78,6 +78,7 @@ public class BmsSupplier implements Serializable { /** 客户编码 */ @NotBlank(message = "客户编码不能为空") @Length(max = 20,message = "客户编码长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) private String code; /** 父级id */ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java index 2b2a1a14..764b1b5f 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitForm.java @@ -34,10 +34,12 @@ public class BmsSupplierVisitForm implements Serializable { /** 标题 */ @NotBlank(message = "标题不能为空") @Length(max = 40,message = "标题长度不能超过40字") + @TableField(condition = SqlCondition.LIKE) private String title; /** 子标题 */ @Length(max = 255,message = "子标题长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String subtitle; /** 描述 */ diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 5ab0af38..7d3bcd2e 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -59,6 +59,7 @@ public class GoodsCategoryController { public R> getMgrPage(GoodsCategory param){ PageUtil.startPage(); LambdaQueryWrapper categoryWrapper = new LambdaQueryWrapper<>(param); + categoryWrapper.orderByDesc(GoodsCategory::getId); List list = goodsCategoryService.list(categoryWrapper); return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpecValue.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpecValue.java index 71fb8832..88f7b4fe 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpecValue.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpecValue.java @@ -36,6 +36,7 @@ public class GoodsSpecValue implements Serializable { /** 名称 */ @NotBlank(message = "名称不能为空") @Length(max = 50,message = "名称长度不能超过50字") + @TableField(condition = SqlCondition.LIKE) private String name; /** 创建时间 */ diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index c3e11cae..372fd0e3 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -34,11 +34,13 @@ public class GoodsSpu implements Serializable { /** 商品编码 */ @NotBlank(message = "商品编码不能为空") @Length(max = 32,message = "商品编码长度不能超过32字") + @TableField(condition = SqlCondition.LIKE) private String spuCode; /** 商品名字 */ @NotBlank(message = "商品名字不能为空") @Length(max = 200,message = "商品名字长度不能超过200字") + @TableField(condition = SqlCondition.LIKE) private String name; /** 一级分类、品牌ID */ diff --git a/src/main/java/com/qs/serve/modules/pay/entity/so/PayPaymentSo.java b/src/main/java/com/qs/serve/modules/pay/entity/so/PayPaymentSo.java index 2a479e75..5478b492 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/so/PayPaymentSo.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/so/PayPaymentSo.java @@ -52,5 +52,9 @@ public class PayPaymentSo implements Serializable { /** 取消标识 */ private Integer cancelFlag; + + /** 发票编号 */ + private String billNumber; + } diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java index 339f1230..b46081f1 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java @@ -65,6 +65,9 @@ public class QmsGroupController { @GetMapping("/page") @PreAuthorize("hasRole('qms:group:query')") public R> getPage(QmsGroup param){ + if(!StringUtils.hasText(param.getName())){ + param.setName(param.getTitle()); + } PageUtil.startPage(); LambdaQueryWrapper groupWrapper = new LambdaQueryWrapper<>(param); groupWrapper.orderByDesc(QmsGroup::getCreateTime); diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java index 07c58d10..35b138d7 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java @@ -38,6 +38,7 @@ public class QmsGroup implements Serializable { /** 标题 */ @NotBlank(message = "标题不能为空") @Length(max = 20,message = "标题长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) private String name; /** 描述 */ @@ -131,5 +132,9 @@ public class QmsGroup implements Serializable { @TableField(exist = false) private Integer finished; + /** 纠正 管理页面查询参数 */ + @TableField(exist = false) + private String title; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 758196b3..63b10f6e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -106,6 +106,7 @@ public class TbsCostApplyController { public R> getList(TbsCostApplyVo param){ TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); + lqw.orderByDesc(TbsCostApply::getId); PageUtil.startPage(); List list = tbsCostApplyService.list(lqw); return R.ok(list); @@ -127,6 +128,7 @@ public class TbsCostApplyController { TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); lqw.in(TbsCostApply::getCreateBy,userIds); + lqw.orderByDesc(TbsCostApply::getId); PageUtil.startPage(); List list = tbsCostApplyService.list(lqw); return R.ok(list); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java index bb02f1a9..806046d8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplateLog.java @@ -38,6 +38,7 @@ public class TbsActivityTemplateLog implements Serializable { /** 模板名称 */ @NotBlank(message = "模板名称不能为空") @Length(max = 30,message = "模板名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) private String templateName; /** 操作状态：0：关闭；1-开启；2-删除；3-修改 */ diff --git a/src/main/java/com/qs/serve/modules/wx/entity/WxUser.java b/src/main/java/com/qs/serve/modules/wx/entity/WxUser.java index 503e6c69..a7fb625d 100644 --- a/src/main/java/com/qs/serve/modules/wx/entity/WxUser.java +++ b/src/main/java/com/qs/serve/modules/wx/entity/WxUser.java @@ -59,9 +59,11 @@ public class WxUser implements Serializable { private String openId; /** wx昵称 */ + @TableField(condition = SqlCondition.LIKE) private String nickName; /** 员工昵称 */ + @TableField(condition = SqlCondition.LIKE) private String empName; /** 性别（1：男，2：女，0：未知） */ @@ -77,6 +79,7 @@ public class WxUser implements Serializable { private String province; /** 手机号码 */ + @TableField(condition = SqlCondition.LIKE) private String phone; /** 用户语言 */ diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml index 54e97806..540e5a06 100644 --- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml +++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml @@ -90,6 +90,7 @@ and `bms_channel_point`.`update_by` = #{query.updateBy} and `bms_channel_point`.`cost_flag` = #{query.costFlag} + ORDER BY `bms_channel_point`.`create_time` DESC diff --git a/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml b/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml index 4c188652..34253ed7 100644 --- a/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml @@ -79,6 +79,7 @@ and `bms_supplier`.`name` like concat('%',#{query.supplierName},'%') and `bms_supplier`.`code` like concat('%',#{query.supplierCode},'%') + ORDER BY `bms_supplier_address`.`create_time` DESC diff --git a/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml b/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml index f30af84b..d54a4250 100644 --- a/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierChannelMapper.xml @@ -58,6 +58,7 @@ and `bms_channel`.`del_flag` = '0' and `bms_supplier`.`del_flag` = '0' + ORDER BY `bms_supplier_channel`.`create_time` DESC diff --git a/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/src/main/resources/mapper/bms/BmsSupplierMapper.xml index 5562f086..53dc7209 100644 --- a/src/main/resources/mapper/bms/BmsSupplierMapper.xml +++ b/src/main/resources/mapper/bms/BmsSupplierMapper.xml @@ -110,6 +110,7 @@ + ORDER BY `bms_supplier`.`update_time` DESC diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index 41a438c7..fadb6c0d 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -128,6 +128,7 @@ + ORDER BY `goods_sku`.`create_date` DESC