wangggziwen 1 сар өмнө
parent
commit
73d8e94cf3

+ 10 - 7
master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiApproveFileController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.production.controller;
 
 import java.util.List;
+
+import com.ruoyi.project.production.domain.TEoegSaiApproveFile;
+import com.ruoyi.project.production.service.ITEoegSaiApproveFileService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,13 +32,13 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 public class TEoegSaiApproveFileController extends BaseController
 {
     @Autowired
-    private ITSaiApproveFileService tSaiApproveFileService;
+    private ITEoegSaiApproveFileService tSaiApproveFileService;
 
     /**
      * 查询SAI审批附件列表
      */
     @GetMapping("/list")
-    public List<TSaiApproveFile> list(TSaiApproveFile tSaiApproveFile)
+    public List<TEoegSaiApproveFile> list(TEoegSaiApproveFile tSaiApproveFile)
     {
         return tSaiApproveFileService.selectTSaiApproveFileList(tSaiApproveFile);
     }
@@ -45,10 +48,10 @@ public class TEoegSaiApproveFileController extends BaseController
      */
     @Log(title = "SAI审批附件", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSaiApproveFile tSaiApproveFile)
+    public AjaxResult export(TEoegSaiApproveFile tSaiApproveFile)
     {
-        List<TSaiApproveFile> list = tSaiApproveFileService.selectTSaiApproveFileList(tSaiApproveFile);
-        ExcelUtil<TSaiApproveFile> util = new ExcelUtil<TSaiApproveFile>(TSaiApproveFile.class);
+        List<TEoegSaiApproveFile> list = tSaiApproveFileService.selectTSaiApproveFileList(tSaiApproveFile);
+        ExcelUtil<TEoegSaiApproveFile> util = new ExcelUtil<TEoegSaiApproveFile>(TEoegSaiApproveFile.class);
         return util.exportExcel(list, "saiApproveFile");
     }
 
@@ -66,7 +69,7 @@ public class TEoegSaiApproveFileController extends BaseController
      */
     @Log(title = "SAI审批附件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSaiApproveFile tSaiApproveFile)
+    public AjaxResult add(@RequestBody TEoegSaiApproveFile tSaiApproveFile)
     {
         return toAjax(tSaiApproveFileService.insertTSaiApproveFile(tSaiApproveFile));
     }
@@ -76,7 +79,7 @@ public class TEoegSaiApproveFileController extends BaseController
      */
     @Log(title = "SAI审批附件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TSaiApproveFile tSaiApproveFile)
+    public AjaxResult edit(@RequestBody TEoegSaiApproveFile tSaiApproveFile)
     {
         return toAjax(tSaiApproveFileService.updateTSaiApproveFile(tSaiApproveFile));
     }

+ 10 - 8
master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiFileController.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.project.production.domain.TEoegSaiFile;
+import com.ruoyi.project.production.service.ITEoegSaiFileService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,7 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 public class TEoegSaiFileController extends BaseController
 {
     @Autowired
-    private ITSaiFileService tSaiFileService;
+    private ITEoegSaiFileService tSaiFileService;
 
     /**
      * 上传
@@ -48,10 +50,10 @@ public class TEoegSaiFileController extends BaseController
      * 查询SAI文件列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(TSaiFile tSaiFile)
+    public TableDataInfo list(TEoegSaiFile tSaiFile)
     {
         startPage();
-        List<TSaiFile> list = tSaiFileService.selectTSaiFileList(tSaiFile);
+        List<TEoegSaiFile> list = tSaiFileService.selectTSaiFileList(tSaiFile);
         return getDataTable(list);
     }
 
@@ -60,10 +62,10 @@ public class TEoegSaiFileController extends BaseController
      */
     @Log(title = "SAI文件", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TSaiFile tSaiFile)
+    public AjaxResult export(TEoegSaiFile tSaiFile)
     {
-        List<TSaiFile> list = tSaiFileService.selectTSaiFileList(tSaiFile);
-        ExcelUtil<TSaiFile> util = new ExcelUtil<TSaiFile>(TSaiFile.class);
+        List<TEoegSaiFile> list = tSaiFileService.selectTSaiFileList(tSaiFile);
+        ExcelUtil<TEoegSaiFile> util = new ExcelUtil<TEoegSaiFile>(TEoegSaiFile.class);
         return util.exportExcel(list, "saiFile");
     }
 
@@ -81,7 +83,7 @@ public class TEoegSaiFileController extends BaseController
      */
     @Log(title = "SAI文件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TSaiFile tSaiFile)
+    public AjaxResult add(@RequestBody TEoegSaiFile tSaiFile)
     {
         return toAjax(tSaiFileService.insertTSaiFile(tSaiFile));
     }
@@ -91,7 +93,7 @@ public class TEoegSaiFileController extends BaseController
      */
     @Log(title = "SAI文件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TSaiFile tSaiFile)
+    public AjaxResult edit(@RequestBody TEoegSaiFile tSaiFile)
     {
         return toAjax(tSaiFileService.updateTSaiFile(tSaiFile));
     }

+ 2 - 1
ui/src/views/approve/approveDetail/eoeg-sai-apply-detail.vue

@@ -873,12 +873,13 @@ export default {
       })
     },
     getFileList() {
+      console.log("this.dataForm.saiApplyId:")
       console.log(this.dataForm.saiApplyId)
       listFile({
         approveId: this.dataForm.saiApplyId
       }).then(response => {
         this.doc.commonfileListApply = response;
-
+        console.log("listFile():")
         console.log(response)
       });
       allFileList({