pssr附件后台查询，修改

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -6,7 +6,6 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.process.domain.TMoc;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.reliability.domain.TSafetyvavle;
@@ -193,8 +192,8 @@ public class TPssrAboveallController extends BaseController {
      * 生成临时电源数据
      */
     private void genLsdy(Long subId, String userId) {
-        tPssrPowerService.insertTPssrPower(new TPssrPower(subId,"现场电源插座上无接临时用电设备、临时线路。",new Date(),userId));
-        tPssrPowerService.insertTPssrPower(new TPssrPower(subId,"现场电源插座外观完好，无破损，插座盖子上紧，无脱落。",new Date(),userId));
+        tPssrPowerService.insertTPssrPower(new TPssrPower(subId, "现场电源插座上无接临时用电设备、临时线路。", new Date(), userId));
+        tPssrPowerService.insertTPssrPower(new TPssrPower(subId, "现场电源插座外观完好，无破损，插座盖子上紧，无脱落。", new Date(), userId));
     }
 
     /**
@@ -250,7 +249,7 @@ public class TPssrAboveallController extends BaseController {
     /**
      * 生成原辅料数据
      */
-    private void genYfl(Long subId, String userId)  {
+    private void genYfl(Long subId, String userId) {
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Electr. Power", "MWH", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "LP steam", "/", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "MP steam", "/", userId, new Date(), 0L));
@@ -274,6 +273,7 @@ public class TPssrAboveallController extends BaseController {
         tPssrMaterialRawService.insertTPssrMaterialRaw(new TPssrMaterialRaw(subId, "Propylene", "Ton", userId, new Date(), 0L));
         tPssrMaterialRawService.insertTPssrMaterialRaw(new TPssrMaterialRaw(subId, "Toluene", "Ton", userId, new Date(), 0L));
     }
+
     /**
      * 生成安全阀数据
      */

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -13,6 +13,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrAirtightService;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -45,6 +46,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/airtight")
 public class TPssrAirtightController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrAirtightService tPssrAirtightService;
 
@@ -65,6 +68,9 @@ public class TPssrAirtightController extends BaseController {
     public TableDataInfo list(TPssrAirtight tPssrAirtight) {
         startPage();
         List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qm"));
+        });
         return getDataTable(list);
     }
 
@@ -85,7 +91,9 @@ public class TPssrAirtightController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:airtight:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrAirtightService.selectTPssrAirtightById(id));
+        TPssrAirtight item = tPssrAirtightService.selectTPssrAirtightById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qm"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -120,7 +128,7 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAirtight tPssrAirtight) {
-
+        tPssrFileService.updateFileRelevance(tPssrAirtight.getFileIds(), "qm", tPssrAirtight.getId(), tPssrAirtight.getSubId());
         try {
             String initialPressure = tPssrAirtight.getInitialPressure();//初始压力
             String finalPressure = tPssrAirtight.getFinalPressure();//最终压力
@@ -323,8 +331,8 @@ public class TPssrAirtightController extends BaseController {
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 10, 1, 1);
                 } catch (NumberFormatException e) {

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAlarmController.java

@@ -1,25 +1,25 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
 import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.pssr.domain.TPssrAlarm;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrAlarm;
-import com.ruoyi.project.pssr.service.ITPssrAlarmService;
+import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrAlarm;
+import com.ruoyi.project.pssr.service.ITPssrAlarmService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 报警联锁值确认Controller
  *
@@ -28,8 +28,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/pssr/alarm")
-public class TPssrAlarmController extends BaseController
-{
+public class TPssrAlarmController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrAlarmService tPssrAlarmService;
 
@@ -38,8 +39,7 @@ public class TPssrAlarmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:alarm:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrAlarm tPssrAlarm)
-    {
+    public TableDataInfo list(TPssrAlarm tPssrAlarm) {
         startPage();
         List<TPssrAlarm> list = tPssrAlarmService.selectTPssrAlarmList(tPssrAlarm);
         return getDataTable(list);
@@ -51,8 +51,7 @@ public class TPssrAlarmController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:alarm:export')")
     @Log(title = "报警联锁值确认", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrAlarm tPssrAlarm)
-    {
+    public AjaxResult export(TPssrAlarm tPssrAlarm) {
         List<TPssrAlarm> list = tPssrAlarmService.selectTPssrAlarmList(tPssrAlarm);
         ExcelUtil<TPssrAlarm> util = new ExcelUtil<TPssrAlarm>(TPssrAlarm.class);
         return util.exportExcel(list, "alarm");
@@ -63,9 +62,9 @@ public class TPssrAlarmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:alarm:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrAlarmService.selectTPssrAlarmById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrAlarm item = tPssrAlarmService.selectTPssrAlarmById(id);
+        return AjaxResult.success(item);
     }
 
     /**
@@ -74,8 +73,7 @@ public class TPssrAlarmController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:alarm:add')")
     @Log(title = "报警联锁值确认", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrAlarm tPssrAlarm)
-    {
+    public AjaxResult add(@RequestBody TPssrAlarm tPssrAlarm) {
         return toAjax(tPssrAlarmService.insertTPssrAlarm(tPssrAlarm));
     }
 
@@ -85,8 +83,7 @@ public class TPssrAlarmController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:alarm:edit')")
     @Log(title = "报警联锁值确认", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrAlarm tPssrAlarm)
-    {
+    public AjaxResult edit(@RequestBody TPssrAlarm tPssrAlarm) {
         return toAjax(tPssrAlarmService.updateTPssrAlarm(tPssrAlarm));
     }
 
@@ -95,20 +92,16 @@ public class TPssrAlarmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:alarm:remove')")
     @Log(title = "报警联锁值确认", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrAlarmService.deleteTPssrAlarmByIds(ids));
     }
 
 
-
     @Log(title = "报警联锁值确认附件上传", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadFile")
-    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, Long subId) throws IOException
-    {
-        if (!file.isEmpty())
-        {
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, Long subId) throws IOException {
+        if (!file.isEmpty()) {
             String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/pssr/bjlszqr"), file);
             TPssrAlarm test = new TPssrAlarm();
             test.setSubId(subId);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.service.ITPssrAnalyzerService;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
-import com.ruoyi.project.pssr.service.ITPssrAnalyzerService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 在线分析仪Controller
@@ -49,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/analyzer")
-public class TPssrAnalyzerController extends BaseController
-{
+public class TPssrAnalyzerController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrAnalyzerService tPssrAnalyzerService;
 
@@ -69,10 +65,12 @@ public class TPssrAnalyzerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrAnalyzer tPssrAnalyzer)
-    {
+    public TableDataInfo list(TPssrAnalyzer tPssrAnalyzer) {
         startPage();
         List<TPssrAnalyzer> list = tPssrAnalyzerService.selectTPssrAnalyzerList(tPssrAnalyzer);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zxfxy"));
+        });
         return getDataTable(list);
     }
 
@@ -82,8 +80,7 @@ public class TPssrAnalyzerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:export')")
     @Log(title = "在线分析仪", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrAnalyzer tPssrAnalyzer)
-    {
+    public AjaxResult export(TPssrAnalyzer tPssrAnalyzer) {
         List<TPssrAnalyzer> list = tPssrAnalyzerService.selectTPssrAnalyzerList(tPssrAnalyzer);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -121,8 +118,8 @@ public class TPssrAnalyzerController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
                 } catch (NumberFormatException e) {
@@ -155,9 +152,10 @@ public class TPssrAnalyzerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrAnalyzerService.selectTPssrAnalyzerById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrAnalyzer item = tPssrAnalyzerService.selectTPssrAnalyzerById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zxfxy"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -166,8 +164,7 @@ public class TPssrAnalyzerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:add')")
     @Log(title = "在线分析仪", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrAnalyzer tPssrAnalyzer)
-    {
+    public AjaxResult add(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
         tPssrAnalyzer.setApproveStatus(0L);
         return toAjax(tPssrAnalyzerService.insertTPssrAnalyzer(tPssrAnalyzer));
     }
@@ -178,8 +175,8 @@ public class TPssrAnalyzerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:edit')")
     @Log(title = "在线分析仪", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrAnalyzer tPssrAnalyzer)
-    {
+    public AjaxResult edit(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
+        tPssrFileService.updateFileRelevance(tPssrAnalyzer.getFileIds(), "zxfxy", tPssrAnalyzer.getId(), tPssrAnalyzer.getSubId());
         return toAjax(tPssrAnalyzerService.updateTPssrAnalyzer(tPssrAnalyzer));
     }
 
@@ -188,9 +185,8 @@ public class TPssrAnalyzerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:analyzer:remove')")
     @Log(title = "在线分析仪", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrAnalyzerService.deleteTPssrAnalyzerByIds(ids));
     }
 
@@ -221,7 +217,7 @@ public class TPssrAnalyzerController extends BaseController
             for (Long id : tPssrAnalyzer.getIds()) {
                 TPssrAnalyzer item = tPssrAnalyzerService.selectTPssrAnalyzerById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrAnalyzerService.updateTPssrAnalyzer(item);
@@ -231,7 +227,7 @@ public class TPssrAnalyzerController extends BaseController
             lock.setSubId(tPssrAnalyzer.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAnalyzer item : tPssrAnalyzerService.selectTPssrAnalyzerList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -255,7 +251,7 @@ public class TPssrAnalyzerController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrAnalyzer.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -188,6 +188,28 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private ITPssrPowerService tPssrPowerService;
 
+    /**
+     * 子项内容确认
+     */
+    public static void handleConfirmApprove(TPssrApprove approve, String userId) {
+        String processInstancesId = approve.getProcessId();
+        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+        TaskService taskService = processEngine.getTaskService();
+        Task task = processEngine.getTaskService()//获取任务service
+                .createTaskQuery()//创建查询对象
+                .taskAssignee(userId)
+                .processInstanceId(processInstancesId).singleResult();
+        String taskId = task.getId();
+
+        //处理流程节点
+        Map<String, Object> param = new HashMap<>();
+        param.put("condition", "0");
+        //认领任务
+        processEngine.getTaskService().claim(taskId, userId);
+        taskService.addComment(taskId, processInstancesId, "通过");
+        taskService.complete(taskId, param);
+    }
+
     /**
      * 查询pssr审批管理列表
      */
@@ -455,28 +477,6 @@ public class TPssrApproveController extends BaseController {
         return AjaxResult.success();
     }
 
-    /**
-     * 子项内容确认
-     */
-    public static void handleConfirmApprove(TPssrApprove approve, String userId) {
-        String processInstancesId = approve.getProcessId();
-        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-        TaskService taskService = processEngine.getTaskService();
-        Task task = processEngine.getTaskService()//获取任务service
-                .createTaskQuery()//创建查询对象
-                .taskAssignee(userId)
-                .processInstanceId(processInstancesId).singleResult();
-        String taskId = task.getId();
-
-        //处理流程节点
-        Map<String, Object> param = new HashMap<>();
-        param.put("condition", "0");
-        //认领任务
-        processEngine.getTaskService().claim(taskId, userId);
-        taskService.addComment(taskId, processInstancesId, "通过");
-        taskService.complete(taskId, param);
-    }
-
     // pssr发起经理审批
     public void doMgrApprove(Long aboveallId) {
         String userId = getUserId().toString();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -12,6 +12,7 @@ import com.ruoyi.project.pssr.domain.TPssrBlind;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrBlindService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -43,6 +44,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/blind")
 public class TPssrBlindController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrBlindService tPssrBlindService;
 
@@ -63,6 +66,9 @@ public class TPssrBlindController extends BaseController {
     public TableDataInfo list(TPssrBlind tPssrBlind) {
         startPage();
         List<TPssrBlind> list = tPssrBlindService.selectTPssrBlindList(tPssrBlind);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "mb"));
+        });
         return getDataTable(list);
     }
 
@@ -153,7 +159,9 @@ public class TPssrBlindController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:blind:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrBlindService.selectTPssrBlindById(id));
+        TPssrBlind item = tPssrBlindService.selectTPssrBlindById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "mb"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -174,6 +182,7 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrBlind tPssrBlind) {
+        tPssrFileService.updateFileRelevance(tPssrBlind.getFileIds(), "mb", tPssrBlind.getId(), tPssrBlind.getSubId());
         return toAjax(tPssrBlindService.updateTPssrBlind(tPssrBlind));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrCircuit;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrCircuitService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,23 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.service.ITPssrCircuitService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 短接Controller
@@ -48,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/circuit")
-public class TPssrCircuitController extends BaseController
-{
+public class TPssrCircuitController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrCircuitService tPssrCircuitService;
 
@@ -67,10 +64,12 @@ public class TPssrCircuitController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:circuit:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrCircuit tPssrCircuit)
-    {
+    public TableDataInfo list(TPssrCircuit tPssrCircuit) {
         startPage();
         List<TPssrCircuit> list = tPssrCircuitService.selectTPssrCircuitList(tPssrCircuit);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dj"));
+        });
         return getDataTable(list);
     }
 
@@ -80,8 +79,7 @@ public class TPssrCircuitController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:circuit:export')")
     @Log(title = "短接", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrCircuit tPssrCircuit)
-    {
+    public AjaxResult export(TPssrCircuit tPssrCircuit) {
         List<TPssrCircuit> list = tPssrCircuitService.selectTPssrCircuitList(tPssrCircuit);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -125,8 +123,8 @@ public class TPssrCircuitController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
                 } catch (NumberFormatException e) {
@@ -159,9 +157,10 @@ public class TPssrCircuitController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:circuit:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrCircuitService.selectTPssrCircuitById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrCircuit item = tPssrCircuitService.selectTPssrCircuitById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dj"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -170,8 +169,7 @@ public class TPssrCircuitController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:circuit:add')")
     @Log(title = "短接", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrCircuit tPssrCircuit)
-    {
+    public AjaxResult add(@RequestBody TPssrCircuit tPssrCircuit) {
         tPssrCircuit.setApproveStatus(0L);
         return toAjax(tPssrCircuitService.insertTPssrCircuit(tPssrCircuit));
     }
@@ -182,8 +180,8 @@ public class TPssrCircuitController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:circuit:edit')")
     @Log(title = "短接", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrCircuit tPssrCircuit)
-    {
+    public AjaxResult edit(@RequestBody TPssrCircuit tPssrCircuit) {
+        tPssrFileService.updateFileRelevance(tPssrCircuit.getFileIds(), "dj", tPssrCircuit.getId(), tPssrCircuit.getSubId());
         return toAjax(tPssrCircuitService.updateTPssrCircuit(tPssrCircuit));
     }
 
@@ -192,9 +190,8 @@ public class TPssrCircuitController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:circuit:remove')")
     @Log(title = "短接", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrCircuitService.deleteTPssrCircuitByIds(ids));
     }
 
@@ -224,7 +221,7 @@ public class TPssrCircuitController extends BaseController
             for (Long id : tPssrCircuit.getIds()) {
                 TPssrCircuit item = tPssrCircuitService.selectTPssrCircuitById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrCircuitService.updateTPssrCircuit(item);
@@ -234,7 +231,7 @@ public class TPssrCircuitController extends BaseController
             lock.setSubId(tPssrCircuit.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrCircuit item : tPssrCircuitService.selectTPssrCircuitList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -258,7 +255,7 @@ public class TPssrCircuitController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrCircuit.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -1,17 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrCleaning;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrCleaningService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -24,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrCleaning;
-import com.ruoyi.project.pssr.service.ITPssrCleaningService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 设备清洁Controller
@@ -51,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/cleaning")
-public class TPssrCleaningController extends BaseController
-{
+public class TPssrCleaningController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrCleaningService tPssrCleaningService;
 
@@ -70,10 +64,12 @@ public class TPssrCleaningController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrCleaning tPssrCleaning)
-    {
+    public TableDataInfo list(TPssrCleaning tPssrCleaning) {
         startPage();
         List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(tPssrCleaning);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+        });
         return getDataTable(list);
     }
 
@@ -83,8 +79,7 @@ public class TPssrCleaningController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:export')")
     @Log(title = "设备清洁", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrCleaning tPssrCleaning)
-    {
+    public AjaxResult export(TPssrCleaning tPssrCleaning) {
         List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(tPssrCleaning);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -123,8 +118,8 @@ public class TPssrCleaningController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 4, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 5, 1, 1);
                 } catch (NumberFormatException e) {
@@ -157,9 +152,10 @@ public class TPssrCleaningController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrCleaningService.selectTPssrCleaningById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrCleaning item = tPssrCleaningService.selectTPssrCleaningById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -168,8 +164,7 @@ public class TPssrCleaningController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:add')")
     @Log(title = "设备清洁", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrCleaning tPssrCleaning)
-    {
+    public AjaxResult add(@RequestBody TPssrCleaning tPssrCleaning) {
         tPssrCleaning.setApproveStatus(0L);
         return toAjax(tPssrCleaningService.insertTPssrCleaning(tPssrCleaning));
     }
@@ -180,8 +175,8 @@ public class TPssrCleaningController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:edit')")
     @Log(title = "设备清洁", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrCleaning tPssrCleaning)
-    {
+    public AjaxResult edit(@RequestBody TPssrCleaning tPssrCleaning) {
+        tPssrFileService.updateFileRelevance(tPssrCleaning.getFileIds(), "sbqjd", tPssrCleaning.getId(), tPssrCleaning.getSubId());
         return toAjax(tPssrCleaningService.updateTPssrCleaning(tPssrCleaning));
     }
 
@@ -190,9 +185,8 @@ public class TPssrCleaningController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:remove')")
     @Log(title = "设备清洁", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrCleaningService.deleteTPssrCleaningByIds(ids));
     }
 
@@ -222,7 +216,7 @@ public class TPssrCleaningController extends BaseController
             for (Long id : tPssrCleaning.getIds()) {
                 TPssrCleaning item = tPssrCleaningService.selectTPssrCleaningById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrCleaningService.updateTPssrCleaning(item);
@@ -232,7 +226,7 @@ public class TPssrCleaningController extends BaseController
             lock.setSubId(tPssrCleaning.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrCleaning item : tPssrCleaningService.selectTPssrCleaningList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -256,7 +250,7 @@ public class TPssrCleaningController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrCleaning.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrContentModelController.java

@@ -1,31 +1,30 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.training.bccnew.domain.TTsFlplanTmpl;
-import com.ruoyi.project.training.bccnew.domain.TTsFlplanTmplContent;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrContentModel;
+import com.ruoyi.project.pssr.service.ITPssrContentModelService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrContentModel;
-import com.ruoyi.project.pssr.service.ITPssrContentModelService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 开车条件确认模板Controller
  *
@@ -34,8 +33,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/pssr/pssrModel")
-public class TPssrContentModelController extends BaseController
-{
+public class TPssrContentModelController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrContentModelService tPssrContentModelService;
 
@@ -44,8 +44,7 @@ public class TPssrContentModelController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:pssrModel:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrContentModel tPssrContentModel)
-    {
+    public TableDataInfo list(TPssrContentModel tPssrContentModel) {
         startPage();
         List<TPssrContentModel> list = tPssrContentModelService.selectTPssrContentModelList(tPssrContentModel);
         return getDataTable(list);
@@ -57,8 +56,7 @@ public class TPssrContentModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pssrModel:export')")
     @Log(title = "开车条件确认模板", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrContentModel tPssrContentModel)
-    {
+    public AjaxResult export(TPssrContentModel tPssrContentModel) {
         List<TPssrContentModel> list = tPssrContentModelService.selectTPssrContentModelList(tPssrContentModel);
         ExcelUtil<TPssrContentModel> util = new ExcelUtil<TPssrContentModel>(TPssrContentModel.class);
         return util.exportExcel(list, "pssrModel");
@@ -69,8 +67,7 @@ public class TPssrContentModelController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:pssrModel:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPssrContentModelService.selectTPssrContentModelById(id));
     }
 
@@ -80,8 +77,7 @@ public class TPssrContentModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pssrModel:add')")
     @Log(title = "开车条件确认模板", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrContentModel tPssrContentModel)
-    {
+    public AjaxResult add(@RequestBody TPssrContentModel tPssrContentModel) {
         return toAjax(tPssrContentModelService.insertTPssrContentModel(tPssrContentModel));
     }
 
@@ -91,8 +87,7 @@ public class TPssrContentModelController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:pssrModel:edit')")
     @Log(title = "开车条件确认模板", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrContentModel tPssrContentModel)
-    {
+    public AjaxResult edit(@RequestBody TPssrContentModel tPssrContentModel) {
         return toAjax(tPssrContentModelService.updateTPssrContentModel(tPssrContentModel));
     }
 
@@ -101,9 +96,8 @@ public class TPssrContentModelController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:pssrModel:remove')")
     @Log(title = "开车条件确认模板", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrContentModelService.deleteTPssrContentModelByIds(ids));
     }
 
@@ -146,7 +140,7 @@ public class TPssrContentModelController extends BaseController
                         entity.setSerialNumber(cellValue);
                     } else if (j == 2) {
                         entity.setItem(cellValue);
-                    }  else if (j == 3) {
+                    } else if (j == 3) {
                         entity.setForShort(cellValue);
                     } else if (j == 4) {
                         entity.setContent(cellValue);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFileController.java

@@ -1,25 +1,24 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
 import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.pssr.domain.TPssrInstrumentTest;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrFile;
-import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrFile;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * PSSR附件Controller
  *
@@ -28,8 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/pssr/file")
-public class TPssrFileController extends BaseController
-{
+public class TPssrFileController extends BaseController {
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -37,8 +35,7 @@ public class TPssrFileController extends BaseController
      * 查询PSSR附件列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(TPssrFile tPssrFile)
-    {
+    public TableDataInfo list(TPssrFile tPssrFile) {
         startPage();
         List<TPssrFile> list = tPssrFileService.selectTPssrFileList(tPssrFile);
         return getDataTable(list);
@@ -49,8 +46,7 @@ public class TPssrFileController extends BaseController
      */
     @Log(title = "PSSR附件", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrFile tPssrFile)
-    {
+    public AjaxResult export(TPssrFile tPssrFile) {
         List<TPssrFile> list = tPssrFileService.selectTPssrFileList(tPssrFile);
         ExcelUtil<TPssrFile> util = new ExcelUtil<TPssrFile>(TPssrFile.class);
         return util.exportExcel(list, "file");
@@ -60,8 +56,7 @@ public class TPssrFileController extends BaseController
      * 获取PSSR附件详细信息
      */
     @GetMapping(value = "/{fileId}")
-    public AjaxResult getInfo(@PathVariable("fileId") Long fileId)
-    {
+    public AjaxResult getInfo(@PathVariable("fileId") Long fileId) {
         return AjaxResult.success(tPssrFileService.selectTPssrFileById(fileId));
     }
 
@@ -71,8 +66,7 @@ public class TPssrFileController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:file:add')")
     @Log(title = "PSSR附件", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrFile tPssrFile)
-    {
+    public AjaxResult add(@RequestBody TPssrFile tPssrFile) {
         return toAjax(tPssrFileService.insertTPssrFile(tPssrFile));
     }
 
@@ -81,8 +75,7 @@ public class TPssrFileController extends BaseController
      */
     @Log(title = "PSSR附件", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrFile tPssrFile)
-    {
+    public AjaxResult edit(@RequestBody TPssrFile tPssrFile) {
         return toAjax(tPssrFileService.updateTPssrFile(tPssrFile));
     }
 
@@ -90,20 +83,16 @@ public class TPssrFileController extends BaseController
      * 删除PSSR附件
      */
     @Log(title = "PSSR附件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{fileIds}")
-    public AjaxResult remove(@PathVariable Long[] fileIds)
-    {
+    @DeleteMapping("/{fileIds}")
+    public AjaxResult remove(@PathVariable Long[] fileIds) {
         return toAjax(tPssrFileService.deleteTPssrFileByIds(fileIds));
     }
 
 
-
     @Log(title = "pssr附件上传", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadFileM")
-    public AjaxResult uploadFileM(@RequestParam("file") MultipartFile file) throws IOException
-    {
-        if (!file.isEmpty())
-        {
+    public AjaxResult uploadFileM(@RequestParam("file") MultipartFile file) throws IOException {
+        if (!file.isEmpty()) {
             String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/pssr/picture"), file);
             TPssrFile pssrFile = new TPssrFile();
             pssrFile.setFileUrl(url);
@@ -118,10 +107,8 @@ public class TPssrFileController extends BaseController
 
     @Log(title = "pssr附件上传", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadFile")
-    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file,Long subId,Long itemId,String forShort) throws IOException
-    {
-        if (!file.isEmpty())
-        {
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, Long subId, Long itemId, String forShort) throws IOException {
+        if (!file.isEmpty()) {
             String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/pssr/pictures"), file);
             TPssrFile pssrFile = new TPssrFile();
             pssrFile.setItemId(itemId);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFrame;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrFrameService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrFrame;
-import com.ruoyi.project.pssr.service.ITPssrFrameService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 支（吊）架Controller
@@ -49,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/frame")
-public class TPssrFrameController extends BaseController
-{
+public class TPssrFrameController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrFrameService tPssrFrameService;
 
@@ -68,10 +64,12 @@ public class TPssrFrameController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:frame:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrFrame tPssrFrame)
-    {
+    public TableDataInfo list(TPssrFrame tPssrFrame) {
         startPage();
         List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(tPssrFrame);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zdj"));
+        });
         return getDataTable(list);
     }
 
@@ -81,8 +79,7 @@ public class TPssrFrameController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:frame:export')")
     @Log(title = "支（吊）架", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrFrame tPssrFrame)
-    {
+    public AjaxResult export(TPssrFrame tPssrFrame) {
         List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(tPssrFrame);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -136,8 +133,8 @@ public class TPssrFrameController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 21, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 22, 1, 1);
                 } catch (NumberFormatException e) {
@@ -170,9 +167,10 @@ public class TPssrFrameController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:frame:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrFrameService.selectTPssrFrameById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrFrame item = tPssrFrameService.selectTPssrFrameById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zdj"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -181,8 +179,7 @@ public class TPssrFrameController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:frame:add')")
     @Log(title = "支（吊）架", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrFrame tPssrFrame)
-    {
+    public AjaxResult add(@RequestBody TPssrFrame tPssrFrame) {
         tPssrFrame.setApproveStatus(0L);
         return toAjax(tPssrFrameService.insertTPssrFrame(tPssrFrame));
     }
@@ -193,8 +190,8 @@ public class TPssrFrameController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:frame:edit')")
     @Log(title = "支（吊）架", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrFrame tPssrFrame)
-    {
+    public AjaxResult edit(@RequestBody TPssrFrame tPssrFrame) {
+        tPssrFileService.updateFileRelevance(tPssrFrame.getFileIds(), "zdj", tPssrFrame.getId(), tPssrFrame.getSubId());
         return toAjax(tPssrFrameService.updateTPssrFrame(tPssrFrame));
     }
 
@@ -203,9 +200,8 @@ public class TPssrFrameController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:frame:remove')")
     @Log(title = "支（吊）架", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrFrameService.deleteTPssrFrameByIds(ids));
     }
 
@@ -235,7 +231,7 @@ public class TPssrFrameController extends BaseController
             for (Long id : tPssrFrame.getIds()) {
                 TPssrFrame item = tPssrFrameService.selectTPssrFrameById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrFrameService.updateTPssrFrame(item);
@@ -245,7 +241,7 @@ public class TPssrFrameController extends BaseController
             lock.setSubId(tPssrFrame.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrFrame item : tPssrFrameService.selectTPssrFrameList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -269,7 +265,7 @@ public class TPssrFrameController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrFrame.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFranklinism;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrFranklinismService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrFranklinism;
-import com.ruoyi.project.pssr.service.ITPssrFranklinismService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 静电接地，跨接Controller
@@ -49,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/franklinism")
-public class TPssrFranklinismController extends BaseController
-{
+public class TPssrFranklinismController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrFranklinismService tPssrFranklinismService;
 
@@ -69,10 +65,12 @@ public class TPssrFranklinismController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrFranklinism tPssrFranklinism)
-    {
+    public TableDataInfo list(TPssrFranklinism tPssrFranklinism) {
         startPage();
         List<TPssrFranklinism> list = tPssrFranklinismService.selectTPssrFranklinismList(tPssrFranklinism);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jdjdkj"));
+        });
         return getDataTable(list);
     }
 
@@ -82,8 +80,7 @@ public class TPssrFranklinismController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:export')")
     @Log(title = "静电接地，跨接", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrFranklinism tPssrFranklinism)
-    {
+    public AjaxResult export(TPssrFranklinism tPssrFranklinism) {
         List<TPssrFranklinism> list = tPssrFranklinismService.selectTPssrFranklinismList(tPssrFranklinism);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -119,8 +116,8 @@ public class TPssrFranklinismController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
                 } catch (NumberFormatException e) {
@@ -153,9 +150,10 @@ public class TPssrFranklinismController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrFranklinismService.selectTPssrFranklinismById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrFranklinism item = tPssrFranklinismService.selectTPssrFranklinismById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jdjdkj"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -164,8 +162,7 @@ public class TPssrFranklinismController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:add')")
     @Log(title = "静电接地，跨接", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrFranklinism tPssrFranklinism)
-    {
+    public AjaxResult add(@RequestBody TPssrFranklinism tPssrFranklinism) {
         tPssrFranklinism.setApproveStatus(0L);
         return toAjax(tPssrFranklinismService.insertTPssrFranklinism(tPssrFranklinism));
     }
@@ -176,8 +173,8 @@ public class TPssrFranklinismController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:edit')")
     @Log(title = "静电接地，跨接", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrFranklinism tPssrFranklinism)
-    {
+    public AjaxResult edit(@RequestBody TPssrFranklinism tPssrFranklinism) {
+        tPssrFileService.updateFileRelevance(tPssrFranklinism.getFileIds(), "jdjdkj", tPssrFranklinism.getId(), tPssrFranklinism.getSubId());
         return toAjax(tPssrFranklinismService.updateTPssrFranklinism(tPssrFranklinism));
     }
 
@@ -186,9 +183,8 @@ public class TPssrFranklinismController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:franklinism:remove')")
     @Log(title = "静电接地，跨接", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrFranklinismService.deleteTPssrFranklinismByIds(ids));
     }
 
@@ -219,7 +215,7 @@ public class TPssrFranklinismController extends BaseController
             for (Long id : tPssrFranklinism.getIds()) {
                 TPssrFranklinism item = tPssrFranklinismService.selectTPssrFranklinismById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrFranklinismService.updateTPssrFranklinism(item);
@@ -229,7 +225,7 @@ public class TPssrFranklinismController extends BaseController
             lock.setSubId(tPssrFranklinism.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrFranklinism item : tPssrFranklinismService.selectTPssrFranklinismList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -253,7 +249,7 @@ public class TPssrFranklinismController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrFranklinism.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrGasdetector;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrGasdetectorService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrGasdetector;
-import com.ruoyi.project.pssr.service.ITPssrGasdetectorService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 气体检测器Controller
@@ -49,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/gasdetector")
-public class TPssrGasdetectorController extends BaseController
-{
+public class TPssrGasdetectorController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrGasdetectorService tPssrGasdetectorService;
 
@@ -69,10 +65,12 @@ public class TPssrGasdetectorController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrGasdetector tPssrGasdetector)
-    {
+    public TableDataInfo list(TPssrGasdetector tPssrGasdetector) {
         startPage();
         List<TPssrGasdetector> list = tPssrGasdetectorService.selectTPssrGasdetectorList(tPssrGasdetector);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qtjcy"));
+        });
         return getDataTable(list);
     }
 
@@ -82,8 +80,7 @@ public class TPssrGasdetectorController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:export')")
     @Log(title = "气体检测器", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrGasdetector tPssrGasdetector)
-    {
+    public AjaxResult export(TPssrGasdetector tPssrGasdetector) {
         List<TPssrGasdetector> list = tPssrGasdetectorService.selectTPssrGasdetectorList(tPssrGasdetector);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -121,8 +118,8 @@ public class TPssrGasdetectorController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
                 } catch (NumberFormatException e) {
@@ -155,9 +152,10 @@ public class TPssrGasdetectorController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrGasdetectorService.selectTPssrGasdetectorById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrGasdetector item = tPssrGasdetectorService.selectTPssrGasdetectorById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qtjcy"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -166,8 +164,7 @@ public class TPssrGasdetectorController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:add')")
     @Log(title = "气体检测器", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrGasdetector tPssrGasdetector)
-    {
+    public AjaxResult add(@RequestBody TPssrGasdetector tPssrGasdetector) {
         tPssrGasdetector.setApproveStatus(0L);
         return toAjax(tPssrGasdetectorService.insertTPssrGasdetector(tPssrGasdetector));
     }
@@ -178,8 +175,8 @@ public class TPssrGasdetectorController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:edit')")
     @Log(title = "气体检测器", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrGasdetector tPssrGasdetector)
-    {
+    public AjaxResult edit(@RequestBody TPssrGasdetector tPssrGasdetector) {
+        tPssrFileService.updateFileRelevance(tPssrGasdetector.getFileIds(), "qtjcy", tPssrGasdetector.getId(), tPssrGasdetector.getSubId());
         return toAjax(tPssrGasdetectorService.updateTPssrGasdetector(tPssrGasdetector));
     }
 
@@ -188,9 +185,8 @@ public class TPssrGasdetectorController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:gasdetector:remove')")
     @Log(title = "气体检测器", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrGasdetectorService.deleteTPssrGasdetectorByIds(ids));
     }
 
@@ -221,7 +217,7 @@ public class TPssrGasdetectorController extends BaseController
             for (Long id : tPssrGasdetector.getIds()) {
                 TPssrGasdetector item = tPssrGasdetectorService.selectTPssrGasdetectorById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrGasdetectorService.updateTPssrGasdetector(item);
@@ -231,7 +227,7 @@ public class TPssrGasdetectorController extends BaseController
             lock.setSubId(tPssrGasdetector.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrGasdetector item : tPssrGasdetectorService.selectTPssrGasdetectorList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -255,7 +251,7 @@ public class TPssrGasdetectorController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrGasdetector.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -1,18 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrHygiene;
-import com.ruoyi.project.pssr.domain.TPssrHygiene;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrHygieneService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -25,23 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.service.ITPssrHygieneService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 现场卫生Controller
@@ -51,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/hygiene")
-public class TPssrHygieneController extends BaseController
-{
+public class TPssrHygieneController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrHygieneService tPssrHygieneService;
 
@@ -71,8 +65,7 @@ public class TPssrHygieneController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:hygiene:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrHygiene tPssrHygiene)
-    {
+    public TableDataInfo list(TPssrHygiene tPssrHygiene) {
         startPage();
         List<TPssrHygiene> list = tPssrHygieneService.selectTPssrHygieneList(tPssrHygiene);
         return getDataTable(list);
@@ -120,8 +113,8 @@ public class TPssrHygieneController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
                 } catch (NumberFormatException e) {
@@ -165,8 +158,7 @@ public class TPssrHygieneController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:hygiene:add')")
     @Log(title = "现场卫生", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrHygiene tPssrHygiene)
-    {
+    public AjaxResult add(@RequestBody TPssrHygiene tPssrHygiene) {
         tPssrHygiene.setApproveStatus(0L);
         return toAjax(tPssrHygieneService.insertTPssrHygiene(tPssrHygiene));
     }
@@ -187,9 +179,8 @@ public class TPssrHygieneController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:hygiene:remove')")
     @Log(title = "现场卫生", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrHygieneService.deleteTPssrHygieneByIds(ids));
     }
 
@@ -219,7 +210,7 @@ public class TPssrHygieneController extends BaseController
             for (Long id : tPssrHygiene.getIds()) {
                 TPssrHygiene item = tPssrHygieneService.selectTPssrHygieneById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrHygieneService.updateTPssrHygiene(item);
@@ -229,7 +220,7 @@ public class TPssrHygieneController extends BaseController
             lock.setSubId(tPssrHygiene.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrHygiene item : tPssrHygieneService.selectTPssrHygieneList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrInstrumentCalibrationService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
-import com.ruoyi.project.pssr.service.ITPssrInstrumentCalibrationService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 仪表校验Controller
@@ -49,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/instrumentCalibration")
-public class TPssrInstrumentCalibrationController extends BaseController
-{
+public class TPssrInstrumentCalibrationController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrInstrumentCalibrationService tPssrInstrumentCalibrationService;
 
@@ -69,10 +65,12 @@ public class TPssrInstrumentCalibrationController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrInstrumentCalibration tPssrInstrumentCalibration)
-    {
+    public TableDataInfo list(TPssrInstrumentCalibration tPssrInstrumentCalibration) {
         startPage();
         List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(tPssrInstrumentCalibration);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+        });
         return getDataTable(list);
     }
 
@@ -82,8 +80,7 @@ public class TPssrInstrumentCalibrationController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:export')")
     @Log(title = "仪表校验", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrInstrumentCalibration tPssrInstrumentCalibration)
-    {
+    public AjaxResult export(TPssrInstrumentCalibration tPssrInstrumentCalibration) {
         List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(tPssrInstrumentCalibration);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -122,8 +119,8 @@ public class TPssrInstrumentCalibrationController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
                 } catch (NumberFormatException e) {
@@ -156,9 +153,10 @@ public class TPssrInstrumentCalibrationController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -167,8 +165,7 @@ public class TPssrInstrumentCalibrationController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:add')")
     @Log(title = "仪表校验", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration)
-    {
+    public AjaxResult add(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
         tPssrInstrumentCalibration.setApproveStatus(0L);
         return toAjax(tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(tPssrInstrumentCalibration));
     }
@@ -179,8 +176,8 @@ public class TPssrInstrumentCalibrationController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
     @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration)
-    {
+    public AjaxResult edit(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+        tPssrFileService.updateFileRelevance(tPssrInstrumentCalibration.getFileIds(), "ybjy", tPssrInstrumentCalibration.getId(), tPssrInstrumentCalibration.getSubId());
         return toAjax(tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(tPssrInstrumentCalibration));
     }
 
@@ -189,9 +186,8 @@ public class TPssrInstrumentCalibrationController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:remove')")
     @Log(title = "仪表校验", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrInstrumentCalibrationService.deleteTPssrInstrumentCalibrationByIds(ids));
     }
 
@@ -222,7 +218,7 @@ public class TPssrInstrumentCalibrationController extends BaseController
             for (Long id : tPssrInstrumentCalibration.getIds()) {
                 TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
@@ -232,7 +228,7 @@ public class TPssrInstrumentCalibrationController extends BaseController
             lock.setSubId(tPssrInstrumentCalibration.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -256,7 +252,7 @@ public class TPssrInstrumentCalibrationController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrInstrumentCalibration.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentTestController.java

@@ -1,26 +1,25 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.ehs.domain.TRcfile;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrInstrumentTest;
-import com.ruoyi.project.pssr.service.ITPssrInstrumentTestService;
+import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrInstrumentTest;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrInstrumentTestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 仪联锁测试Controller
  *
@@ -29,8 +28,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/pssr/instrumentTest")
-public class TPssrInstrumentTestController extends BaseController
-{
+public class TPssrInstrumentTestController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrInstrumentTestService tPssrInstrumentTestService;
 
@@ -39,8 +39,7 @@ public class TPssrInstrumentTestController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:instrumentTest:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrInstrumentTest tPssrInstrumentTest)
-    {
+    public TableDataInfo list(TPssrInstrumentTest tPssrInstrumentTest) {
         startPage();
         List<TPssrInstrumentTest> list = tPssrInstrumentTestService.selectTPssrInstrumentTestList(tPssrInstrumentTest);
         return getDataTable(list);
@@ -52,8 +51,7 @@ public class TPssrInstrumentTestController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:instrumentTest:export')")
     @Log(title = "仪联锁测试", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrInstrumentTest tPssrInstrumentTest)
-    {
+    public AjaxResult export(TPssrInstrumentTest tPssrInstrumentTest) {
         List<TPssrInstrumentTest> list = tPssrInstrumentTestService.selectTPssrInstrumentTestList(tPssrInstrumentTest);
         ExcelUtil<TPssrInstrumentTest> util = new ExcelUtil<TPssrInstrumentTest>(TPssrInstrumentTest.class);
         return util.exportExcel(list, "instrumentTest");
@@ -75,8 +73,7 @@ public class TPssrInstrumentTestController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:instrumentTest:add')")
     @Log(title = "仪联锁测试", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrInstrumentTest tPssrInstrumentTest)
-    {
+    public AjaxResult add(@RequestBody TPssrInstrumentTest tPssrInstrumentTest) {
         return toAjax(tPssrInstrumentTestService.insertTPssrInstrumentTest(tPssrInstrumentTest));
     }
 
@@ -96,18 +93,15 @@ public class TPssrInstrumentTestController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:instrumentTest:remove')")
     @Log(title = "仪联锁测试", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrInstrumentTestService.deleteTPssrInstrumentTestByIds(ids));
     }
 
     @Log(title = "仪联锁测试附件上传", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadFile")
-    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file,Long subId) throws IOException
-    {
-        if (!file.isEmpty())
-        {
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, Long subId) throws IOException {
+        if (!file.isEmpty()) {
             String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/pssr/yblscs"), file);
             TPssrInstrumentTest test = new TPssrInstrumentTest();
             test.setSubId(subId);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrLaboratory;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrLaboratoryService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,23 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.service.ITPssrLaboratoryService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 实验室Controller
@@ -48,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/laboratory")
-public class TPssrLaboratoryController extends BaseController
-{
+public class TPssrLaboratoryController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrLaboratoryService tPssrLaboratoryService;
 
@@ -67,8 +64,7 @@ public class TPssrLaboratoryController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:laboratory:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrLaboratory tPssrLaboratory)
-    {
+    public TableDataInfo list(TPssrLaboratory tPssrLaboratory) {
         startPage();
         List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
         return getDataTable(list);
@@ -80,8 +76,7 @@ public class TPssrLaboratoryController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:laboratory:export')")
     @Log(title = "实验室", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrLaboratory tPssrLaboratory)
-    {
+    public AjaxResult export(TPssrLaboratory tPssrLaboratory) {
         List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -120,8 +115,8 @@ public class TPssrLaboratoryController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
                 } catch (NumberFormatException e) {
@@ -165,8 +160,7 @@ public class TPssrLaboratoryController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:laboratory:add')")
     @Log(title = "实验室", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrLaboratory tPssrLaboratory)
-    {
+    public AjaxResult add(@RequestBody TPssrLaboratory tPssrLaboratory) {
         tPssrLaboratory.setApproveStatus(0L);
         return toAjax(tPssrLaboratoryService.insertTPssrLaboratory(tPssrLaboratory));
     }
@@ -187,9 +181,8 @@ public class TPssrLaboratoryController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:laboratory:remove')")
     @Log(title = "实验室", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrLaboratoryService.deleteTPssrLaboratoryByIds(ids));
     }
 
@@ -219,7 +212,7 @@ public class TPssrLaboratoryController extends BaseController
             for (Long id : tPssrLaboratory.getIds()) {
                 TPssrLaboratory item = tPssrLaboratoryService.selectTPssrLaboratoryById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrLaboratoryService.updateTPssrLaboratory(item);
@@ -229,7 +222,7 @@ public class TPssrLaboratoryController extends BaseController
             lock.setSubId(tPssrLaboratory.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -253,7 +246,7 @@ public class TPssrLaboratoryController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrLaboratory.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java

@@ -1,34 +1,27 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.util.*;
-
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrLighting;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrLightingService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrLighting;
-import com.ruoyi.project.pssr.service.ITPssrLightingService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 
 /**
  * 照明Controller
@@ -38,8 +31,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/lighting")
-public class TPssrLightingController extends BaseController
-{
+public class TPssrLightingController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrLightingService tPssrLightingService;
 
@@ -54,10 +48,12 @@ public class TPssrLightingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:lighting:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrLighting tPssrLighting)
-    {
+    public TableDataInfo list(TPssrLighting tPssrLighting) {
         startPage();
         List<TPssrLighting> list = tPssrLightingService.selectTPssrLightingList(tPssrLighting);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zmdbr"));
+        });
         return getDataTable(list);
     }
 
@@ -67,8 +63,7 @@ public class TPssrLightingController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:lighting:export')")
     @Log(title = "照明", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrLighting tPssrLighting)
-    {
+    public AjaxResult export(TPssrLighting tPssrLighting) {
         List<TPssrLighting> list = tPssrLightingService.selectTPssrLightingList(tPssrLighting);
         ExcelUtil<TPssrLighting> util = new ExcelUtil<TPssrLighting>(TPssrLighting.class);
         return util.exportExcel(list, "lighting");
@@ -79,9 +74,10 @@ public class TPssrLightingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:lighting:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrLightingService.selectTPssrLightingById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrLighting item = tPssrLightingService.selectTPssrLightingById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zmdbr"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -90,8 +86,7 @@ public class TPssrLightingController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:lighting:add')")
     @Log(title = "照明", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrLighting tPssrLighting)
-    {
+    public AjaxResult add(@RequestBody TPssrLighting tPssrLighting) {
         tPssrLighting.setApproveStatus(0L);
         return toAjax(tPssrLightingService.insertTPssrLighting(tPssrLighting));
     }
@@ -102,8 +97,8 @@ public class TPssrLightingController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:lighting:edit')")
     @Log(title = "照明", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrLighting tPssrLighting)
-    {
+    public AjaxResult edit(@RequestBody TPssrLighting tPssrLighting) {
+        tPssrFileService.updateFileRelevance(tPssrLighting.getFileIds(), "zmdbr", tPssrLighting.getId(), tPssrLighting.getSubId());
         return toAjax(tPssrLightingService.updateTPssrLighting(tPssrLighting));
     }
 
@@ -112,14 +107,12 @@ public class TPssrLightingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:lighting:remove')")
     @Log(title = "照明", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrLightingService.deleteTPssrLightingByIds(ids));
     }
 
 
-
     /**
      * 确认照明，电伴热
      */
@@ -146,7 +139,7 @@ public class TPssrLightingController extends BaseController
             for (Long id : tPssrLighting.getIds()) {
                 TPssrLighting item = tPssrLightingService.selectTPssrLightingById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrLightingService.updateTPssrLighting(item);
@@ -157,7 +150,7 @@ public class TPssrLightingController extends BaseController
             lock.setApproveStatus(queryStatus);
             lock.setLightingType(tPssrLighting.getLightingType());
             for (TPssrLighting item : tPssrLightingService.selectTPssrLightingList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -181,7 +174,7 @@ public class TPssrLightingController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrLighting.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java

@@ -14,10 +14,7 @@ import com.ruoyi.project.apply.service.ITApplyLockService;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrLock;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrAboveallService;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrLockService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
@@ -49,6 +46,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/lock")
 public class TPssrLockController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrLockService tPssrLockService;
 
@@ -75,6 +74,9 @@ public class TPssrLockController extends BaseController {
     public TableDataInfo list(TPssrLock tPssrLock) {
         startPage();
         List<TPssrLock> list = tPssrLockService.selectTPssrLockList(tPssrLock);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sksgfmzt"));
+        });
         return getDataTable(list);
     }
 
@@ -84,8 +86,7 @@ public class TPssrLockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:lock:export')")
     @Log(title = "锁开锁关阀门状态", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrLock tPssrLock)
-    {
+    public AjaxResult export(TPssrLock tPssrLock) {
         List<TPssrLock> list = tPssrLockService.selectTPssrLockList(tPssrLock);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -133,8 +134,8 @@ public class TPssrLockController extends BaseController {
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getLockeder()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 15, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 16, 1, 1);
                 } catch (NumberFormatException e) {
@@ -168,7 +169,9 @@ public class TPssrLockController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:lock:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrLockService.selectTPssrLockById(id));
+        TPssrLock item = tPssrLockService.selectTPssrLockById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sksgfmzt"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -214,7 +217,7 @@ public class TPssrLockController extends BaseController {
         if (flag) {
             return AjaxResult.success();
         } else {
-            return AjaxResult.success("PID图号为"+JSON.toJSONString(pids)+"中，锁编号为" + JSON.toJSONString(codes) + "的锁未完成锁开锁关流程审批！");
+            return AjaxResult.success("PID图号为" + JSON.toJSONString(pids) + "中，锁编号为" + JSON.toJSONString(codes) + "的锁未完成锁开锁关流程审批！");
         }
     }
 
@@ -239,6 +242,7 @@ public class TPssrLockController extends BaseController {
     @Log(title = "锁开锁关阀门状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrLock tPssrLock) {
+        tPssrFileService.updateFileRelevance(tPssrLock.getFileIds(), "sksgfmzt", tPssrLock.getId(), tPssrLock.getSubId());
         return toAjax(tPssrLockService.updateTPssrLock(tPssrLock));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -7,9 +7,12 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrMaterial;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.mapper.TPssrMaterialMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrMaterialService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import org.activiti.engine.HistoryService;
@@ -32,6 +35,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/material")
 public class TPssrMaterialController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrMaterialService tPssrMaterialService;
 
@@ -57,6 +62,9 @@ public class TPssrMaterialController extends BaseController {
     public TableDataInfo list(TPssrMaterial tPssrMaterial) {
         startPage();
         List<TPssrMaterial> list = tPssrMaterialService.selectTPssrMaterialList(tPssrMaterial);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
+        });
         return getDataTable(list);
     }
 
@@ -78,7 +86,9 @@ public class TPssrMaterialController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:material:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrMaterialService.selectTPssrMaterialById(id));
+        TPssrMaterial item = tPssrMaterialService.selectTPssrMaterialById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -98,6 +108,7 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterial tPssrMaterial) {
+        tPssrFileService.updateFileRelevance(tPssrMaterial.getFileIds(), "yfl", tPssrMaterial.getId(), tPssrMaterial.getSubId());
         return toAjax(tPssrMaterialService.updateTPssrMaterial(tPssrMaterial));
     }
 
@@ -175,7 +186,7 @@ public class TPssrMaterialController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterial.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialRawController.java

@@ -7,9 +7,12 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrMaterialRaw;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.mapper.TPssrMaterialRawMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrMaterialRawService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import org.activiti.engine.HistoryService;
@@ -32,6 +35,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/materialRaw")
 public class TPssrMaterialRawController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrMaterialRawService tPssrMaterialRawService;
 
@@ -48,6 +53,7 @@ public class TPssrMaterialRawController extends BaseController {
     private HistoryService historyService;
     @Resource
     private TPssrMaterialRawMapper tPssrMaterialRawMapper;
+
     /**
      * 查询原料列表
      */
@@ -56,6 +62,9 @@ public class TPssrMaterialRawController extends BaseController {
     public TableDataInfo list(TPssrMaterialRaw tPssrMaterialRaw) {
         startPage();
         List<TPssrMaterialRaw> list = tPssrMaterialRawService.selectTPssrMaterialRawList(tPssrMaterialRaw);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
+        });
         return getDataTable(list);
     }
 
@@ -77,7 +86,9 @@ public class TPssrMaterialRawController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:materialRaw:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrMaterialRawService.selectTPssrMaterialRawById(id));
+        TPssrMaterialRaw item = tPssrMaterialRawService.selectTPssrMaterialRawById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -97,6 +108,7 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
+        tPssrFileService.updateFileRelevance(tPssrMaterialRaw.getFileIds(), "yfl-raw", tPssrMaterialRaw.getId(), tPssrMaterialRaw.getSubId());
         return toAjax(tPssrMaterialRawService.updateTPssrMaterialRaw(tPssrMaterialRaw));
     }
 
@@ -173,7 +185,7 @@ public class TPssrMaterialRawController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMaterialRaw.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -9,12 +9,12 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrMeasure;
+import com.ruoyi.project.pssr.domain.TPssrProtection;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.mapper.TPssrMeasureMapper;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrMeasureService;
-import com.ruoyi.project.pssr.service.ITPssrProtectionService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
@@ -46,6 +46,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/measure")
 public class TPssrMeasureController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrMeasureService tPssrMeasureService;
     @Autowired
@@ -77,6 +79,9 @@ public class TPssrMeasureController extends BaseController {
     public TableDataInfo list(TPssrMeasure tPssrMeasure) {
         startPage();
         List<TPssrMeasure> list = tPssrMeasureService.selectTPssrMeasureList(tPssrMeasure);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh-m"));
+        });
         return getDataTable(list);
     }
 
@@ -126,8 +131,8 @@ public class TPssrMeasureController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
                 } catch (NumberFormatException e) {
@@ -160,7 +165,9 @@ public class TPssrMeasureController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:measure:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrMeasureService.selectTPssrMeasureById(id));
+        TPssrMeasure item = tPssrMeasureService.selectTPssrMeasureById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh-m"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -183,6 +190,7 @@ public class TPssrMeasureController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMeasure tPssrMeasure) {
+        tPssrFileService.updateFileRelevance(tPssrMeasure.getFileIds(), "rsfh-m", tPssrMeasure.getId(), tPssrMeasure.getSubId());
         return toAjax(tPssrMeasureService.updateTPssrMeasure(tPssrMeasure));
     }
 
@@ -274,7 +282,7 @@ public class TPssrMeasureController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMeasure.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -15,6 +15,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrMoc;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrMocService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
@@ -49,6 +50,9 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/moc")
 public class TPssrMocController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
+
     @Autowired
     private ITPssrMocService tPssrMocService;
 
@@ -75,6 +79,9 @@ public class TPssrMocController extends BaseController {
     public TableDataInfo list(TPssrMoc tPssrMoc) {
         startPage();
         List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(tPssrMoc);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sjbg"));
+        });
         return getDataTable(list);
     }
 
@@ -159,7 +166,9 @@ public class TPssrMocController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:moc:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrMocService.selectTPssrMocById(id));
+        TPssrMoc item = tPssrMocService.selectTPssrMocById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sjbg"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -221,7 +230,7 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMoc tPssrMoc) {
-
+        tPssrFileService.updateFileRelevance(tPssrMoc.getFileIds(), "sjbg", tPssrMoc.getId(), tPssrMoc.getSubId());
         return toAjax(tPssrMocService.updateTPssrMoc(tPssrMoc));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -1,16 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrMotor;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrMotorService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -23,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrMotor;
-import com.ruoyi.project.pssr.service.ITPssrMotorService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 电机设备Controller
@@ -50,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/motor")
-public class TPssrMotorController extends BaseController
-{
+public class TPssrMotorController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrMotorService tPssrMotorService;
 
@@ -70,10 +65,12 @@ public class TPssrMotorController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:motor:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrMotor tPssrMotor)
-    {
+    public TableDataInfo list(TPssrMotor tPssrMotor) {
         startPage();
         List<TPssrMotor> list = tPssrMotorService.selectTPssrMotorList(tPssrMotor);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "djsb"));
+        });
         return getDataTable(list);
     }
 
@@ -83,8 +80,7 @@ public class TPssrMotorController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:motor:export')")
     @Log(title = "电机设备", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrMotor tPssrMotor)
-    {
+    public AjaxResult export(TPssrMotor tPssrMotor) {
         List<TPssrMotor> list = tPssrMotorService.selectTPssrMotorList(tPssrMotor);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -122,8 +118,8 @@ public class TPssrMotorController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
                 } catch (NumberFormatException e) {
@@ -156,9 +152,10 @@ public class TPssrMotorController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:motor:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrMotorService.selectTPssrMotorById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrMotor item = tPssrMotorService.selectTPssrMotorById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "djsb"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -167,8 +164,7 @@ public class TPssrMotorController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:motor:add')")
     @Log(title = "电机设备", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrMotor tPssrMotor)
-    {
+    public AjaxResult add(@RequestBody TPssrMotor tPssrMotor) {
         tPssrMotor.setApproveStatus(0L);
         return toAjax(tPssrMotorService.insertTPssrMotor(tPssrMotor));
     }
@@ -179,8 +175,8 @@ public class TPssrMotorController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:motor:edit')")
     @Log(title = "电机设备", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrMotor tPssrMotor)
-    {
+    public AjaxResult edit(@RequestBody TPssrMotor tPssrMotor) {
+        tPssrFileService.updateFileRelevance(tPssrMotor.getFileIds(), "djsb", tPssrMotor.getId(), tPssrMotor.getSubId());
         return toAjax(tPssrMotorService.updateTPssrMotor(tPssrMotor));
     }
 
@@ -189,9 +185,8 @@ public class TPssrMotorController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:motor:remove')")
     @Log(title = "电机设备", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrMotorService.deleteTPssrMotorByIds(ids));
     }
 
@@ -221,7 +216,7 @@ public class TPssrMotorController extends BaseController
             for (Long id : tPssrMotor.getIds()) {
                 TPssrMotor item = tPssrMotorService.selectTPssrMotorById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrMotorService.updateTPssrMotor(item);
@@ -231,7 +226,7 @@ public class TPssrMotorController extends BaseController
             lock.setSubId(tPssrMotor.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrMotor item : tPssrMotorService.selectTPssrMotorList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -255,7 +250,7 @@ public class TPssrMotorController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrMotor.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -1,16 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrNitrogen;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrNitrogenService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -23,24 +26,16 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrNitrogen;
-import com.ruoyi.project.pssr.service.ITPssrNitrogenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * 系统氮气置换Controller
@@ -50,8 +45,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/nitrogen")
-public class TPssrNitrogenController extends BaseController
-{
+public class TPssrNitrogenController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrNitrogenService tPssrNitrogenService;
 
@@ -69,10 +65,12 @@ public class TPssrNitrogenController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrNitrogen tPssrNitrogen)
-    {
+    public TableDataInfo list(TPssrNitrogen tPssrNitrogen) {
         startPage();
         List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
+        });
         return getDataTable(list);
     }
 
@@ -82,8 +80,7 @@ public class TPssrNitrogenController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:export')")
     @Log(title = "系统氮气置换", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrNitrogen tPssrNitrogen)
-    {
+    public AjaxResult export(TPssrNitrogen tPssrNitrogen) {
         List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -124,8 +121,8 @@ public class TPssrNitrogenController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 8, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 9, 1, 1);
                 } catch (NumberFormatException e) {
@@ -158,9 +155,10 @@ public class TPssrNitrogenController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrNitrogenService.selectTPssrNitrogenById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -169,8 +167,7 @@ public class TPssrNitrogenController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:add')")
     @Log(title = "系统氮气置换", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrNitrogen tPssrNitrogen)
-    {
+    public AjaxResult add(@RequestBody TPssrNitrogen tPssrNitrogen) {
         tPssrNitrogen.setApproveStatus(0L);
         this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.insertTPssrNitrogen(tPssrNitrogen));
@@ -178,6 +175,7 @@ public class TPssrNitrogenController extends BaseController
 
     /**
      * 验证氧气/露点是否合格
+     *
      * @param tPssrNitrogen
      */
     private void verifySatndard(TPssrNitrogen tPssrNitrogen) {
@@ -214,8 +212,8 @@ public class TPssrNitrogenController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:edit')")
     @Log(title = "系统氮气置换", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen)
-    {
+    public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen) {
+        tPssrFileService.updateFileRelevance(tPssrNitrogen.getFileIds(), "dqzh", tPssrNitrogen.getId(), tPssrNitrogen.getSubId());
         this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.updateTPssrNitrogen(tPssrNitrogen));
     }
@@ -225,9 +223,8 @@ public class TPssrNitrogenController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:nitrogen:remove')")
     @Log(title = "系统氮气置换", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrNitrogenService.deleteTPssrNitrogenByIds(ids));
     }
 
@@ -292,7 +289,7 @@ public class TPssrNitrogenController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrNitrogen.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -9,28 +9,28 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
-import org.activiti.engine.*;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,6 +46,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulExchanger")
 public class TPssrOverhaulExchangerController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrOverhaulExchangerService tPssrOverhaulExchangerService;
 
@@ -70,11 +72,14 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulExchanger:list')")
     @GetMapping("/list")
     public TableDataInfo list(TPssrOverhaulExchanger tPssrOverhaulExchanger) {
-        if ("1".equals(tPssrOverhaulExchanger.getConfirmedPerson())){
+        if ("1".equals(tPssrOverhaulExchanger.getConfirmedPerson())) {
             tPssrOverhaulExchanger.setConfirmedPerson(getUserId().toString());
         }
         startPage();
         List<TPssrOverhaulExchanger> list = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(tPssrOverhaulExchanger);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+        });
         return getDataTable(list);
     }
 
@@ -121,7 +126,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
                 row.createCell(6);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
-                    String confirm1 =  sysUser.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
@@ -152,7 +157,9 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulExchanger:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id));
+        TPssrOverhaulExchanger item = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -173,6 +180,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @Log(title = "检修项目-换热器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
+        tPssrFileService.updateFileRelevance(tPssrOverhaulExchanger.getFileIds(), "jxxm-hrq", tPssrOverhaulExchanger.getId(), tPssrOverhaulExchanger.getSubId());
         return toAjax(tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(tPssrOverhaulExchanger));
     }
 
@@ -196,7 +204,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
         if (tPssrOverhaulExchanger.getIds() != null && tPssrOverhaulExchanger.getIds().length > 0) {
             for (Long id : tPssrOverhaulExchanger.getIds()) {
                 TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
-                if (exchanger.getCompletionDate()==null){
+                if (exchanger.getCompletionDate() == null) {
                     exchanger.setCompletionDate(new Date());
                 }
                 exchanger.setApproveStatus(2L);
@@ -210,7 +218,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
             exchanger.setConfirmedPerson(getUserId().toString());
             exchanger.setApproveStatus(1L);
             for (TPssrOverhaulExchanger overhaulExchanger : tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(exchanger)) {
-                if (overhaulExchanger.getCompletionDate()==null){
+                if (overhaulExchanger.getCompletionDate() == null) {
                     overhaulExchanger.setCompletionDate(new Date());
                 }
                 overhaulExchanger.setApproveStatus(2L);
@@ -224,7 +232,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
         entity.setSubId(tPssrOverhaulExchanger.getSubId());
         entity.setApproveStatus(1L);
         TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
-        if (exchanger!=null) {
+        if (exchanger != null) {
             String confirmedPerson = exchanger.getConfirmedPerson();
             logger.info("===========confirmedPerson:{}", confirmedPerson);
             //如果当前用户还有待审批任务
@@ -233,10 +241,10 @@ public class TPssrOverhaulExchangerController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulExchanger.getSubId());
-        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -1,18 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulFilter;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
@@ -24,23 +25,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulFilterService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 检修项目-过滤器Controller
@@ -50,8 +43,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/overhaulFilter")
-public class TPssrOverhaulFilterController extends BaseController
-{
+public class TPssrOverhaulFilterController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrOverhaulFilterService tPssrOverhaulFilterService;
 
@@ -149,13 +143,15 @@ public class TPssrOverhaulFilterController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrOverhaulFilter tPssrOverhaulFilter)
-    {
-        if ("1".equals(tPssrOverhaulFilter.getRespPerson())){
+    public TableDataInfo list(TPssrOverhaulFilter tPssrOverhaulFilter) {
+        if ("1".equals(tPssrOverhaulFilter.getRespPerson())) {
             tPssrOverhaulFilter.setRespPerson(getUserId().toString());
         }
         startPage();
         List<TPssrOverhaulFilter> list = tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(tPssrOverhaulFilter);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+        });
         return getDataTable(list);
     }
 
@@ -165,8 +161,7 @@ public class TPssrOverhaulFilterController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:export')")
     @Log(title = "检修项目-过滤器", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrOverhaulFilter tPssrOverhaulFilter)
-    {
+    public AjaxResult export(TPssrOverhaulFilter tPssrOverhaulFilter) {
         List<TPssrOverhaulFilter> list = tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(tPssrOverhaulFilter);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -206,7 +201,7 @@ public class TPssrOverhaulFilterController extends BaseController
                 row.createCell(9);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getRespPerson()));
-                    String confirm1 =  sysUser.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
@@ -236,9 +231,10 @@ public class TPssrOverhaulFilterController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrOverhaulFilter item = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -247,8 +243,7 @@ public class TPssrOverhaulFilterController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:add')")
     @Log(title = "检修项目-过滤器", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter)
-    {
+    public AjaxResult add(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
         tPssrOverhaulFilter.setApproveStatus(0L);
         return toAjax(tPssrOverhaulFilterService.insertTPssrOverhaulFilter(tPssrOverhaulFilter));
     }
@@ -259,8 +254,8 @@ public class TPssrOverhaulFilterController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:edit')")
     @Log(title = "检修项目-过滤器", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter)
-    {
+    public AjaxResult edit(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
+        tPssrFileService.updateFileRelevance(tPssrOverhaulFilter.getFileIds(), "jxxm-glq", tPssrOverhaulFilter.getId(), tPssrOverhaulFilter.getSubId());
         return toAjax(tPssrOverhaulFilterService.updateTPssrOverhaulFilter(tPssrOverhaulFilter));
     }
 
@@ -269,9 +264,8 @@ public class TPssrOverhaulFilterController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:remove')")
     @Log(title = "检修项目-过滤器", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrOverhaulFilterService.deleteTPssrOverhaulFilterByIds(ids));
     }
 
@@ -282,7 +276,7 @@ public class TPssrOverhaulFilterController extends BaseController
         if (tPssrOverhaulFilter.getIds() != null && tPssrOverhaulFilter.getIds().length > 0) {
             for (Long id : tPssrOverhaulFilter.getIds()) {
                 TPssrOverhaulFilter filter = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
-                if (filter.getCompletionDate()==null){
+                if (filter.getCompletionDate() == null) {
                     filter.setCompletionDate(new Date());
                 }
                 filter.setApproveStatus(2L);
@@ -296,7 +290,7 @@ public class TPssrOverhaulFilterController extends BaseController
             filter.setRespPerson(getUserId().toString());
             filter.setApproveStatus(1L);
             for (TPssrOverhaulFilter overhaulFilter : tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(filter)) {
-                if (overhaulFilter.getCompletionDate()==null){
+                if (overhaulFilter.getCompletionDate() == null) {
                     overhaulFilter.setCompletionDate(new Date());
                 }
                 overhaulFilter.setApproveStatus(2L);
@@ -310,7 +304,7 @@ public class TPssrOverhaulFilterController extends BaseController
         entity.setSubId(tPssrOverhaulFilter.getSubId());
         entity.setApproveStatus(1L);
         TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
-        if (exchanger!=null) {
+        if (exchanger != null) {
             String confirmedPerson = exchanger.getConfirmedPerson();
             logger.info("===========confirmedPerson:{}", confirmedPerson);
             //如果当前用户还有待审批任务
@@ -319,10 +313,10 @@ public class TPssrOverhaulFilterController extends BaseController
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulFilter.getSubId());
-        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -11,10 +11,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulPipe;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulPipeService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
@@ -34,6 +31,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulPipe")
 public class TPssrOverhaulPipeController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrOverhaulPipeService tPssrOverhaulPipeService;
 
@@ -134,6 +133,9 @@ public class TPssrOverhaulPipeController extends BaseController {
         }
         startPage();
         List<TPssrOverhaulPipe> list = tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(tPssrOverhaulPipe);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-gx"));
+        });
         return getDataTable(list);
     }
 
@@ -155,7 +157,9 @@ public class TPssrOverhaulPipeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulPipe:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(id));
+        TPssrOverhaulPipe item = tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-gx"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -176,6 +180,7 @@ public class TPssrOverhaulPipeController extends BaseController {
     @Log(title = "检修项目-管线", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulPipe tPssrOverhaulPipe) {
+        tPssrFileService.updateFileRelevance(tPssrOverhaulPipe.getFileIds(), "jxxm-gx", tPssrOverhaulPipe.getId(), tPssrOverhaulPipe.getSubId());
         return toAjax(tPssrOverhaulPipeService.updateTPssrOverhaulPipe(tPssrOverhaulPipe));
     }
 
@@ -233,7 +238,7 @@ public class TPssrOverhaulPipeController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulPipe.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java

@@ -11,10 +11,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulPump;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulPumpService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
@@ -34,6 +31,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/overhaulPump")
 public class TPssrOverhaulPumpController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrOverhaulPumpService tPssrOverhaulPumpService;
 
@@ -136,6 +135,9 @@ public class TPssrOverhaulPumpController extends BaseController {
         }
         startPage();
         List<TPssrOverhaulPump> list = tPssrOverhaulPumpService.selectTPssrOverhaulPumpList(tPssrOverhaulPump);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
+        });
         return getDataTable(list);
     }
 
@@ -157,7 +159,9 @@ public class TPssrOverhaulPumpController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:overhaulPump:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id));
+        TPssrOverhaulPump item = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -178,6 +182,7 @@ public class TPssrOverhaulPumpController extends BaseController {
     @Log(title = "检修项目-泵", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrOverhaulPump tPssrOverhaulPump) {
+        tPssrFileService.updateFileRelevance(tPssrOverhaulPump.getFileIds(), "jxxm-b", tPssrOverhaulPump.getId(), tPssrOverhaulPump.getSubId());
         return toAjax(tPssrOverhaulPumpService.updateTPssrOverhaulPump(tPssrOverhaulPump));
     }
 
@@ -235,7 +240,7 @@ public class TPssrOverhaulPumpController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulPump.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -1,18 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulTower;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
@@ -24,23 +25,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulTowerService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 检修项目-塔罐Controller
@@ -50,8 +43,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/overhaulTower")
-public class TPssrOverhaulTowerController extends BaseController
-{
+public class TPssrOverhaulTowerController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrOverhaulTowerService tPssrOverhaulTowerService;
 
@@ -149,13 +143,15 @@ public class TPssrOverhaulTowerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrOverhaulTower tPssrOverhaulTower)
-    {
-        if ("1".equals(tPssrOverhaulTower.getConfirmedPerson())){
+    public TableDataInfo list(TPssrOverhaulTower tPssrOverhaulTower) {
+        if ("1".equals(tPssrOverhaulTower.getConfirmedPerson())) {
             tPssrOverhaulTower.setConfirmedPerson(getUserId().toString());
         }
         startPage();
         List<TPssrOverhaulTower> list = tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tPssrOverhaulTower);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+        });
         return getDataTable(list);
     }
 
@@ -165,8 +161,7 @@ public class TPssrOverhaulTowerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:export')")
     @Log(title = "检修项目-塔罐", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrOverhaulTower tPssrOverhaulTower)
-    {
+    public AjaxResult export(TPssrOverhaulTower tPssrOverhaulTower) {
         List<TPssrOverhaulTower> list = tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tPssrOverhaulTower);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -203,7 +198,7 @@ public class TPssrOverhaulTowerController extends BaseController
                 row.createCell(6);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
-                    String confirm1 =  sysUser.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
@@ -233,9 +228,10 @@ public class TPssrOverhaulTowerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrOverhaulTower item = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -244,8 +240,7 @@ public class TPssrOverhaulTowerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:add')")
     @Log(title = "检修项目-塔罐", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrOverhaulTower tPssrOverhaulTower)
-    {
+    public AjaxResult add(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
         tPssrOverhaulTower.setApproveStatus(0L);
         return toAjax(tPssrOverhaulTowerService.insertTPssrOverhaulTower(tPssrOverhaulTower));
     }
@@ -256,8 +251,8 @@ public class TPssrOverhaulTowerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:edit')")
     @Log(title = "检修项目-塔罐", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrOverhaulTower tPssrOverhaulTower)
-    {
+    public AjaxResult edit(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
+        tPssrFileService.updateFileRelevance(tPssrOverhaulTower.getFileIds(), "jxxm-tg", tPssrOverhaulTower.getId(), tPssrOverhaulTower.getSubId());
         return toAjax(tPssrOverhaulTowerService.updateTPssrOverhaulTower(tPssrOverhaulTower));
     }
 
@@ -266,9 +261,8 @@ public class TPssrOverhaulTowerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulTower:remove')")
     @Log(title = "检修项目-塔罐", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrOverhaulTowerService.deleteTPssrOverhaulTowerByIds(ids));
     }
 
@@ -279,7 +273,7 @@ public class TPssrOverhaulTowerController extends BaseController
         if (tPssrOverhaulTower.getIds() != null && tPssrOverhaulTower.getIds().length > 0) {
             for (Long id : tPssrOverhaulTower.getIds()) {
                 TPssrOverhaulTower tower = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
-                if (tower.getCompletionDate()==null){
+                if (tower.getCompletionDate() == null) {
                     tower.setCompletionDate(new Date());
                 }
                 tower.setApproveStatus(2L);
@@ -293,7 +287,7 @@ public class TPssrOverhaulTowerController extends BaseController
             tower.setConfirmedPerson(getUserId().toString());
             tower.setApproveStatus(1L);
             for (TPssrOverhaulTower overhaulTower : tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tower)) {
-                if (overhaulTower.getCompletionDate()==null){
+                if (overhaulTower.getCompletionDate() == null) {
                     overhaulTower.setCompletionDate(new Date());
                 }
                 overhaulTower.setApproveStatus(2L);
@@ -307,7 +301,7 @@ public class TPssrOverhaulTowerController extends BaseController
         entity.setSubId(tPssrOverhaulTower.getSubId());
         entity.setApproveStatus(1L);
         TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
-        if (exchanger!=null) {
+        if (exchanger != null) {
             String confirmedPerson = exchanger.getConfirmedPerson();
             logger.info("===========confirmedPerson:{}", confirmedPerson);
             //如果当前用户还有待审批任务
@@ -316,10 +310,10 @@ public class TPssrOverhaulTowerController extends BaseController
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulTower.getSubId());
-        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -1,20 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
+import com.ruoyi.project.pssr.domain.TPssrOverhaulValve;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulExchangerService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
@@ -26,24 +25,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulValve;
-import com.ruoyi.project.pssr.service.ITPssrOverhaulValveService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 检修项目-阀门Controller
@@ -53,8 +43,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/overhaulValve")
-public class TPssrOverhaulValveController extends BaseController
-{
+public class TPssrOverhaulValveController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrOverhaulValveService tPssrOverhaulValveService;
 
@@ -152,13 +143,15 @@ public class TPssrOverhaulValveController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrOverhaulValve tPssrOverhaulValve)
-    {
-        if ("1".equals(tPssrOverhaulValve.getIdentifyingPerson())){
+    public TableDataInfo list(TPssrOverhaulValve tPssrOverhaulValve) {
+        if ("1".equals(tPssrOverhaulValve.getIdentifyingPerson())) {
             tPssrOverhaulValve.setIdentifyingPerson(getUserId().toString());
         }
         startPage();
         List<TPssrOverhaulValve> list = tPssrOverhaulValveService.selectTPssrOverhaulValveList(tPssrOverhaulValve);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+        });
         return getDataTable(list);
     }
 
@@ -168,8 +161,7 @@ public class TPssrOverhaulValveController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:export')")
     @Log(title = "检修项目-阀门", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrOverhaulValve tPssrOverhaulValve)
-    {
+    public AjaxResult export(TPssrOverhaulValve tPssrOverhaulValve) {
         List<TPssrOverhaulValve> list = tPssrOverhaulValveService.selectTPssrOverhaulValveList(tPssrOverhaulValve);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -210,7 +202,7 @@ public class TPssrOverhaulValveController extends BaseController
                 row.createCell(10);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getIdentifyingPerson()));
-                    String confirm1 =  sysUser.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
@@ -240,9 +232,10 @@ public class TPssrOverhaulValveController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrOverhaulValveService.selectTPssrOverhaulValveById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrOverhaulValve item = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -251,8 +244,7 @@ public class TPssrOverhaulValveController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:add')")
     @Log(title = "检修项目-阀门", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrOverhaulValve tPssrOverhaulValve)
-    {
+    public AjaxResult add(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
         tPssrOverhaulValve.setApproveStatus(0L);
         return toAjax(tPssrOverhaulValveService.insertTPssrOverhaulValve(tPssrOverhaulValve));
     }
@@ -263,8 +255,8 @@ public class TPssrOverhaulValveController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:edit')")
     @Log(title = "检修项目-阀门", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrOverhaulValve tPssrOverhaulValve)
-    {
+    public AjaxResult edit(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
+        tPssrFileService.updateFileRelevance(tPssrOverhaulValve.getFileIds(), "jxxm-fm", tPssrOverhaulValve.getId(), tPssrOverhaulValve.getSubId());
         return toAjax(tPssrOverhaulValveService.updateTPssrOverhaulValve(tPssrOverhaulValve));
     }
 
@@ -273,9 +265,8 @@ public class TPssrOverhaulValveController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulValve:remove')")
     @Log(title = "检修项目-阀门", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrOverhaulValveService.deleteTPssrOverhaulValveByIds(ids));
     }
 
@@ -286,7 +277,7 @@ public class TPssrOverhaulValveController extends BaseController
         if (tPssrOverhaulValve.getIds() != null && tPssrOverhaulValve.getIds().length > 0) {
             for (Long id : tPssrOverhaulValve.getIds()) {
                 TPssrOverhaulValve valve = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
-                if (valve.getDoneDate()==null){
+                if (valve.getDoneDate() == null) {
                     valve.setDoneDate(new Date());
                 }
                 valve.setApproveStatus(2L);
@@ -300,7 +291,7 @@ public class TPssrOverhaulValveController extends BaseController
             valve.setIdentifyingPerson(getUserId().toString());
             valve.setApproveStatus(1L);
             for (TPssrOverhaulValve overhaulValve : tPssrOverhaulValveService.selectTPssrOverhaulValveList(valve)) {
-                if (overhaulValve.getDoneDate()==null){
+                if (overhaulValve.getDoneDate() == null) {
                     overhaulValve.setDoneDate(new Date());
                 }
                 overhaulValve.setApproveStatus(2L);
@@ -314,7 +305,7 @@ public class TPssrOverhaulValveController extends BaseController
         entity.setSubId(tPssrOverhaulValve.getSubId());
         entity.setApproveStatus(1L);
         TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectAllConfirmedPersonBySubId(entity);
-        if (exchanger!=null) {
+        if (exchanger != null) {
             String confirmedPerson = exchanger.getConfirmedPerson();
             logger.info("===========confirmedPerson:{}", confirmedPerson);
             //如果当前用户还有待审批任务
@@ -323,10 +314,10 @@ public class TPssrOverhaulValveController extends BaseController
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrOverhaulValve.getSubId());
-        TPssrApproveController.handleConfirmApprove(tPssrApprove,getUserId().toString());
+        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPatrolController.java

@@ -6,19 +6,15 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.patrol.patrol.domain.TPatrolMain;
-import com.ruoyi.project.patrol.patrol.domain.TPatrolPlan;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolMainService;
 import com.ruoyi.project.patrol.patrol.service.ITPatrolPlanService;
 import com.ruoyi.project.pssr.domain.TPssrPatrol;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrPatrolService;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,6 +26,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/patrol")
 public class TPssrPatrolController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPatrolService tPssrPatrolService;
     @Autowired
@@ -76,7 +74,7 @@ public class TPssrPatrolController extends BaseController {
     @Log(title = "巡检", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPatrol tPssrPatrol) {
-        return toAjax(tPssrPatrolService.insertTPssrPatrol(tPssrPatrol,getUserId().toString()));
+        return toAjax(tPssrPatrolService.insertTPssrPatrol(tPssrPatrol, getUserId().toString()));
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -13,6 +13,7 @@ import com.ruoyi.project.pssr.domain.TPssrPipe;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrPipeService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
@@ -37,6 +38,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pipe")
 public class TPssrPipeController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPipeService tPssrPipeService;
     @Resource
@@ -64,6 +67,9 @@ public class TPssrPipeController extends BaseController {
     public TableDataInfo list(TPssrPipe tPssrPipe) {
         startPage();
         List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(tPssrPipe);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylgd"));
+        });
         return getDataTable(list);
     }
 
@@ -123,7 +129,9 @@ public class TPssrPipeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pipe:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrPipeService.selectTPssrPipeById(id));
+        TPssrPipe item = tPssrPipeService.selectTPssrPipeById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylgd"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -147,6 +155,7 @@ public class TPssrPipeController extends BaseController {
     @Log(title = "管道", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPipe tPssrPipe) {
+        tPssrFileService.updateFileRelevance(tPssrPipe.getFileIds(), "ylgd", tPssrPipe.getId(), tPssrPipe.getSubId());
         return toAjax(tPssrPipeService.updateTPssrPipe(tPssrPipe));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -1,15 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrPower;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrPowerService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -22,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrPower;
-import com.ruoyi.project.pssr.service.ITPssrPowerService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 临时电源Controller
@@ -49,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/power")
-public class TPssrPowerController extends BaseController
-{
+public class TPssrPowerController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPowerService tPssrPowerService;
 
@@ -69,10 +65,12 @@ public class TPssrPowerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:power:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrPower tPssrPower)
-    {
+    public TableDataInfo list(TPssrPower tPssrPower) {
         startPage();
         List<TPssrPower> list = tPssrPowerService.selectTPssrPowerList(tPssrPower);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "lsdy"));
+        });
         return getDataTable(list);
     }
 
@@ -82,8 +80,7 @@ public class TPssrPowerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:power:export')")
     @Log(title = "临时电源", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrPower tPssrPower)
-    {
+    public AjaxResult export(TPssrPower tPssrPower) {
         List<TPssrPower> list = tPssrPowerService.selectTPssrPowerList(tPssrPower);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -119,8 +116,8 @@ public class TPssrPowerController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
                 } catch (NumberFormatException e) {
@@ -153,9 +150,10 @@ public class TPssrPowerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:power:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrPowerService.selectTPssrPowerById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrPower item = tPssrPowerService.selectTPssrPowerById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "lsdy"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -164,8 +162,7 @@ public class TPssrPowerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:power:add')")
     @Log(title = "临时电源", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrPower tPssrPower)
-    {
+    public AjaxResult add(@RequestBody TPssrPower tPssrPower) {
         tPssrPower.setApproveStatus(0L);
         return toAjax(tPssrPowerService.insertTPssrPower(tPssrPower));
     }
@@ -176,8 +173,8 @@ public class TPssrPowerController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:power:edit')")
     @Log(title = "临时电源", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrPower tPssrPower)
-    {
+    public AjaxResult edit(@RequestBody TPssrPower tPssrPower) {
+        tPssrFileService.updateFileRelevance(tPssrPower.getFileIds(), "lsdy", tPssrPower.getId(), tPssrPower.getSubId());
         return toAjax(tPssrPowerService.updateTPssrPower(tPssrPower));
     }
 
@@ -186,9 +183,8 @@ public class TPssrPowerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:power:remove')")
     @Log(title = "临时电源", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrPowerService.deleteTPssrPowerByIds(ids));
     }
 
@@ -218,7 +214,7 @@ public class TPssrPowerController extends BaseController
             for (Long id : tPssrPower.getIds()) {
                 TPssrPower item = tPssrPowerService.selectTPssrPowerById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrPowerService.updateTPssrPower(item);
@@ -228,7 +224,7 @@ public class TPssrPowerController extends BaseController
             lock.setSubId(tPssrPower.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrPower item : tPssrPowerService.selectTPssrPowerList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -252,7 +248,7 @@ public class TPssrPowerController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPower.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java

@@ -1,17 +1,20 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrProgramme;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrProgrammeService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -24,19 +27,17 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrProgramme;
-import com.ruoyi.project.pssr.service.ITPssrProgrammeService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
+
 /**
  * 开工方案Controller
  *
@@ -45,8 +46,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/pssr/programme")
-public class TPssrProgrammeController extends BaseController
-{
+public class TPssrProgrammeController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrProgrammeService tPssrProgrammeService;
 
@@ -65,8 +67,7 @@ public class TPssrProgrammeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:programme:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrProgramme tPssrProgramme)
-    {
+    public TableDataInfo list(TPssrProgramme tPssrProgramme) {
         startPage();
         List<TPssrProgramme> list = tPssrProgrammeService.selectTPssrProgrammeList(tPssrProgramme);
         return getDataTable(list);
@@ -78,8 +79,7 @@ public class TPssrProgrammeController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:programme:export')")
     @Log(title = "开工方案", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrProgramme tPssrProgramme)
-    {
+    public AjaxResult export(TPssrProgramme tPssrProgramme) {
         List<TPssrProgramme> list = tPssrProgrammeService.selectTPssrProgrammeList(tPssrProgramme);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -118,8 +118,8 @@ public class TPssrProgrammeController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
                 } catch (NumberFormatException e) {
@@ -162,8 +162,7 @@ public class TPssrProgrammeController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:programme:add')")
     @Log(title = "开工方案", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrProgramme tPssrProgramme)
-    {
+    public AjaxResult add(@RequestBody TPssrProgramme tPssrProgramme) {
         return toAjax(tPssrProgrammeService.insertTPssrProgramme(tPssrProgramme));
     }
 
@@ -183,9 +182,8 @@ public class TPssrProgrammeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:programme:remove')")
     @Log(title = "开工方案", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrProgrammeService.deleteTPssrProgrammeByIds(ids));
     }
 
@@ -322,13 +320,10 @@ public class TPssrProgrammeController extends BaseController
     }
 
 
-
     @Log(title = "仪联锁测试附件上传", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadFile")
-    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, Long subId) throws IOException
-    {
-        if (!file.isEmpty())
-        {
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, Long subId) throws IOException {
+        if (!file.isEmpty()) {
             String url = FileUploadUtils.upload(RuoYiConfig.getFilePath("/pssr/programme"), file);
             TPssrProgramme test = new TPssrProgramme();
             test.setSubId(subId);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java

@@ -9,9 +9,11 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrProtection;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrProtectionService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
@@ -44,6 +46,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/protection")
 public class TPssrProtectionController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrProtectionService tPssrProtectionService;
 
@@ -70,6 +74,9 @@ public class TPssrProtectionController extends BaseController {
     public TableDataInfo list(TPssrProtection tPssrProtection) {
         startPage();
         List<TPssrProtection> list = tPssrProtectionService.selectTPssrProtectionList(tPssrProtection);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh"));
+        });
         return getDataTable(list);
     }
 
@@ -115,8 +122,8 @@ public class TPssrProtectionController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
                 } catch (NumberFormatException e) {
@@ -149,7 +156,9 @@ public class TPssrProtectionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:protection:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrProtectionService.selectTPssrProtectionById(id));
+        TPssrProtection item = tPssrProtectionService.selectTPssrProtectionById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -172,6 +181,7 @@ public class TPssrProtectionController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrProtection tPssrProtection) {
+        tPssrFileService.updateFileRelevance(tPssrProtection.getFileIds(), "rsfh", tPssrProtection.getId(), tPssrProtection.getSubId());
         return toAjax(tPssrProtectionService.updateTPssrProtection(tPssrProtection));
     }
 
@@ -253,7 +263,7 @@ public class TPssrProtectionController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrProtection.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -1,17 +1,19 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPublic;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
+import com.ruoyi.project.pssr.service.ITPssrPublicService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -24,24 +26,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrPublic;
-import com.ruoyi.project.pssr.service.ITPssrPublicService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 公用工程Controller
@@ -51,8 +44,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/public")
-public class TPssrPublicController extends BaseController
-{
+public class TPssrPublicController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPublicService tPssrPublicService;
 
@@ -71,8 +65,7 @@ public class TPssrPublicController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:public:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrPublic tPssrPublic)
-    {
+    public TableDataInfo list(TPssrPublic tPssrPublic) {
         startPage();
         List<TPssrPublic> list = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
         return getDataTable(list);
@@ -84,8 +77,7 @@ public class TPssrPublicController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:public:export')")
     @Log(title = "公用工程", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrPublic tPssrPublic)
-    {
+    public AjaxResult export(TPssrPublic tPssrPublic) {
         List<TPssrPublic> list = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
         return AjaxResult.success(exportTmpl(list));
     }
@@ -121,8 +113,8 @@ public class TPssrPublicController extends BaseController
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 =  sysUser.getSignUrl();
-                    String confirm2=  sysUser2.getSignUrl();
+                    String confirm1 = sysUser.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 3, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 4, 1, 1);
                 } catch (NumberFormatException e) {
@@ -166,8 +158,7 @@ public class TPssrPublicController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:public:add')")
     @Log(title = "公用工程", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrPublic tPssrPublic)
-    {
+    public AjaxResult add(@RequestBody TPssrPublic tPssrPublic) {
         tPssrPublic.setApproveStatus(0L);
         return toAjax(tPssrPublicService.insertTPssrPublic(tPssrPublic));
     }
@@ -188,9 +179,8 @@ public class TPssrPublicController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:public:remove')")
     @Log(title = "公用工程", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrPublicService.deleteTPssrPublicByIds(ids));
     }
 
@@ -220,7 +210,7 @@ public class TPssrPublicController extends BaseController
             for (Long id : tPssrPublic.getIds()) {
                 TPssrPublic item = tPssrPublicService.selectTPssrPublicById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrPublicService.updateTPssrPublic(item);
@@ -230,7 +220,7 @@ public class TPssrPublicController extends BaseController
             lock.setSubId(tPssrPublic.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrPublic item : tPssrPublicService.selectTPssrPublicList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);
@@ -254,7 +244,7 @@ public class TPssrPublicController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPublic.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -7,11 +7,11 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrPumpCleaningService;
-import com.ruoyi.project.pssr.service.ITPssrPumpFillService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrPumpCleaning;
+import com.ruoyi.project.pssr.domain.TPssrPumpFill;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
@@ -31,6 +31,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pumpCleaning")
 public class TPssrPumpCleaningController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPumpCleaningService tPssrPumpCleaningService;
     @Autowired
@@ -56,6 +58,9 @@ public class TPssrPumpCleaningController extends BaseController {
     public TableDataInfo list(TPssrPumpCleaning tPssrPumpCleaning) {
         startPage();
         List<TPssrPumpCleaning> list = tPssrPumpCleaningService.selectTPssrPumpCleaningList(tPssrPumpCleaning);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-c"));
+        });
         return getDataTable(list);
     }
 
@@ -77,7 +82,9 @@ public class TPssrPumpCleaningController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pumpCleaning:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrPumpCleaningService.selectTPssrPumpCleaningById(id));
+        TPssrPumpCleaning item = tPssrPumpCleaningService.selectTPssrPumpCleaningById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-c"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -100,6 +107,7 @@ public class TPssrPumpCleaningController extends BaseController {
     @Log(title = "机泵过滤器清理工作清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
+        tPssrFileService.updateFileRelevance(tPssrPumpCleaning.getFileIds(), "jb-c", tPssrPumpCleaning.getId(), tPssrPumpCleaning.getSubId());
         return toAjax(tPssrPumpCleaningService.updateTPssrPumpCleaning(tPssrPumpCleaning));
     }
 
@@ -182,7 +190,7 @@ public class TPssrPumpCleaningController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpCleaning.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -11,6 +11,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPumpFill;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrPumpFillService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
 import org.activiti.engine.HistoryService;
@@ -32,6 +33,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pumpFill")
 public class TPssrPumpFillController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPumpFillService tPssrPumpFillService;
 
@@ -55,6 +58,9 @@ public class TPssrPumpFillController extends BaseController {
     public TableDataInfo list(TPssrPumpFill tPssrPumpFill) {
         startPage();
         List<TPssrPumpFill> list = tPssrPumpFillService.selectTPssrPumpFillList(tPssrPumpFill);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-f"));
+        });
         return getDataTable(list);
     }
 
@@ -76,7 +82,9 @@ public class TPssrPumpFillController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pumpFill:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrPumpFillService.selectTPssrPumpFillById(id));
+        TPssrPumpFill item = tPssrPumpFillService.selectTPssrPumpFillById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-f"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -99,6 +107,7 @@ public class TPssrPumpFillController extends BaseController {
     @Log(title = "机泵润滑油加注确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpFill tPssrPumpFill) {
+        tPssrFileService.updateFileRelevance(tPssrPumpFill.getFileIds(), "jb-f", tPssrPumpFill.getId(), tPssrPumpFill.getSubId());
         return toAjax(tPssrPumpFillService.updateTPssrPumpFill(tPssrPumpFill));
     }
 
@@ -180,7 +189,7 @@ public class TPssrPumpFillController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpFill.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -11,10 +11,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPumpFill;
 import com.ruoyi.project.pssr.domain.TPssrPumpOverhaul;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrPumpFillService;
-import com.ruoyi.project.pssr.service.ITPssrPumpOverhaulService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
@@ -34,6 +31,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/pumpOverhaul")
 public class TPssrPumpOverhaulController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrPumpOverhaulService tPssrPumpOverhaulService;
 
@@ -60,6 +59,9 @@ public class TPssrPumpOverhaulController extends BaseController {
     public TableDataInfo list(TPssrPumpOverhaul tPssrPumpOverhaul) {
         startPage();
         List<TPssrPumpOverhaul> list = tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(tPssrPumpOverhaul);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-o"));
+        });
         return getDataTable(list);
     }
 
@@ -81,7 +83,9 @@ public class TPssrPumpOverhaulController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:pumpOverhaul:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrPumpOverhaulService.selectTPssrPumpOverhaulById(id));
+        TPssrPumpOverhaul item = tPssrPumpOverhaulService.selectTPssrPumpOverhaulById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-o"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -104,6 +108,7 @@ public class TPssrPumpOverhaulController extends BaseController {
     @Log(title = "机泵检修完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpOverhaul tPssrPumpOverhaul) {
+        tPssrFileService.updateFileRelevance(tPssrPumpOverhaul.getFileIds(), "jb-o", tPssrPumpOverhaul.getId(), tPssrPumpOverhaul.getSubId());
         return toAjax(tPssrPumpOverhaulService.updateTPssrPumpOverhaul(tPssrPumpOverhaul));
     }
 
@@ -185,7 +190,7 @@ public class TPssrPumpOverhaulController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrPumpOverhaul.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrRegionController.java

@@ -9,7 +9,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrRegion;
-import com.ruoyi.project.pssr.domain.TPssrRegion;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrRegionService;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -36,6 +36,8 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/pssr/region")
 public class TPssrRegionController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrRegionService tPssrRegionService;
 
@@ -111,7 +113,6 @@ public class TPssrRegionController extends BaseController {
     }
 
 
-
     @PreAuthorize("@ss.hasPermi('pssr:region:add')")
     @Log(title = "分离培训模版", businessType = BusinessType.INSERT)
     @PostMapping("/importData")
@@ -151,7 +152,7 @@ public class TPssrRegionController extends BaseController {
                         entity.setRegion(cellValue);
                     } else if (j == 2) {
                         entity.setUnit(cellValue);
-                    }  else if (j == 3) {
+                    } else if (j == 3) {
                         entity.setRemarks(cellValue);
                     }
                 }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -3,14 +3,13 @@ package com.ruoyi.project.pssr.controller;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
-import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBleedService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -38,6 +37,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyBleed")
 public class TPssrSafetyBleedController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrSafetyBleedService tPssrSafetyBleedService;
 
@@ -52,6 +53,9 @@ public class TPssrSafetyBleedController extends BaseController {
     public TableDataInfo list(TPssrSafetyBleed tPssrSafetyBleed) {
         startPage();
         List<TPssrSafetyBleed> list = tPssrSafetyBleedService.selectTPssrSafetyBleedList(tPssrSafetyBleed);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bd"));
+        });
         return getDataTable(list);
     }
 
@@ -105,8 +109,8 @@ public class TPssrSafetyBleedController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
                 } catch (NumberFormatException e) {
@@ -139,7 +143,9 @@ public class TPssrSafetyBleedController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyBleed:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrSafetyBleedService.selectTPssrSafetyBleedById(id));
+        TPssrSafetyBleed item = tPssrSafetyBleedService.selectTPssrSafetyBleedById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bd"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -160,6 +166,7 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
+        tPssrFileService.updateFileRelevance(tPssrSafetyBleed.getFileIds(), "aqss-bd", tPssrSafetyBleed.getId(), tPssrSafetyBleed.getSubId());
         return toAjax(tPssrSafetyBleedService.updateTPssrSafetyBleed(tPssrSafetyBleed));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java

@@ -3,14 +3,13 @@ package com.ruoyi.project.pssr.controller;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
-import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBreathService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -38,6 +37,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyBreath")
 public class TPssrSafetyBreathController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrSafetyBreathService tPssrSafetyBreathService;
 
@@ -52,6 +53,9 @@ public class TPssrSafetyBreathController extends BaseController {
     public TableDataInfo list(TPssrSafetyBreath tPssrSafetyBreath) {
         startPage();
         List<TPssrSafetyBreath> list = tPssrSafetyBreathService.selectTPssrSafetyBreathList(tPssrSafetyBreath);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bh"));
+        });
         return getDataTable(list);
     }
 
@@ -105,8 +109,8 @@ public class TPssrSafetyBreathController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
                 } catch (NumberFormatException e) {
@@ -139,7 +143,9 @@ public class TPssrSafetyBreathController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyBreath:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrSafetyBreathService.selectTPssrSafetyBreathById(id));
+        TPssrSafetyBreath item = tPssrSafetyBreathService.selectTPssrSafetyBreathById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bh"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -160,6 +166,7 @@ public class TPssrSafetyBreathController extends BaseController {
     @Log(title = "安全设施-呼吸阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
+        tPssrFileService.updateFileRelevance(tPssrSafetyBreath.getFileIds(), "aqss-bh", tPssrSafetyBreath.getId(), tPssrSafetyBreath.getSubId());
         return toAjax(tPssrSafetyBreathService.updateTPssrSafetyBreath(tPssrSafetyBreath));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -3,14 +3,13 @@ package com.ruoyi.project.pssr.controller;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
-import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyBrustService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -38,6 +37,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyBrust")
 public class TPssrSafetyBrustController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrSafetyBrustService tPssrSafetyBrustService;
 
@@ -52,6 +53,9 @@ public class TPssrSafetyBrustController extends BaseController {
     public TableDataInfo list(TPssrSafetyBrust tPssrSafetyBrust) {
         startPage();
         List<TPssrSafetyBrust> list = tPssrSafetyBrustService.selectTPssrSafetyBrustList(tPssrSafetyBrust);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bt"));
+        });
         return getDataTable(list);
     }
 
@@ -105,8 +109,8 @@ public class TPssrSafetyBrustController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
                 } catch (NumberFormatException e) {
@@ -139,7 +143,9 @@ public class TPssrSafetyBrustController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyBrust:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrSafetyBrustService.selectTPssrSafetyBrustById(id));
+        TPssrSafetyBrust item = tPssrSafetyBrustService.selectTPssrSafetyBrustById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bt"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -160,6 +166,7 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
+        tPssrFileService.updateFileRelevance(tPssrSafetyBrust.getFileIds(), "aqss-bt", tPssrSafetyBrust.getId(), tPssrSafetyBrust.getSubId());
         return toAjax(tPssrSafetyBrustService.updateTPssrSafetyBrust(tPssrSafetyBrust));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyController.java

@@ -7,7 +7,8 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
-import org.activiti.engine.*;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/safety")
 public class TPssrSafetyController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
 
     @Autowired
     private RuntimeService runtimeService;
@@ -119,12 +122,13 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBleed.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
+
     /**
      * 确认安全设施-呼吸阀
      */
@@ -193,12 +197,13 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBreath.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
+
     /**
      * 确认安全设施-爆破片
      */
@@ -267,12 +272,13 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyBrust.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
+
     /**
      * 确认安全设施-阻火器
      */
@@ -341,12 +347,13 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyFlamearrester.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
         return AjaxResult.success();
     }
+
     /**
      * 确认安全设施-安全阀
      */
@@ -415,7 +422,7 @@ public class TPssrSafetyController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrSafetyValve.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
@@ -798,8 +805,8 @@ public class TPssrSafetyController extends BaseController {
             Authentication.setAuthenticatedUserId(userId);//设置当前申请人
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
-            variables.put("confirmUsers1",  new ArrayList<>(confirmUsers1));
-            variables.put("confirmUsers2",  new ArrayList<>(confirmUsers2));
+            variables.put("confirmUsers1", new ArrayList<>(confirmUsers1));
+            variables.put("confirmUsers2", new ArrayList<>(confirmUsers2));
             variables.put("chargePerson", approve.getSubCharge());
             //采用key来启动流程定义并设置流程变量，返回流程实例
             ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java

@@ -3,14 +3,13 @@ package com.ruoyi.project.pssr.controller;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
-import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyFlamearresterService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -38,6 +37,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyFlamearrester")
 public class TPssrSafetyFlamearresterController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrSafetyFlamearresterService tPssrSafetyFlamearresterService;
 
@@ -52,6 +53,9 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     public TableDataInfo list(TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
         startPage();
         List<TPssrSafetyFlamearrester> list = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterList(tPssrSafetyFlamearrester);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-f"));
+        });
         return getDataTable(list);
     }
 
@@ -101,8 +105,8 @@ public class TPssrSafetyFlamearresterController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
                 } catch (NumberFormatException e) {
@@ -135,7 +139,9 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyFlamearrester:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterById(id));
+        TPssrSafetyFlamearrester item = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-f"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -156,6 +162,7 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Log(title = "安全设施-阻火器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
+        tPssrFileService.updateFileRelevance(tPssrSafetyFlamearrester.getFileIds(), "aqss-f", tPssrSafetyFlamearrester.getId(), tPssrSafetyFlamearrester.getSubId());
         return toAjax(tPssrSafetyFlamearresterService.updateTPssrSafetyFlamearrester(tPssrSafetyFlamearrester));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -9,7 +9,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrSafetyValve;
-import com.ruoyi.project.pssr.domain.TPssrSafetyValve;
+import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrSafetyValveService;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -37,6 +37,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/pssr/safetyValve")
 public class TPssrSafetyValveController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrSafetyValveService tPssrSafetyValveService;
 
@@ -51,6 +53,9 @@ public class TPssrSafetyValveController extends BaseController {
     public TableDataInfo list(TPssrSafetyValve tPssrSafetyValve) {
         startPage();
         List<TPssrSafetyValve> list = tPssrSafetyValveService.selectTPssrSafetyValveList(tPssrSafetyValve);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-v"));
+        });
         return getDataTable(list);
     }
 
@@ -105,8 +110,8 @@ public class TPssrSafetyValveController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.getSignUrl();
+                    String confirm2 = sysUser2.getSignUrl();
                     ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 12, 1, 1);
                     ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 13, 1, 1);
                 } catch (NumberFormatException e) {
@@ -139,7 +144,9 @@ public class TPssrSafetyValveController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:safetyValve:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrSafetyValveService.selectTPssrSafetyValveById(id));
+        TPssrSafetyValve item = tPssrSafetyValveService.selectTPssrSafetyValveById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-v"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -160,6 +167,7 @@ public class TPssrSafetyValveController extends BaseController {
     @Log(title = "安全设施-安全阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
+        tPssrFileService.updateFileRelevance(tPssrSafetyValve.getFileIds(), "aqss-v", tPssrSafetyValve.getId(), tPssrSafetyValve.getSubId());
         return toAjax(tPssrSafetyValveService.updateTPssrSafetyValve(tPssrSafetyValve));
     }
 

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -1,17 +1,18 @@
 package com.ruoyi.project.pssr.controller;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.pssr.domain.*;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrBlindService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrBlind;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTorchvoc;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.ProcessEngine;
@@ -23,24 +24,15 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.pssr.domain.TPssrTorchvoc;
-import com.ruoyi.project.pssr.service.ITPssrTorchvocService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.*;
 
 /**
  * 火炬，VOC系统Controller
@@ -50,8 +42,9 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/pssr/torchvoc")
-public class TPssrTorchvocController extends BaseController
-{
+public class TPssrTorchvocController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrTorchvocService tPssrTorchvocService;
 
@@ -72,10 +65,12 @@ public class TPssrTorchvocController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TPssrTorchvoc tPssrTorchvoc)
-    {
+    public TableDataInfo list(TPssrTorchvoc tPssrTorchvoc) {
         startPage();
         List<TPssrTorchvoc> list = tPssrTorchvocService.selectTPssrTorchvocList(tPssrTorchvoc);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "hbss"));
+        });
         return getDataTable(list);
     }
 
@@ -85,8 +80,7 @@ public class TPssrTorchvocController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:export')")
     @Log(title = "火炬，VOC系统", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TPssrTorchvoc tPssrTorchvoc)
-    {
+    public AjaxResult export(TPssrTorchvoc tPssrTorchvoc) {
         List<TPssrTorchvoc> list = tPssrTorchvocService.selectTPssrTorchvocList(tPssrTorchvoc);
         return AjaxResult.success(exportTmpl(list, tPssrTorchvoc.getTorchvocType()));
     }
@@ -160,9 +154,10 @@ public class TPssrTorchvocController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(tPssrTorchvocService.selectTPssrTorchvocById(id));
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        TPssrTorchvoc item = tPssrTorchvocService.selectTPssrTorchvocById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "hbss"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -171,8 +166,7 @@ public class TPssrTorchvocController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:add')")
     @Log(title = "火炬，VOC系统", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TPssrTorchvoc tPssrTorchvoc)
-    {
+    public AjaxResult add(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
         tPssrTorchvoc.setApproveStatus(0L);
         return toAjax(tPssrTorchvocService.insertTPssrTorchvoc(tPssrTorchvoc));
     }
@@ -183,8 +177,8 @@ public class TPssrTorchvocController extends BaseController
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:edit')")
     @Log(title = "火炬，VOC系统", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TPssrTorchvoc tPssrTorchvoc)
-    {
+    public AjaxResult edit(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
+        tPssrFileService.updateFileRelevance(tPssrTorchvoc.getFileIds(), "hbss", tPssrTorchvoc.getId(), tPssrTorchvoc.getSubId());
         return toAjax(tPssrTorchvocService.updateTPssrTorchvoc(tPssrTorchvoc));
     }
 
@@ -193,9 +187,8 @@ public class TPssrTorchvocController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('pssr:torchvoc:remove')")
     @Log(title = "火炬，VOC系统", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPssrTorchvocService.deleteTPssrTorchvocByIds(ids));
     }
 
@@ -226,13 +219,13 @@ public class TPssrTorchvocController extends BaseController
             for (Long id : tPssrTorchvoc.getIds()) {
                 TPssrTorchvoc item = tPssrTorchvocService.selectTPssrTorchvocById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate()==null && queryStatus==3) {
-                    if ("火炬系统检修时所加装的盲板已拆除。".equals(item.getContent())){
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                    if ("火炬系统检修时所加装的盲板已拆除。".equals(item.getContent())) {
                         TPssrBlind tPssrBlind = new TPssrBlind();
                         tPssrBlind.setSubId(item.getSubId());
                         TPssrBlind blind = tPssrBlindService.selectTPssrBlindList(tPssrBlind).get(0);
                         item.setConfirmationDate(blind.getInstallDate());
-                    }else {
+                    } else {
                         item.setConfirmationDate(date);
                     }
                 }
@@ -244,13 +237,13 @@ public class TPssrTorchvocController extends BaseController
             lock.setApproveStatus(queryStatus);
             lock.setTorchvocType(tPssrTorchvoc.getTorchvocType());
             for (TPssrTorchvoc item : tPssrTorchvocService.selectTPssrTorchvocList(lock)) {
-                if (item.getConfirmationDate()==null && queryStatus==3) {
-                    if ("火炬系统检修时所加装的盲板已拆除。".equals(item.getContent())){
+                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                    if ("火炬系统检修时所加装的盲板已拆除。".equals(item.getContent())) {
                         TPssrBlind tPssrBlind = new TPssrBlind();
                         tPssrBlind.setSubId(item.getSubId());
                         TPssrBlind blind = tPssrBlindService.selectTPssrBlindList(tPssrBlind).get(0);
                         item.setConfirmationDate(blind.getInstallDate());
-                    }else {
+                    } else {
                         item.setConfirmationDate(date);
                     }
                 }
@@ -275,7 +268,7 @@ public class TPssrTorchvocController extends BaseController
         }
 
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrTorchvoc.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -8,12 +8,11 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
-import com.ruoyi.project.pssr.service.ITPssrPipeService;
-import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
-import com.ruoyi.project.pssr.service.ITPssrVesselService;
-import com.ruoyi.project.sems.domain.TSpecdevYlrq;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrPipe;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrVessel;
+import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.sems.domain.TSpecdevYlrq;
 import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
 import org.activiti.engine.HistoryService;
@@ -35,6 +34,8 @@ import java.util.*;
 @RestController
 @RequestMapping("/pssr/vessel")
 public class TPssrVesselController extends BaseController {
+    @Autowired
+    private ITPssrFileService tPssrFileService;
     @Autowired
     private ITPssrVesselService tPssrVesselService;
 
@@ -63,6 +64,9 @@ public class TPssrVesselController extends BaseController {
     public TableDataInfo list(TPssrVessel tPssrVessel) {
         startPage();
         List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(tPssrVessel);
+        list.forEach(item -> {
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
+        });
         return getDataTable(list);
     }
 
@@ -84,7 +88,9 @@ public class TPssrVesselController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pssr:vessel:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return AjaxResult.success(tPssrVesselService.selectTPssrVesselById(id));
+        TPssrVessel item = tPssrVesselService.selectTPssrVesselById(id);
+        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
+        return AjaxResult.success(item);
     }
 
     /**
@@ -108,6 +114,7 @@ public class TPssrVesselController extends BaseController {
     @Log(title = "压力容器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrVessel tPssrVessel) {
+        tPssrFileService.updateFileRelevance(tPssrVessel.getFileIds(), "ylrq", tPssrVessel.getId(), tPssrVessel.getSubId());
         return toAjax(tPssrVesselService.updateTPssrVessel(tPssrVessel));
     }
 
@@ -238,7 +245,7 @@ public class TPssrVesselController extends BaseController {
             }
         }
         //无待审批任务结束当前用户流程
-        
+
         // 因为流程关系所以approve一定会有且只有一条数据
         TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrVessel.getSubId());
         TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
@@ -246,7 +253,6 @@ public class TPssrVesselController extends BaseController {
     }
 
 
-
     /**
      * 驳回压力容器
      */

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAboveall.java

@@ -1,14 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * PSSR对象 t_pssr_aboveall
  *

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAirtight.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 气密对象 t_pssr_airtight
  *
@@ -113,6 +115,24 @@ public class TPssrAirtight extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAlarm.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 报警联锁值确认对象 t_pssr_alarm
  *
@@ -80,6 +82,24 @@ public class TPssrAlarm extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAnalyzer.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 在线分析仪对象 t_pssr_analyzer
  *
@@ -101,6 +103,24 @@ public class TPssrAnalyzer extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrApprove.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * pssr审批管理对象 t_pssr_approve
  *
@@ -41,6 +43,24 @@ public class TPssrApprove extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrBlind.java

@@ -1,12 +1,13 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.jodconverter.office.utils.Lo;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 盲板对象 t_pssr_blind
@@ -173,6 +174,24 @@ public class TPssrBlind extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCircuit.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 短接对象 t_pssr_circuit
  *
@@ -125,6 +127,24 @@ public class TPssrCircuit extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCleaning.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 设备清洁对象 t_pssr_cleaning
  *
@@ -105,6 +107,24 @@ public class TPssrCleaning extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrContentModel.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 开车条件确认模板对象 t_pssr_content_model
  *
@@ -80,6 +82,24 @@ public class TPssrContentModel extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFile.java

@@ -1,12 +1,13 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * PSSR附件对象 t_pssr_file
  *

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFrame.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 支（吊）架对象 t_pssr_frame
  *
@@ -135,6 +137,24 @@ public class TPssrFrame extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFranklinism.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 静电接地，跨接对象 t_pssr_franklinism
  *
@@ -97,6 +99,24 @@ public class TPssrFranklinism extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrGasdetector.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 气体检测器对象 t_pssr_gasdetector
  *
@@ -101,6 +103,24 @@ public class TPssrGasdetector extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrHygiene.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 现场卫生对象 t_pssr_hygiene
  *
@@ -93,6 +95,24 @@ public class TPssrHygiene extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentCalibration.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 仪校验对象 t_pssr_instrument_calibration
  *
@@ -105,6 +107,24 @@ public class TPssrInstrumentCalibration extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentTest.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 仪联锁测试对象 t_pssr_instrument_test
  *
@@ -80,6 +82,24 @@ public class TPssrInstrumentTest extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLaboratory.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 实验室对象 t_pssr_laboratory
  *
@@ -95,6 +97,24 @@ public class TPssrLaboratory extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLighting.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 照明对象 t_pssr_lighting
  *
@@ -108,6 +110,24 @@ public class TPssrLighting extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLock.java

@@ -1,14 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 锁开锁关阀门状态对象 t_pssr_lock
  *
@@ -138,6 +138,24 @@ public class TPssrLock extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterial.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 原料对象 t_pssr_material
  *
@@ -98,6 +100,24 @@ public class TPssrMaterial extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterialRaw.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 原料对象 t_pssr_material
@@ -99,6 +100,24 @@ public class TPssrMaterialRaw extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMeasure.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 人身防护对象 t_pssr_measure
  *
@@ -22,6 +24,24 @@ public class TPssrMeasure extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMoc.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * MOC完成确认清单对象 t_pssr_moc
  *
@@ -99,6 +101,24 @@ public class TPssrMoc extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMotor.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 电机设备对象 t_pssr_motor
  *
@@ -101,6 +103,24 @@ public class TPssrMotor extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrNitrogen.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 系统氮气置换对象 t_pssr_nitrogen
  *
@@ -106,6 +108,24 @@ public class TPssrNitrogen extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     /** 露点 */
     @Excel(name = "露点")

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulExchanger.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 检修项目-换热器对象 t_pssr_overhaul_exchanger
  *
@@ -99,6 +101,24 @@ public class TPssrOverhaulExchanger extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulFilter.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 检修项目-过滤器对象 t_pssr_overhaul_filter
  *
@@ -110,6 +112,24 @@ public class TPssrOverhaulFilter extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPipe.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 检修项目-管线对象 t_pssr_overhaul_pipe
  *
@@ -94,6 +96,24 @@ public class TPssrOverhaulPipe extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPump.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 检修项目-泵对象 t_pssr_overhaul_pump
  *
@@ -98,6 +100,24 @@ public class TPssrOverhaulPump extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulTower.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 检修项目-塔罐对象 t_pssr_overhaul_tower
  *
@@ -98,6 +100,24 @@ public class TPssrOverhaulTower extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulValve.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 检修项目-阀门对象 t_pssr_overhaul_valve
  *
@@ -142,6 +144,24 @@ public class TPssrOverhaulValve extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPatrol.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 巡检对象 t_pssr_patrol
  *
@@ -93,6 +95,24 @@ public class TPssrPatrol extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPipe.java

@@ -1,14 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 管道对象 t_pssr_pipe
  *
@@ -112,6 +112,24 @@ public class TPssrPipe extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPower.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 临时电源对象 t_pssr_power
  *
@@ -87,6 +89,24 @@ public class TPssrPower extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProgramme.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 开工方案对象 t_pssr_programme
@@ -112,6 +113,24 @@ public class TPssrProgramme extends BaseEntity {
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProtection.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 人身防护对象 t_pssr_protection
  *
@@ -93,6 +95,24 @@ public class TPssrProtection extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPublic.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 公用工程对象 t_pssr_public
  *
@@ -89,6 +91,24 @@ public class TPssrPublic extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpCleaning.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 机泵过滤器清理工作清单对象 t_pssr_pump_cleaning
  *
@@ -109,6 +111,24 @@ public class TPssrPumpCleaning extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpFill.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 机泵润滑油加注确认清单对象 t_pssr_pump_fill
  *
@@ -109,6 +111,24 @@ public class TPssrPumpFill extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpOverhaul.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 机泵检修完成确认清单对象 t_pssr_pump_overhaul
  *
@@ -101,6 +103,24 @@ public class TPssrPumpOverhaul extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrRegion.java

@@ -1,12 +1,13 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+
 /**
  * pssr区域管理对象 t_pssr_region
  *

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBleed.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 安全设施-紧急泄放阀对象 t_pssr_safety_bleed
  *
@@ -150,6 +152,24 @@ public class TPssrSafetyBleed extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBreath.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 安全设施-呼吸阀对象 t_pssr_safety_breath
  *
@@ -150,6 +152,24 @@ public class TPssrSafetyBreath extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBrust.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 安全设施-爆破片对象 t_pssr_safety_brust
  *
@@ -120,6 +122,24 @@ public class TPssrSafetyBrust extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyFlamearrester.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 安全设施-阻火器对象 t_pssr_safety_flamearrester
  *
@@ -104,6 +106,24 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyValve.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 安全设施-安全阀对象 t_pssr_safety_valve
  *
@@ -124,6 +126,24 @@ public class TPssrSafetyValve extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSubcontent.java

@@ -1,14 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 开车条件确认对象 t_pssr_subcontent
  *
@@ -109,6 +109,24 @@ public class TPssrSubcontent extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrTorchvoc.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 火炬，VOC系统对象 t_pssr_torchvoc
  *
@@ -105,6 +107,24 @@ public class TPssrTorchvoc extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrVessel.java

@@ -1,12 +1,14 @@
 package com.ruoyi.project.pssr.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 压力容器对象 t_pssr_vessel
  *
@@ -22,6 +24,24 @@ public class TPssrVessel extends BaseEntity
     private Long approveStatus;
     private String confirm1Name;
     private String confirm2Name;
+    private List<Long> fileIds;
+    private List<TPssrFile> fileList;
+
+    public List<TPssrFile> getFileList() {
+        return fileList;
+    }
+
+    public void setFileList(List<TPssrFile> fileList) {
+        this.fileList = fileList;
+    }
+
+    public List<Long> getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(List<Long> fileIds) {
+        this.fileIds = fileIds;
+    }
 
     public String getConfirm1Name() {
         return confirm1Name;

master/src/main/java/com/ruoyi/project/pssr/service/ITPssrFileService.java

@@ -26,6 +26,7 @@ public interface ITPssrFileService
      * @return PSSR附件集合
      */
     public List<TPssrFile> selectTPssrFileList(TPssrFile tPssrFile);
+    public List<TPssrFile> selectTPssrFileListByItem(Long subId,Long itemId, String forShort);
 
     /**
      * 新增PSSR附件
@@ -58,4 +59,6 @@ public interface ITPssrFileService
      * @return 结果
      */
     public int deleteTPssrFileById(Long fileId);
+
+    public void updateFileRelevance(List<Long> fileIds,String forShort,Long itemId,Long subId);
 }

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrFileServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.pssr.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.pssr.mapper.TPssrFileMapper;
@@ -43,6 +46,15 @@ public class TPssrFileServiceImpl implements ITPssrFileService
         return tPssrFileMapper.selectTPssrFileList(tPssrFile);
     }
 
+    @Override
+    public List<TPssrFile> selectTPssrFileListByItem(Long subId, Long itemId, String forShort) {
+        TPssrFile tPssrFile = new TPssrFile();
+        tPssrFile.setItemId(itemId);
+        tPssrFile.setSubId(subId);
+        tPssrFile.setForShort(forShort);
+        return tPssrFileMapper.selectTPssrFileList(tPssrFile);
+    }
+
     /**
      * 新增PSSR附件
      *
@@ -90,4 +102,19 @@ public class TPssrFileServiceImpl implements ITPssrFileService
     {
         return tPssrFileMapper.deleteTPssrFileById(fileId);
     }
+
+    @Override
+    public void updateFileRelevance(List<Long> fileIds, String forShort, Long itemId,Long subId) {
+        if(!CollectionUtils.isNotEmpty(fileIds)){
+            return;
+        }
+        for (Long fileId : fileIds) {
+            TPssrFile pssrFile = new TPssrFile();
+            pssrFile.setSubId(subId);
+            pssrFile.setItemId(itemId);
+            pssrFile.setForShort(forShort);
+            pssrFile.setFileId(fileId);
+            tPssrFileMapper.updateTPssrFile(pssrFile);
+        }
+    }
 }