From bd18dfde83cb15cd9d12cd5224c5b737123f6df7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 8 May 2024 16:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/apiadmin/pms/PmsSupplierInfoRest.java | 4 +- .../PmsPurchaseBillDetailsVo.java | 10 ++++- .../PmsSupplierBankChoice.java | 43 +++++++++++++++++++ .../PmsSupplierInfoChoice.java | 13 ++++++ .../PmsSupplierInfoMapper.java | 2 +- .../PmsSupplierInfoService.java | 25 ++++++++--- 6 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierBank/PmsSupplierBankChoice.java diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java index 1bab983f8d..fac5fbc986 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java @@ -89,9 +89,9 @@ public class PmsSupplierInfoRest { @ApiOperation("选择供应商") @PostMapping("/choiceSupplierInfo") - public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){ + public ResultBean> choiceSupplierInfo(@RequestParam("orgPath") String orgPath){ ResultBean rb = ResultBean.fireFail(); - List baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(createOrgSid); + List baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(orgPath); return rb.success().setData(baseSupplierInfoChoiceList); } } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java index a811b34201..5273068ac8 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java @@ -66,6 +66,12 @@ public class PmsPurchaseBillDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; @ApiModelProperty("制单人sid") private String createBySid; @ApiModelProperty("制单人姓名") @@ -104,7 +110,7 @@ public class PmsPurchaseBillDetailsVo implements Vo { private String purchaserName; @ApiModelProperty("预计到货日期") @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss", + pattern = "yyyy-MM-dd", timezone = "GMT+8" ) private Date deliveryDate; @@ -129,7 +135,7 @@ public class PmsPurchaseBillDetailsVo implements Vo { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("办结时间") private Date finishTime; // 办结时间 diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierBank/PmsSupplierBankChoice.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierBank/PmsSupplierBankChoice.java new file mode 100644 index 0000000000..2629f44d3e --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierBank/PmsSupplierBankChoice.java @@ -0,0 +1,43 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.pms.biz.pms.pmssupplierBank; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "供应商开户行信息", description = "供应商开户行信息") +public class PmsSupplierBankChoice extends BaseEntity { + + @ApiModelProperty("开户行") + private String bankName; + @ApiModelProperty("开户行帐号") + private String bankAccount; + @ApiModelProperty("账户名称") + private String accountName; +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java index c3380ac972..07344fe496 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java @@ -27,10 +27,14 @@ package com.yxt.pms.biz.pms.pmssupplierinfo; import com.yxt.common.core.vo.Vo; +import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankChoice; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.List; + /** * Project: yxt-base(供应商管理)
* File: BaseSupplierInfoVo.java
@@ -51,4 +55,13 @@ public class PmsSupplierInfoChoice implements Vo { private String sid; @ApiModelProperty("供应商名称") private String supplierName; + @ApiModelProperty("开票类型key") + private String billingTypeKey; + @ApiModelProperty("开票类型value") + private String billingTypeValue; + @ApiModelProperty("税率") + private BigDecimal taxRate; + + @ApiModelProperty("开户行信息") + private List supplierBankChoices; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java index c0aa7cde41..0ea324ac25 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java @@ -62,7 +62,7 @@ public interface PmsSupplierInfoMapper extends BaseMapper { @Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}") int updateBySidIsDelete(String sid); - @Select("select * from yxt_base.base_supplier_info") + @Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid}") List choiceSupplierInfo(String createOrgSid); @Select("select * from yxt_base.base_supplier_info where sid = #{sid}") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java index 68066222ac..f80cc47c06 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java @@ -30,13 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; -import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBank; -import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankDetailsVo; -import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankDto; -import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankService; +import com.yxt.pms.biz.pms.pmssupplierBank.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierBankDto; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoFeign; @@ -67,6 +65,8 @@ public class PmsSupplierInfoService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsSupplierInfoQuery query = pq.getParams(); @@ -142,8 +142,23 @@ public class PmsSupplierInfoService extends MybatisBaseService choiceSupplierInfo(String createOrgSid) { + public List choiceSupplierInfo(String orgPath) { + String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); List pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid); + for (PmsSupplierInfoChoice pmsSupplierInfoChoice : pmsSupplierInfoChoiceList) { + List pmsSupplierBankChoices = new ArrayList<>(); + List pmsSupplierBankDetailsVos = pmsSupplierBankService.selectBySupplierSid(pmsSupplierInfoChoice.getSid()); + if (pmsSupplierBankDetailsVos != null && pmsSupplierBankDetailsVos.size() > 0){ + for (PmsSupplierBankDetailsVo pmsSupplierBankDetailsVo : pmsSupplierBankDetailsVos) { + PmsSupplierBankChoice pmsSupplierBankChoice = new PmsSupplierBankChoice(); + pmsSupplierBankChoice.setBankName(pmsSupplierBankDetailsVo.getBankName()); + pmsSupplierBankChoice.setBankAccount(pmsSupplierBankDetailsVo.getBankAccount()); + pmsSupplierBankChoice.setAccountName(pmsSupplierBankDetailsVo.getAccountName()); + pmsSupplierBankChoices.add(pmsSupplierBankChoice); + } + } + pmsSupplierInfoChoice.setSupplierBankChoices(pmsSupplierBankChoices); + } return pmsSupplierInfoChoiceList; } } \ No newline at end of file