Merge remote-tracking branch 'origin/master'

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<ReparirerStaffVo> staffList = new ArrayList<>(); //维修人员信息
+    private List<String> staffList = new ArrayList<>(); //维修人员Sid
+    private List<String> staffNameList = new ArrayList<>(); //维修人员姓名信息
 
 }

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("单位")

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("单位")

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("单位")

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -265,16 +265,21 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     BeanUtil.copyProperties(sitemVo, sitem, "id", "sid");
                     sitem.setBillSid(sid);
                     asBusrepairBillSitemService.insert(sitem);
-                    List<ReparirerStaffVo> staffList = sitemVo.getStaffList();
+                    List<String> staffList = sitemVo.getStaffList();
+                    List<String> 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<AsBusrepairBillMa
                     BeanUtil.copyProperties(sitem, sitemVo);
                     List<AsBusrepairBillSitemRepairer> repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(sid, sitem.getServiceItemSid());
                     if (!repairers.isEmpty()) {
-                        List<ReparirerStaffVo> staffList = new ArrayList<>(); //维修人员信息
+                        List<String> staffList = new ArrayList<>(); //维修人员信息
+                        List<String> 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);
                 }