修改维修工单保存接口

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -125,5 +125,6 @@ public class AsBusrepairBill extends BaseEntity {
     private String  rescueRemarks;
     @ApiModelProperty("外出费备注")
     private String outRemarks;
-
+    @ApiModelProperty("商品登记备注")
+    private String registerRemarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.as.api.asbusrepairbill;
 
+import com.yxt.anrui.as.api.utils.FileUrlQuery;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -157,5 +158,7 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private String outRemarks;
     @ApiModelProperty("施救费")
     private String rescueAmount;
-    private String fileName; //文件名称
+    private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
+    @ApiModelProperty("商品登记备注")
+    private String registerRemarks;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.as.api.asbusrepairbill;
 
+import com.yxt.anrui.as.api.utils.FileUrlQuery;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -141,5 +142,7 @@ public class AsBusrepairBillDto implements Dto {
     private String outRemarks;
     @ApiModelProperty("施救费")
     private String rescueAmount;
-    private String fileName; //文件名称
+    private List<FileUrlQuery> fileName = new ArrayList<>(); //文件名称
+    @ApiModelProperty("商品登记备注")
+    private String registerRemarks;
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asappendix.AsAppendix;
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
 import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
@@ -20,7 +21,9 @@ import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
 import com.yxt.anrui.as.api.astrackbill.AsTrackBillDto;
 import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
 import com.yxt.anrui.as.api.utils.AsRule;
+import com.yxt.anrui.as.api.utils.FileUrlQuery;
 import com.yxt.anrui.as.api.utils.domain.AsBillNo;
+import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
 import com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillService;
 import com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemService;
 import com.yxt.anrui.as.biz.asbusrepairbillinsurance.AsBusrepairBillInsuranceService;
@@ -32,6 +35,7 @@ import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRep
 import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
 import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
 import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService;
+import com.yxt.anrui.as.feign.file.AsFileEnum;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.as.feign.fin.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.as.feign.fms.FmsReceivesettle;
@@ -71,6 +75,8 @@ import java.util.*;
 @Service
 public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMapper, AsBusrepairBill> {
 
+    @Autowired
+    private AsAppendixService asAppendixService;
     @Autowired
     private SysUserFeign sysUserFeign;
     @Autowired
@@ -204,6 +210,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             asBusrepairBillSitemService.delByBillSid(sid);
             asBusrepairBillSitemRepairerService.delByBillSid(sid);
             asBusrepairBillAitemService.delByBillSid(sid);
+            asAppendixService.delByLinkSid(sid);
         } else {
             AsBusrepairBill asBusrepairBill = new AsBusrepairBill();
             sid = asBusrepairBill.getSid();
@@ -349,6 +356,20 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                     asBusrepairInventorybillDetailService.updateById(goods);
                 }
             }
+            //图片
+            List<FileUrlQuery> fileList = dto.getFileName();
+            if (!fileList.isEmpty()) {
+                for (FileUrlQuery query : fileList) {
+                    String filePath = query.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
+                    AsAppendix asAppendix = new AsAppendix();
+                    asAppendix.setLinkSid(sid);
+                    asAppendix.setAttachType(AsFileEnum.WXGD.getAttachType());
+                    asAppendix.setFilePath(filePath);
+                    asAppendixService.save(asAppendix);
+                }
+            }
+
+
         }
         return rb.success().setData(sid);
     }
@@ -505,6 +526,17 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 }
                 vo.setSettleVo(settleVo);
             }
+            List<FileUrlQuery> file = new ArrayList<>();
+            List<AsAppendix> asAppendices = asAppendixService.fetchByLinkSid(sid);
+            if (!asAppendices.isEmpty()) {
+                for (AsAppendix asAppendix : asAppendices) {
+                    FileUrlQuery fileUrlQuery = new FileUrlQuery();
+                    String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
+                    fileUrlQuery.setUrl(url);
+                    file.add(fileUrlQuery);
+                }
+            }
+            vo.setFileName(file);
         }
         return rb.success().setData(vo);
     }

yxt-as/src/main/java/com/yxt/anrui/as/feign/file/AsFileEnum.java

@@ -11,6 +11,7 @@ public enum AsFileEnum {
     ASBWDIFFAPPLY("002", "保外工单应收调差附件"),
     ASBWDIFFAPPLYDETAIL("003", "保外工单应收调差工单附件"),
     ASWXXMBA("004", "维修项目备案附件"),
+    WXGD("005", "维修工单附件")
     ;