From ac33353a33f3be5aa991fcad3719c5ac1edcaaa6 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 Apr 2024 17:05:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E9=A1=B9=E7=9B=AE=E9=80=89=E7=BB=B4=E4=BF=AE=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/as/api/asbusrepairbill/SitemVo.java | 4 +++- .../AsBusrepairBillService.java | 24 +++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java index 50035aa7b5..2329a5c314 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java @@ -42,6 +42,7 @@ public class SitemVo { private String amount; @ApiModelProperty("备注") private String remarks; + private String repairerName; //-------------维修人员--------------- // @ApiModelProperty("维修人员sid") // private String repairerSid; @@ -51,6 +52,7 @@ public class SitemVo { // private String groupSid; // @ApiModelProperty("所在班组名称") // private String groupName; - private List staffList = new ArrayList<>(); //维修人员信息 + private List staffList = new ArrayList<>(); //维修人员Sid + private List staffNameList = new ArrayList<>(); //维修人员姓名信息 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 1c7ec2786b..c25c95f70f 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -265,16 +265,21 @@ public class AsBusrepairBillService extends MybatisBaseService staffList = sitemVo.getStaffList(); + List staffList = sitemVo.getStaffList(); + List staffNameList = sitemVo.getStaffNameList(); if (!staffList.isEmpty()) { - for (ReparirerStaffVo staffVo : staffList) { + for (int i = 0; i < staffList.size(); i++) { AsBusrepairBillSitemRepairer repairer = new AsBusrepairBillSitemRepairer(); - BeanUtil.copyProperties(staffVo, repairer, "id", "sid"); + repairer.setRepairerSid(staffList.get(i)); + if (StringUtils.isNotBlank(staffNameList.get(i))) { + repairer.setRepairerName(staffNameList.get(i)); + } repairer.setBillSid(sid); if (StringUtils.isNotBlank(sitemVo.getServiceItemSid())) { repairer.setRepairitemSid(sitemVo.getServiceItemSid()); } asBusrepairBillSitemRepairerService.insert(repairer); + } } } @@ -416,13 +421,18 @@ public class AsBusrepairBillService extends MybatisBaseService repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid()); if (!repairers.isEmpty()) { - List staffList = new ArrayList<>(); //维修人员信息 + List staffList = new ArrayList<>(); //维修人员信息 + List staffNameList = new ArrayList<>(); //维修人员信息 for (AsBusrepairBillSitemRepairer repairer : repairers) { - ReparirerStaffVo staffVo = new ReparirerStaffVo(); - BeanUtil.copyProperties(repairer, staffVo); - staffList.add(staffVo); + if (StringUtils.isNotBlank(repairer.getRepairerSid())) { + staffList.add(repairer.getRepairerSid()); + } + if (StringUtils.isNotBlank(repairer.getRepairerName())) { + staffNameList.add(repairer.getRepairerName()); + } } sitemVo.setStaffList(staffList); + sitemVo.setStaffNameList(staffNameList); } sitemVos.add(sitemVo); } From 2a4df665c981ff90e3d38fc6fc1add2cb9f71557 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 29 Apr 2024 17:33:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=8E=A5=E5=8F=A3=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/api/base/common/CommonFeign.java | 2 +- .../terminal/api/base/common/SystemVo2.java | 21 +++++++++++++++++++ .../terminal/biz/base/common/CommonRest.java | 2 +- .../biz/base/common/CommonService.java | 6 +++--- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo2.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index 5bcc766c9b..ace35100df 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -36,7 +36,7 @@ public interface CommonFeign { @ApiOperation(value = "获取采购系统名称") @ResponseBody @GetMapping("/getSystem") - ResultBean> getSystem(@RequestParam("orgPath") String orgPath); + ResultBean> getSystem(@RequestParam("orgPath") String orgPath); @ApiOperation(value = "获取金融部门主管") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo2.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo2.java new file mode 100644 index 0000000000..0231c01263 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/SystemVo2.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.base.common; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/29 + **/ +@Data +public class SystemVo2 { + + @ApiModelProperty("部门sid") + @JsonProperty("dictKey") + private String deptSid; + @ApiModelProperty("采购系统名称") + @JsonProperty("dictValue") + private String purchaseSystemName; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java index 3ab5ef372c..1d8a2c53cc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -35,7 +35,7 @@ public class CommonRest implements CommonFeign { } @Override - public ResultBean> getSystem(String orgPath) { + public ResultBean> getSystem(String orgPath) { return commonService.getSystem(orgPath); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index f4cd0235ee..c059b842ed 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -63,10 +63,10 @@ public class CommonService { return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } - public ResultBean> getSystem(String orgPath) { - ResultBean> rb = ResultBean.fireFail(); + public ResultBean> getSystem(String orgPath) { + ResultBean> rb = ResultBean.fireFail(); ResultBean> resultBean = basePurchaseSystemFeign.fetchDetailsByUseOrgPath(orgPath); - List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); + List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo2.class)).collect(Collectors.toList()); return rb.success().setData(list); } From e5c05ab700361b85ed58c4f08579f8a94b46ad1a Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 Apr 2024 17:38:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B6=E4=BB=96=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/as/api/asbusrepairbill/SettleVo.java | 4 +++- .../java/com/yxt/anrui/as/feign/fms/FmsReceivesettle.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SettleVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SettleVo.java index dcb0376329..9186d68ffb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SettleVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SettleVo.java @@ -27,8 +27,10 @@ public class SettleVo { private String settleAmount; // 结算金额 @ApiModelProperty("其他结算方式") private String otherSettleKey; // 其他结算方式 + @ApiModelProperty("其他结算方式") + private String otherSettleValue; // 其他结算方式 @ApiModelProperty("其他结算金额") - private String otherSettleValue; // 其他结算金额 + private String otherSettleAmount; // 其他结算金额 @ApiModelProperty("欠款金额") private String debts; // 欠款金额 @ApiModelProperty("结算时间") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fms/FmsReceivesettle.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fms/FmsReceivesettle.java index dd9f6c93cd..096fef9bd0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/fms/FmsReceivesettle.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/fms/FmsReceivesettle.java @@ -80,8 +80,10 @@ public class FmsReceivesettle extends BaseEntity { private BigDecimal settleAmount; // 结算金额 @ApiModelProperty("其他结算方式") private String otherSettleKey; // 其他结算方式 - @ApiModelProperty("其他结算金额") - private String otherSettleValue; // 其他结算金额 + @ApiModelProperty("其他结算方式") + private String otherSettleValue; // 其他结算方式 + @ApiModelProperty("其他结算金额") + private String otherSettleAmount; // 其他结算金额 @ApiModelProperty("欠款金额") private BigDecimal debts; // 欠款金额 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") From a4b0da4a3d3c7a7fcd3c07a61326316af9175159 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 Apr 2024 17:46:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95sid=E6=9F=A5=E8=AF=A2=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillDetailRest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java index f75c5f8527..c8d6f78999 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java @@ -23,9 +23,9 @@ public class AsBusrepairInventorybillDetailRest { @PostMapping("getDetailsByBillSid") @ApiOperation("根据工单sid查询商品明细") - ResultBean> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid) { + ResultBean> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid,@RequestParam("busTypeKey") String busTypeKey) { ResultBean rb = ResultBean.fireFail(); - List list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid); + List list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid,busTypeKey); return rb.success().setData(list); } }