[feat]售后管理:

售后客诉通知
新增客诉通知单导出功能

ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesComplaintNoticeController.java

@@ -70,11 +70,11 @@ public class AftersalesComplaintNoticeController extends BaseController
     @Log(title = "售后客诉通知单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(AftersalesComplaintNotice aftersalesComplaintNotice)
+    public AjaxResult export(AftersalesComplaintNoticeDetail aftersalesComplaintNoticeDetail)
     {
-        List<AftersalesComplaintNotice> list = aftersalesComplaintNoticeService.selectAftersalesComplaintNoticeList(aftersalesComplaintNotice);
+        List<AftersalesComplaintNoticeDetail> complaintNoticeDetails = complaintNoticeDetailService.selectAftersalesComplaintNoticeDetailList(aftersalesComplaintNoticeDetail);
-        ExcelUtil<AftersalesComplaintNotice> util = new ExcelUtil<AftersalesComplaintNotice>(AftersalesComplaintNotice.class);
+        ExcelUtil<AftersalesComplaintNoticeDetail> util = new ExcelUtil<AftersalesComplaintNoticeDetail>(AftersalesComplaintNoticeDetail.class);
-        return util.exportExcel(list, "售后客诉通知单数据");
+        return util.exportExcel(complaintNoticeDetails, "售后客诉通知单数据");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AftersalesComplaintNoticeDetail.java

@@ -19,12 +19,14 @@ public class AftersalesComplaintNoticeDetail extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 客诉通知详情ID */
+    @Excel(name = "编号", sort = 1)
     private Long complaintNoticeDetailId;
 
     /** 客诉通知单号 */
     private String complaintNoticeCode;
 
     /** 关联生产订单号 */
+    @Excel(name = "订单号", sort = 6)
     private String makeNo;
 
     /** 用户ID */
@@ -38,69 +40,67 @@ public class AftersalesComplaintNoticeDetail extends BaseEntity
     private String emergencyDegree;
 
     /** 客诉问题 */
-    @Excel(name = "客诉问题")
+    @Excel(name = "客诉问题",sort = 9)
     private String complaintProblem;
 
     /** 是否结案 */
+    @Excel(name = "是否结案",sort = 11)
     private String closingProcedures;
 
     /** 不良报告问题 */
-    @Excel(name = "不良报告问题")
+    @Excel(name = "不良图片",sort = 10)
     private String adverseReportUrl;
 
     /** 客户ID */
+    @Excel(name = "客户代码", sort = 3)
     private String customerId;
 
     /** 客户名称 */
+    @Excel(name = "客户名称", sort = 2)
     private String customerName;
 
     /** 设备型号 */
+    @Excel(name = "设备型号", sort = 5)
     private String deviceModelCode;
 
     /** 设备名称 */
+    @Excel(name = "设备名称", sort = 4)
     private String deviceModelName;
 
     /** SN号（产品序列号） */
-    @Excel(name = "SN号", readConverterExp = "产=品序列号")
+    @Excel(name = "SN号", readConverterExp = "产品序列号")
     private String snCode;
 
     /** 设备流水号 */
+    @Excel(name = "设备编号", sort = 7)
     private String deviceRunningNumber;
 
     /** 料号 */
-    @Excel(name = "料号")
     private String materialNo;
 
     /** 物料名称 */
-    @Excel(name = "物料名称")
     private String materialName;
 
     /** 物料类型 */
-    @Excel(name = "物料类型")
     private String materialType;
 
     /** 物料图片地址 */
-    @Excel(name = "物料图片地址")
     private String materialPhotourl;
 
     /** 物料品牌 */
-    @Excel(name = "物料品牌")
     private String materialBrand;
 
     /** 物料单位 */
-    @Excel(name = "物料单位")
     private String materialUnit;
 
     /** 物料描述 */
-    @Excel(name = "物料描述")
     private String materialDescribe;
 
     /** 物料加工方式 */
-    @Excel(name = "物料加工方式")
     private String materialProcessMethod;
 
     /** 已出库数量 */
-    @Excel(name = "已出库数量")
+    @Excel(name = "交货数量",sort = 8)
     private String shippedGoodsSum;
 
     /** 物料数合计 */
@@ -109,6 +109,10 @@ public class AftersalesComplaintNoticeDetail extends BaseEntity
     /** 数量合计 */
     private String enterpriseSum;
 
+    /** 备注 */
+    @Excel(name = "交货数量",sort = 12)
+    private String remark;
+
     /** 客诉通知相关物料数据 */
     private List<AftersalesMaterialVO> aftersalesMaterialVOs;
     public void setComplaintNoticeDetailId(Long complaintNoticeDetailId) 
@@ -346,6 +350,16 @@ public class AftersalesComplaintNoticeDetail extends BaseEntity
         return enterpriseSum;
     }
 
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public List<AftersalesMaterialVO> getAftersalesMaterialVOs() {
         return aftersalesMaterialVOs;
     }

ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/complaintNotice.html

@@ -73,8 +73,6 @@
         var editFlag = [[${@permission.hasPermi('aftersales:complaintNotice:edit')}]];
         var detailFlag = [[${@permission.hasPermi('aftersales:complaintNotice:detail')}]];
         var removeFlag = [[${@permission.hasPermi('aftersales:complaintNotice:remove')}]];
-        var cancelFlag = [[${@permission.hasPermi('aftersales:complaintNotice:cancel')}]];
-        var restoreFlag = [[${@permission.hasPermi('aftersales:complaintNotice:restore')}]];
         var emergencyDegreeDatas = [[${@dict.getType('aftersales_emergency_degree')}]];
         var closingProceduresDatas = [[${@dict.getType('aftersales_closing_procedures')}]];
         var prefix = ctx + "aftersales/complaintNotice";