- 装置审计记录基础功能代码修改

- 代码生成模板文件修改
- 多部门数据归属处理（部分代码）

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TAuditController.java

@@ -3,7 +3,9 @@ package com.ruoyi.web.controller.rc;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -36,6 +38,9 @@ public class TAuditController extends BaseController
     @Autowired
     private ITAuditService tAuditService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询审计记录列表
      */
@@ -45,6 +50,22 @@ public class TAuditController extends BaseController
     {
         startPage();
         List<TAudit> list = tAuditService.selectTAuditList(tAudit);
+        for (TAudit obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -80,7 +101,7 @@ public class TAuditController extends BaseController
     public AjaxResult add(@RequestBody TAudit tAudit)
     {
         if (StringUtils.isNull(tAudit.getDeptId())) {
-            tAudit.setDeptId(getLoginUser().getDeptId());
+            tAudit.setDeptId(getLoginUser().getDeptId().toString());
         }
         return toAjax(tAuditService.insertTAudit(tAudit));
     }

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TChapController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.rc.domain.TAudit;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TChapController extends BaseController
     @Autowired
     private ITChapService tChapService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询问卷章节列表
      */
@@ -43,6 +51,22 @@ public class TChapController extends BaseController
     {
         startPage();
         List<TChap> list = tChapService.selectTChapList(tChap);
+        for (TChap obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -77,7 +101,7 @@ public class TChapController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TChap tChap)
     {
-        tChap.setDeptId(getLoginUser().getDeptId());
+        tChap.setDeptId(getLoginUser().getDeptId().toString());
         return toAjax(tChapService.insertTChap(tChap));
     }
 

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TDeptInfoController.java

@@ -2,6 +2,10 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.rc.domain.TChap;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +39,9 @@ public class TDeptInfoController extends BaseController
     @Autowired
     private ITDeptInfoService tDeptInfoService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询装置信息列表
      */
@@ -44,6 +51,22 @@ public class TDeptInfoController extends BaseController
     {
         startPage();
         List<TDeptInfo> list = tDeptInfoService.selectTDeptInfoList(tDeptInfo);
+        for (TDeptInfo obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -79,7 +102,7 @@ public class TDeptInfoController extends BaseController
     public AjaxResult add(@RequestBody TDeptInfo tDeptInfo)
     {
         if (StringUtils.isNull(tDeptInfo.getDeptId())) {
-            tDeptInfo.setDeptId(getLoginUser().getDeptId());
+            tDeptInfo.setDeptId(getLoginUser().getDeptId().toString());
         }
         return toAjax(tDeptInfoService.insertTDeptInfo(tDeptInfo));
     }

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TMeetingController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.rc.domain.TDeptInfo;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TMeetingController extends BaseController
     @Autowired
     private ITMeetingService tMeetingService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询会议列表
      */
@@ -43,6 +51,22 @@ public class TMeetingController extends BaseController
     {
         startPage();
         List<TMeeting> list = tMeetingService.selectTMeetingList(tMeeting);
+        for (TMeeting obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -77,7 +101,7 @@ public class TMeetingController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TMeeting tMeeting)
     {
-        tMeeting.setDeptId(getLoginUser().getDeptId());
+        tMeeting.setDeptId(getLoginUser().getDeptId().toString());
         return toAjax(tMeetingService.insertTMeeting(tMeeting));
     }
 

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TOpenItemController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.rc.domain.TMeeting;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TOpenItemController extends BaseController
     @Autowired
     private ITOpenItemService tOpenItemService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询开项列表
      */
@@ -43,6 +51,22 @@ public class TOpenItemController extends BaseController
     {
         startPage();
         List<TOpenItem> list = tOpenItemService.selectTOpenItemList(tOpenItem);
+        for (TOpenItem obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -77,7 +101,7 @@ public class TOpenItemController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TOpenItem tOpenItem)
     {
-        tOpenItem.setDeptId(getLoginUser().getDeptId());
+        tOpenItem.setDeptId(getLoginUser().getDeptId().toString());
         return toAjax(tOpenItemService.insertTOpenItem(tOpenItem));
     }
 

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TProgressController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.rc.domain.TOpenItem;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TProgressController extends BaseController
     @Autowired
     private ITProgressService tProgressService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询进度列表
      */
@@ -43,6 +51,22 @@ public class TProgressController extends BaseController
     {
         startPage();
         List<TProgress> list = tProgressService.selectTProgressList(tProgress);
+        for (TProgress obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -77,7 +101,7 @@ public class TProgressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TProgress tProgress)
     {
-        tProgress.setDeptId(getLoginUser().getDeptId());
+        tProgress.setDeptId(getLoginUser().getDeptId().toString());
         return toAjax(tProgressService.insertTProgress(tProgress));
     }
 

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TSecSubChapController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.rc.domain.TProgress;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TSecSubChapController extends BaseController
     @Autowired
     private ITSecSubChapService tSecSubChapService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询问卷二级细分章节列表
      */
@@ -43,6 +51,22 @@ public class TSecSubChapController extends BaseController
     {
         startPage();
         List<TSecSubChap> list = tSecSubChapService.selectTSecSubChapList(tSecSubChap);
+        for (TSecSubChap obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -77,7 +101,7 @@ public class TSecSubChapController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TSecSubChap tSecSubChap)
     {
-        tSecSubChap.setDeptId(getLoginUser().getDeptId());
+        tSecSubChap.setDeptId(getLoginUser().getDeptId().toString());
         return toAjax(tSecSubChapService.insertTSecSubChap(tSecSubChap));
     }
 

rc-admin/src/main/java/com/ruoyi/web/controller/rc/TSubChapController.java

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.rc;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.rc.domain.TSecSubChap;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@ public class TSubChapController extends BaseController
     @Autowired
     private ITSubChapService tSubChapService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询问卷细分章节列表
      */
@@ -43,6 +51,22 @@ public class TSubChapController extends BaseController
     {
         startPage();
         List<TSubChap> list = tSubChapService.selectTSubChapList(tSubChap);
+        for (TSubChap obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 
@@ -77,7 +101,7 @@ public class TSubChapController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TSubChap tSubChap)
     {
-        tSubChap.setDeptId(getLoginUser().getDeptId());
+        tSubChap.setDeptId(getLoginUser().getDeptId().toString());
         return toAjax(tSubChapService.insertTSubChap(tSubChap));
     }
 

rc-buisness/src/main/java/com/ruoyi/rc/domain/TAudit.java

@@ -21,9 +21,8 @@ public class TAudit extends BaseEntity
     private Long id;
 
     /** 年份 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "年份", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date year;
+    @Excel(name = "年份", width = 30)
+    private String year;
 
     /** 预审时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -45,9 +44,21 @@ public class TAudit extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -56,12 +67,12 @@ public class TAudit extends BaseEntity
     {
         return id;
     }
-    public void setYear(Date year) 
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public Date getYear() 
+    public String getYear()
     {
         return year;
     }
@@ -101,12 +112,12 @@ public class TAudit extends BaseEntity
     {
         return remarks;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TChap.java

@@ -28,7 +28,19 @@ public class TChap extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -57,12 +69,12 @@ public class TChap extends BaseEntity
     {
         return name;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TDeptInfo.java

@@ -26,12 +26,23 @@ public class TDeptInfo extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
 
     /** 年份 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "年份", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date year;
+    @Excel(name = "年份", width = 30)
+    private String year;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -51,21 +62,21 @@ public class TDeptInfo extends BaseEntity
     {
         return deptInfo;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }
-    public void setYear(Date year) 
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public Date getYear() 
+    public String getYear()
     {
         return year;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TMeeting.java

@@ -21,9 +21,8 @@ public class TMeeting extends BaseEntity
     private Long id;
 
     /** 年份 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "年份", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date year;
+    @Excel(name = "年份", width = 30)
+    private String year;
 
     /** 涉及code */
     @Excel(name = "涉及code")
@@ -39,7 +38,19 @@ public class TMeeting extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -50,12 +61,12 @@ public class TMeeting extends BaseEntity
     {
         return id;
     }
-    public void setYear(Date year) 
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public Date getYear() 
+    public String getYear()
     {
         return year;
     }
@@ -86,12 +97,12 @@ public class TMeeting extends BaseEntity
     {
         return remarks;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TOpenItem.java

@@ -73,7 +73,19 @@ public class TOpenItem extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -192,12 +204,12 @@ public class TOpenItem extends BaseEntity
     {
         return remarks;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TProgress.java

@@ -81,7 +81,19 @@ public class TProgress extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -218,12 +230,12 @@ public class TProgress extends BaseEntity
     {
         return remarks;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TSecSubChap.java

@@ -29,9 +29,8 @@ public class TSecSubChap extends BaseEntity
     private Long subChapId;
 
     /** 年份 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "年份", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date year;
+    @Excel(name = "年份", width = 30)
+    private String year;
 
     /** 问卷类型 */
     @Excel(name = "问卷类型")
@@ -83,7 +82,19 @@ public class TSecSubChap extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -112,12 +123,12 @@ public class TSecSubChap extends BaseEntity
     {
         return subChapId;
     }
-    public void setYear(Date year) 
+    public void setYear(String year)
     {
         this.year = year;
     }
 
-    public Date getYear() 
+    public String getYear()
     {
         return year;
     }
@@ -229,12 +240,12 @@ public class TSecSubChap extends BaseEntity
     {
         return remarks;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/java/com/ruoyi/rc/domain/TSubChap.java

@@ -32,7 +32,19 @@ public class TSubChap extends BaseEntity
 
     /** 装置id */
     @Excel(name = "装置id")
-    private Long deptId;
+    private String deptId;
+
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 
     public void setId(Long id) 
     {
@@ -70,12 +82,12 @@ public class TSubChap extends BaseEntity
     {
         return name;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public String getDeptId()
     {
         return deptId;
     }

rc-buisness/src/main/resources/mapper/rc/TAuditMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditTime != null "> and audit_time = #{auditTime}</if>
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TChapMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="auditId != null "> and audit_id = #{auditId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TDeptInfoMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="year != null  and year != ''"> and year = #{year}</if>
 
             <if test="deptInfo != null  and deptInfo != ''"> and dept_info = #{deptInfo}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TMeetingMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="secSubChapId != null "> and sec_sub_chap_id = #{secSubChapId}</if>
             <if test="personInCharge != null "> and person_in_charge = #{personInCharge}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TOpenItemMapper.xml

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result != null  and result != ''"> and result = #{result}</if>
             <if test="deadline != null "> and deadline = #{deadline}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TProgressMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="description != null  and description != ''"> and description = #{description}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TSecSubChapMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="personInCharge != null "> and person_in_charge = #{personInCharge}</if>
             <if test="reviewer != null "> and reviewer = #{reviewer}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-buisness/src/main/resources/mapper/rc/TSubChapMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditId != null "> and audit_id = #{auditId}</if>
             <if test="chapId != null "> and chap_id = #{chapId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="deptId != null "> and dept_id like concat(concat('%', #{deptId}), '%')</if>
         </where>
     </select>
     

rc-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,5 +1,7 @@
 package ${packageName}.controller;
 
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.service.ISysDeptService;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,6 +40,9 @@ public class ${ClassName}Controller extends BaseController
     @Autowired
     private I${ClassName}Service ${className}Service;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     /**
      * 查询${functionName}列表
      */
@@ -48,6 +53,22 @@ public class ${ClassName}Controller extends BaseController
     {
         startPage();
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        for (${ClassName} obj : list) {
+            String deptId = obj.getDeptId();
+            if (StringUtils.isNotEmpty(deptId)) {
+                if (deptId.indexOf(",") != -1) {
+                    StringBuffer sb = new StringBuffer();
+                    String[] ids = deptId.split(",");
+                    for (String id : ids) {
+                        SysDept sysDept = deptService.selectDeptById(Long.parseLong(id));
+                        sb.append(sysDept.getDeptName()).append(" / ");
+                    }
+                    obj.setDeptName(sb.toString().substring(0, sb.length() - 3));
+                } else {
+                    obj.setDeptName(deptService.selectDeptById(Long.parseLong(deptId)).getDeptName());
+                }
+            }
+        }
         return getDataTable(list);
     }
 #elseif($table.tree)
@@ -90,7 +111,7 @@ public class ${ClassName}Controller extends BaseController
     public AjaxResult add(@RequestBody ${ClassName} ${className})
     {
         if (StringUtils.isNull(${className}.getDeptId())) {
-            ${className}.setDeptId(getLoginUser().getDeptId());
+            ${className}.setDeptId(getLoginUser().getDeptId().toString());
         }
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }

rc-generator/src/main/resources/vm/java/domain.java.vm

@@ -55,6 +55,17 @@ public class ${ClassName} extends ${Entity}
     private List<${subClassName}> ${subclassName}List;
 
 #end
+    /** 装置 */
+    @Excel(name = "装置")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField))
 #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))

rc-generator/src/main/resources/vm/vue/index.vue.vm

@@ -61,6 +61,17 @@
 #end
 #end
 #end
+
+      <el-form-item label="装置" prop="deptId">
+        <el-select clearable v-model="queryParams.deptId" placeholder="请选择装置">
+          <el-option
+            v-for="dict in deptOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -151,7 +162,7 @@
       <el-table-column label="${comment}" align="center" prop="${javaField}" />
 #end
 #end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -284,6 +295,16 @@
 #end
 #end
 #end
+        <el-form-item label="装置" prop="deptId">
+          <el-select clearable multiple v-model="form.deptId" placeholder="请选择装置">
+            <el-option
+              v-for="dict in deptOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -354,6 +375,7 @@
 
 <script>
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { listDept } from "@/api/system/dept";
 
 export default {
   name: "${BusinessName}",
@@ -422,11 +444,14 @@ export default {
         ]#if($foreach.count != $columns.size()),#end
 #end
 #end
-      }
+      },
+      // 装置列表
+      deptOptions: [],
     };
   },
   created() {
     this.getList();
+    this.getDeptList();
   },
   methods: {
     /** 查询${functionName}列表 */
@@ -453,6 +478,19 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询装置列表 */
+    getDeptList() {
+      listDept().then(response => {
+        let data = response.data;
+        for (let i = 0; i < data.length; i++) {
+          // 非顶级节点
+          if (data[i].parentId !== 0) {
+            // 插入装置列表
+            this.deptOptions.push({"dictLabel": data[i].deptName, "dictValue": data[i].deptId});
+          }
+        }
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -507,6 +545,12 @@ export default {
       this.reset();
       const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
       get${BusinessName}(${pkColumn.javaField}).then(response => {
+        // 字符串转数组
+        if (response.data.deptId != null && response.data.deptId != "") {
+            response.data.deptId = response.data.deptId.split(",").map(Number);
+        } else {
+            response.data.deptId = [];
+        }
         this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
@@ -532,6 +576,10 @@ export default {
 #if($table.sub)
           this.form.${subclassName}List = this.${subclassName}List;
 #end
+          // 数组转字符串
+          if (this.form.deptId != null) {
+              this.form.deptId = this.form.deptId.toString();
+          }
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
               this.#[[$modal]]#.msgSuccess("修改成功");

ruoyi-ui/src/views/rc/audit/index.vue

@@ -25,13 +25,15 @@
           placeholder="请选择审计时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="装置id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入装置id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="装置" prop="deptId">
+        <el-select clearable v-model="queryParams.deptId" placeholder="请选择装置">
+          <el-option
+            v-for="dict in deptOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -87,7 +89,7 @@
 
     <el-table border v-loading="loading" :data="auditList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="装置" align="center" prop="deptName" />
       <el-table-column label="年份" align="center" prop="year" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.year, '{y}') }}</span>
@@ -105,8 +107,7 @@
       </el-table-column>
       <el-table-column label="审计结果" align="center" prop="auditResult" />
       <el-table-column label="备注" align="center" prop="remarks" />
-      <el-table-column label="装置id" align="center" prop="deptId" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -167,8 +168,15 @@
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="装置id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入装置id" />
+        <el-form-item label="装置" prop="deptId">
+          <el-select clearable multiple v-model="form.deptId" placeholder="请选择装置">
+            <el-option
+              v-for="dict in deptOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -181,6 +189,7 @@
 
 <script>
 import { listAudit, getAudit, delAudit, addAudit, updateAudit } from "@/api/rc/audit";
+import { listDept } from "@/api/system/dept";
 
 export default {
   name: "Audit",
@@ -219,11 +228,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      // 装置列表
+      deptOptions: [],
     };
   },
   created() {
     this.getList();
+    this.getDeptList();
   },
   methods: {
     /** 查询审计记录列表 */
@@ -235,6 +247,19 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询装置列表 */
+    getDeptList() {
+      listDept().then(response => {
+        let data = response.data;
+        for (let i = 0; i < data.length; i++) {
+          // 非顶级节点
+          if (data[i].parentId !== 0) {
+            // 插入装置列表
+            this.deptOptions.push({"dictLabel": data[i].deptName, "dictValue": data[i].deptId});
+          }
+        }
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -280,6 +305,12 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getAudit(id).then(response => {
+        // 字符串转数组
+        if (response.data.deptId != null && response.data.deptId != "") {
+          response.data.deptId = response.data.deptId.split(",").map(Number);
+        } else {
+          response.data.deptId = [];
+        }
         this.form = response.data;
         this.open = true;
         this.title = "修改审计记录";
@@ -289,6 +320,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          // 数组转字符串
+          if (this.form.deptId != null) {
+            this.form.deptId = this.form.deptId.toString();
+          }
           if (this.form.id != null) {
             updateAudit(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

sql/create.sql

@@ -8,7 +8,7 @@ create table t_audit (
   audit_time        datetime      comment '审计时间',
   audit_result      varchar(500)  comment '审计结果',
   remarks           varchar(500)  comment '备注',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '审计记录表';
 
@@ -19,7 +19,7 @@ create table t_dept_info (
   id                bigint(20)    comment 'id'  not null  auto_increment,
   `year`            year          comment '年份',
   dept_info         varchar(500)  comment '装置信息',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '装置信息表';
 
@@ -30,7 +30,7 @@ create table t_chap (
   id                bigint(20)    comment 'id'  not null  auto_increment,
   audit_id          bigint(20)    comment '审计记录id',
   name              varchar(500)  comment '名称',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '问卷章节表';
 
@@ -42,7 +42,7 @@ create table t_sub_chap (
   audit_id          bigint(20)    comment '审计记录id',
   chap_id           bigint(20)    comment '问卷章节id',
   name              varchar(500)  comment '名称',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '问卷细分章节表';
 
@@ -66,7 +66,7 @@ create table t_sec_sub_chap (
   person_in_charge  bigint(20)    comment '负责人',
   reviewer          bigint(20)    comment '审核人',
   remarks           varchar(500)  comment '备注',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '问卷二级细分章节表';
 
@@ -89,7 +89,7 @@ create table t_progress (
   description          char(1)    comment '进度描述',
   apply_status      char(1)       comment '审批状态',
   remarks           varchar(500)  comment '备注',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '进度表';
 
@@ -102,7 +102,7 @@ create table t_meeting (
   sec_sub_chap_id   bigint(20)    comment '涉及code',
   person_in_charge  bigint(20)    comment '负责人',
   remarks           varchar(500)  comment '备注',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '会议表';
 
@@ -123,6 +123,6 @@ create table t_open_item (
   result            char(1)       comment '责任人确认',
   deadline          datetime      comment '截至时间',
   remarks           varchar(500)  comment '备注',
-  dept_id           bigint(20)    comment '装置id',
+  dept_id           varchar(255)  comment '装置id',
   primary key (id)
 ) engine=innodb auto_increment=100 comment = '开项表';