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/api/asoldparthandle/AsOldparthandle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java index 92ccce47f3..c6a5ac7858 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java @@ -64,6 +64,8 @@ public class AsOldparthandle extends BaseEntity { private String goodsSkuCode; // 图号 @ApiModelProperty("厂家") private String manufacturerName; // 厂家 + @ApiModelProperty("供应商") + private String supplierName; @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 @ApiModelProperty("单位") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java index 380bad2e9c..5b193f5303 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java @@ -65,6 +65,8 @@ public class AsOldparthandleDetailsVo implements Vo { private String goodsSkuCode; // 图号 @ApiModelProperty("厂家") private String manufacturerName; // 厂家 + @ApiModelProperty("供应商") + private String supplierName; @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 @ApiModelProperty("单位") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java index 4bb695a3f0..877401a4a3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java @@ -65,6 +65,8 @@ public class AsOldparthandleDto implements Dto { private String goodsSkuCode; // 图号 @ApiModelProperty("厂家") private String manufacturerName; // 厂家 + @ApiModelProperty("供应商") + private String supplierName; @ApiModelProperty("规格") private String goodsSkuOwnSpec; // 规格 @ApiModelProperty("单位") 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 59367ed58f..bf7f53d4c5 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); }