Browse Source

debug

contract
Yen 2 years ago
parent
commit
c78283e6b3
  1. 4
      src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
  2. 6
      src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
  3. 2
      src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java
  4. 1
      src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java
  5. 1
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
  6. 1
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
  7. 2
      src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml

4
src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@ -106,6 +106,10 @@ public class BmsSupplierController {
@PostMapping("/page") @PostMapping("/page")
@PreAuthorize("hasRole('bms:supplier:query')") @PreAuthorize("hasRole('bms:supplier:query')")
public R<PageVo<BmsSupplier>> getPage(@RequestBody BmsSupplier param){ public R<PageVo<BmsSupplier>> getPage(@RequestBody BmsSupplier param){
//兼容 前端接错参数
param.setName(param.getSupplierName());
param.setCode(param.getSupplierCode());
if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){ if(param.getLoadByCurrent()!=null&&param.getLoadByCurrent().equals(1)){
PageUtil.setPageSize(param.getPageSize()+""); PageUtil.setPageSize(param.getPageSize()+"");
PageUtil.setPageNum(param.getPageNum()+""); PageUtil.setPageNum(param.getPageNum()+"");

6
src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@ -257,6 +257,12 @@ public class BmsSupplier implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Boolean selectUserIdsFlag; private Boolean selectUserIdsFlag;
@TableField(exist = false)
private String supplierName;
@TableField(exist = false)
private String supplierCode;
public List<String> listBizRegionIds(){ public List<String> listBizRegionIds(){
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add(this.getRegion2First()); list.add(this.getRegion2First());

2
src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@ -159,7 +159,7 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
@Override @Override
public List<BmsChannelPoint> listByChannelId(Long id) { public List<BmsChannelPoint> listByChannelId(Long id) {
LambdaQueryWrapper<BmsChannelPoint> channelPointWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BmsChannelPoint> channelPointWrapper = new LambdaQueryWrapper<>();
channelPointWrapper.eq(BmsChannelPoint::getChannelName,id); channelPointWrapper.eq(BmsChannelPoint::getChannelId,id);
List<BmsChannelPoint> list = this.list(channelPointWrapper); List<BmsChannelPoint> list = this.list(channelPointWrapper);
return list; return list;
} }

1
src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java

@ -135,6 +135,7 @@ public class PayPaymentController {
if(param.getQueryEndTime()!=null){ if(param.getQueryEndTime()!=null){
lqw.le(PayPayment::getPayTime,param.getQueryEndTime()); lqw.le(PayPayment::getPayTime,param.getQueryEndTime());
} }
lqw.orderByDesc(PayPayment::getId);
PageUtil.startPage(); PageUtil.startPage();
List<PayPayment> list = payPaymentService.list(lqw); List<PayPayment> list = payPaymentService.list(lqw);
return R.byPageHelperList(list); return R.byPageHelperList(list);

1
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@ -127,6 +127,7 @@ public class TbsActivityController {
if(param.getPassStartTime()!=null){ if(param.getPassStartTime()!=null){
lqw.ge(TbsActivity::getCostPassTime,param.getPassStartTime()); lqw.ge(TbsActivity::getCostPassTime,param.getPassStartTime());
} }
lqw.orderByDesc(TbsActivity::getId);
PageUtil.startPage(); PageUtil.startPage();
List<TbsActivity> list = tbsActivityService.list(lqw); List<TbsActivity> list = tbsActivityService.list(lqw);
for (TbsActivity activity : list) { for (TbsActivity activity : list) {

1
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -96,6 +96,7 @@ public class VtbVerificationController {
}else if(loadMy!=null&&loadMy.equals(1)){ }else if(loadMy!=null&&loadMy.equals(1)){
lqw.eq(VtbVerification::getCreateBy,AuthContextUtils.getSysUserId()); lqw.eq(VtbVerification::getCreateBy,AuthContextUtils.getSysUserId());
} }
lqw.orderByDesc(VtbVerification::getId);
PageUtil.startPage(); PageUtil.startPage();
List<VtbVerification> list = vtbVerificationService.list(lqw); List<VtbVerification> list = vtbVerificationService.list(lqw);
for (VtbVerification verification : list) { for (VtbVerification verification : list) {

2
src/main/resources/mapper/bms/BmsSupplierAddressMapper.xml

@ -69,7 +69,7 @@
<if test="query.area != null and query.area != ''"> and `bms_supplier_address`.`area` like concat('%',#{query.area},'%') </if> <if test="query.area != null and query.area != ''"> and `bms_supplier_address`.`area` like concat('%',#{query.area},'%') </if>
<if test="query.detail != null and query.detail != ''"> and `bms_supplier_address`.`detail` = #{query.detail}</if> <if test="query.detail != null and query.detail != ''"> and `bms_supplier_address`.`detail` = #{query.detail}</if>
<if test="query.phone != null and query.phone != ''"> and `bms_supplier_address`.`phone` = #{query.phone}</if> <if test="query.phone != null and query.phone != ''"> and `bms_supplier_address`.`phone` = #{query.phone}</if>
<if test="query.receiver != null and query.receiver != ''"> and `bms_supplier_address`.`receiver` = #{query.receiver}</if> <if test="query.receiver != null and query.receiver != ''"> and `bms_supplier_address`.`receiver` like concat('%',#{query.receiver},'%') </if>
<if test="query.remark != null and query.remark != ''"> and `bms_supplier_address`.`remark` = #{query.remark}</if> <if test="query.remark != null and query.remark != ''"> and `bms_supplier_address`.`remark` = #{query.remark}</if>
<if test="query.createTime != null"> and `bms_supplier_address`.`create_time` = #{query.createTime}</if> <if test="query.createTime != null"> and `bms_supplier_address`.`create_time` = #{query.createTime}</if>
<if test="query.updateTime != null"> and `bms_supplier_address`.`update_time` = #{query.updateTime}</if> <if test="query.updateTime != null"> and `bms_supplier_address`.`update_time` = #{query.updateTime}</if>

Loading…
Cancel
Save