From 9eb84ce16190cf2da81607d00d7e508979c5b9ef Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 25 Mar 2024 15:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A7=E6=AC=BE=E5=AF=B9?= =?UTF-8?q?=E8=B4=A6=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BmsSupplierStatementController.java | 19 ++++---- .../bms/entity/BmsSupplierStatement.java | 5 ++ .../service/BmsSupplierStatementService.java | 3 ++ .../impl/BmsSupplierStatementServiceImpl.java | 46 +++++++++++++++++++ 4 files changed, 63 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java index 5736cb09..252938d2 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java @@ -38,7 +38,7 @@ public class BmsSupplierStatementController { * @param param * @return */ - //@GetMapping("/list") + @GetMapping("/list") //@PreAuthorize("hasRole('bms:supplierStatement:query')") public R> getList(BmsSupplierStatement param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); @@ -51,7 +51,7 @@ public class BmsSupplierStatementController { * @param param * @return */ - //@GetMapping("/page") + @GetMapping("/page") //@PreAuthorize("hasRole('bms:supplierStatement:query')") public R> getPage(BmsSupplierStatement param){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); @@ -65,7 +65,7 @@ public class BmsSupplierStatementController { * @param id * @return */ - //@GetMapping("/getById/{id}") + @GetMapping("/getById/{id}") @SysLog(module = SystemModule.BASE, title = "客户货款对账单", biz = BizType.QUERY) @PreAuthorize("hasRole('bms:supplierStatement:query')") public R getById(@PathVariable("id") String id){ @@ -93,25 +93,24 @@ public class BmsSupplierStatementController { * @param param * @return */ - //@PostMapping("/save") + @PostMapping("/save") @SysLog(module = SystemModule.BASE, title = "客户货款对账单", biz = BizType.INSERT) //@PreAuthorize("hasRole('bms:supplierStatement:insert')") public R save(@RequestBody @Valid BmsSupplierStatement param){ - boolean result = bmsSupplierStatementService.save(param); + boolean result = bmsSupplierStatementService.saveBmsSupplierStatement(param); return R.isTrue(result); } /** * 删除 - * @param ids + * @param jslId * @return */ - @DeleteMapping("/deleteById/{ids}") + @DeleteMapping("/deleteById/{jslId}") @SysLog(module = SystemModule.BASE, title = "客户货款对账单", biz = BizType.DELETE) //@PreAuthorize("hasRole('bms:supplierStatement:delete')") - public R deleteById(@PathVariable("ids") String ids){ - List idsLong = StringUtils.splitIdLong(ids); - boolean result = bmsSupplierStatementService.removeByIds(idsLong); + public R deleteById(@PathVariable("jslId") String jslId){ + boolean result = bmsSupplierStatementService.deleteBmsSupplierStatement(jslId); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierStatement.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierStatement.java index 5314afb9..a6653fee 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierStatement.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierStatement.java @@ -31,18 +31,23 @@ public class BmsSupplierStatement implements Serializable { @TableId(type = IdType.AUTO) private Long id; + @NotNull + private String jslId; + /** 供应商ID */ @Length(max = 20,message = "供应商ID长度不能超过20字") private String supplierId; /** 供应商编码 */ @Length(max = 255,message = "供应商编码长度不能超过255字") + @NotNull private String supplierCode; /** 供应商名称 */ @Length(max = 255,message = "供应商名称长度不能超过255字") private String supplierName; + private String title; /** 内容 */ private String content; diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierStatementService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierStatementService.java index 96d541fe..42d74e1b 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierStatementService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsSupplierStatementService.java @@ -9,6 +9,9 @@ import com.qs.serve.modules.bms.entity.BmsSupplierStatement; * @date 2024-03-22 */ public interface BmsSupplierStatementService extends IService { + boolean saveBmsSupplierStatement(BmsSupplierStatement param); + + boolean deleteBmsSupplierStatement(String jslId); } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java index 2b730721..fcd50ff3 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java @@ -1,13 +1,21 @@ package com.qs.serve.modules.bms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.util.Assert; +import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.service.BmsSupplierService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.qs.serve.modules.bms.entity.BmsSupplierStatement; import com.qs.serve.modules.bms.service.BmsSupplierStatementService; import com.qs.serve.modules.bms.mapper.BmsSupplierStatementMapper; +import java.util.List; +import java.util.stream.Collectors; + /** * 客户货款对账单 服务实现类 * @author YenHex @@ -18,5 +26,43 @@ import com.qs.serve.modules.bms.mapper.BmsSupplierStatementMapper; @AllArgsConstructor public class BmsSupplierStatementServiceImpl extends ServiceImpl implements BmsSupplierStatementService { + @Autowired + private BmsSupplierService bmsSupplierService; + + public boolean saveBmsSupplierStatement(BmsSupplierStatement param){ + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsSupplier::getCode,param.getSupplierCode()); + List supplierList = bmsSupplierService.list(lqw); + if(supplierList.size()==0){ + Assert.throwEx("没有找到该客户["+param.getSupplierCode()+"]"); + } + + LambdaQueryWrapper statementLambdaQueryWrapper = new LambdaQueryWrapper<>(); + statementLambdaQueryWrapper.eq(BmsSupplierStatement::getJslId,param.getSupplierCode()); + List statementList = this.list(statementLambdaQueryWrapper); + if(statementList.size()>0){ + Assert.throwEx("已存在该ID["+param.getJslId()+"]"); + } + + BmsSupplier supplier = supplierList.get(0); + param.setSupplierId(supplier.getId()); + param.setSupplierName(supplier.getName()); + return this.save(param); + } + + public boolean deleteBmsSupplierStatement(String jslId){ + + LambdaQueryWrapper statementLambdaQueryWrapper = new LambdaQueryWrapper<>(); + statementLambdaQueryWrapper.eq(BmsSupplierStatement::getJslId,jslId); + List statementList = this.list(statementLambdaQueryWrapper); + if(statementList.size()==0){ + Assert.throwEx("不存在该ID["+jslId+"]"); + } + + List ids = statementList.stream().map(a->a.getId()).collect(Collectors.toList()); + + return this.removeBatchByIds(ids); + } }