Merge remote-tracking branch 'origin/master'

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<List<SystemVo>> getSystem(@RequestParam("orgPath") String orgPath);
+    ResultBean<List<SystemVo2>> getSystem(@RequestParam("orgPath") String orgPath);
 
     @ApiOperation(value = "获取金融部门主管")
     @ResponseBody

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;
+}

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<List<SystemVo>> getSystem(String orgPath) {
+    public ResultBean<List<SystemVo2>> getSystem(String orgPath) {
         return commonService.getSystem(orgPath);
     }
 

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<List<SystemVo>> getSystem(String orgPath) {
-        ResultBean<List<SystemVo>> rb = ResultBean.fireFail();
+    public ResultBean<List<SystemVo2>> getSystem(String orgPath) {
+        ResultBean<List<SystemVo2>> rb = ResultBean.fireFail();
         ResultBean<List<AppBasePurchSystemVo>> resultBean = basePurchaseSystemFeign.fetchDetailsByUseOrgPath(orgPath);
-        List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
+        List<SystemVo2> 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);
     }
 

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("结算时间")

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/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);
                 }

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<List<AsBusrepairInventorybillDetail>> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid) {
+    ResultBean<List<AsBusrepairInventorybillDetail>> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid,@RequestParam("busTypeKey") String busTypeKey) {
         ResultBean rb = ResultBean.fireFail();
-        List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid);
+        List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid,busTypeKey);
         return rb.success().setData(list);
     }
 }

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")