LY 周会议 历史新增

master/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -177,6 +177,9 @@ public class DictUtils
                 return  p.getDictLabel();
             }
         }
+        if (StringUtils.isEmpty(value)) {
+            return "";
+        }
         return value;
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtActionlistController.java

@@ -5,6 +5,7 @@ import java.util.*;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.framework.security.service.SysPermissionService;
 import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import com.ruoyi.project.plant.mapper.TMtActionlistMapper;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.domain.SysUser;
@@ -45,6 +46,8 @@ public class TMtActionlistController extends BaseController
     private ISysUserService sysUserService;
     @Autowired
     private SysPermissionService permissionService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
     /**
      * 查询装置会议执行列表
      */
@@ -139,6 +142,9 @@ public class TMtActionlistController extends BaseController
         tMtActionlist.setUpdatedate(new Date());
         tMtActionlist.setUpdaterCode(getUserId() + "");
         tMtActionlist.setCreaterCode(getUserId() + "");
+        if (tMtActionlist.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtActionlist.getMeetingId());
+        }
         return toAjax(tMtActionlistService.insertTMtActionlist(tMtActionlist));
     }
 
@@ -151,6 +157,9 @@ public class TMtActionlistController extends BaseController
     {
         tMtActionlist.setUpdatedate(new Date());
         tMtActionlist.setUpdaterCode(getUserId() + "");
+        if (tMtActionlist.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtActionlist.getMeetingId());
+        }
         return toAjax(tMtActionlistService.updateTMtActionlist(tMtActionlist));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtEhsopenitemController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.plant.controller.weekMeeting;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +35,8 @@ public class TMtEhsopenitemController extends BaseController
 {
     @Autowired
     private ITMtEhsopenitemService tMtEhsopenitemService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
 
     /**
      * 查询EHS开项跟踪列表
@@ -88,6 +93,12 @@ public class TMtEhsopenitemController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TMtEhsopenitem tMtEhsopenitem)
     {
+        tMtEhsopenitem.setUpdatedate(new Date());
+        tMtEhsopenitem.setUpdaterCode(getUserId() + "");
+        tMtEhsopenitem.setCreaterCode(getUserId() + "");
+        if (tMtEhsopenitem.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtEhsopenitem.getMeetingId());
+        }
         return toAjax(tMtEhsopenitemService.insertTMtEhsopenitem(tMtEhsopenitem));
     }
 
@@ -99,6 +110,11 @@ public class TMtEhsopenitemController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TMtEhsopenitem tMtEhsopenitem)
     {
+        tMtEhsopenitem.setUpdatedate(new Date());
+        tMtEhsopenitem.setUpdaterCode(getUserId() + "");
+        if (tMtEhsopenitem.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtEhsopenitem.getMeetingId());
+        }
         return toAjax(tMtEhsopenitemService.updateTMtEhsopenitem(tMtEhsopenitem));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtInterlockController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.plant.controller.weekMeeting;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +35,8 @@ public class TMtInterlockController extends BaseController
 {
     @Autowired
     private ITMtInterlockService tMtInterlockService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
 
     /**
      * 查询关键机组联锁旁路列表
@@ -76,6 +81,12 @@ public class TMtInterlockController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TMtInterlock tMtInterlock)
     {
+        tMtInterlock.setUpdatedate(new Date());
+        tMtInterlock.setUpdaterCode(getUserId() + "");
+        tMtInterlock.setCreaterCode(getUserId() + "");
+        if (tMtInterlock.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtInterlock.getMeetingId());
+        }
         return toAjax(tMtInterlockService.insertTMtInterlock(tMtInterlock));
     }
 
@@ -87,6 +98,11 @@ public class TMtInterlockController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TMtInterlock tMtInterlock)
     {
+        tMtInterlock.setUpdatedate(new Date());
+        tMtInterlock.setUpdaterCode(getUserId() + "");
+        if (tMtInterlock.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtInterlock.getMeetingId());
+        }
         return toAjax(tMtInterlockService.updateTMtInterlock(tMtInterlock));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtKeymaintenanceController.java

@@ -5,6 +5,7 @@ import java.util.*;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.framework.security.service.SysPermissionService;
 import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import com.ruoyi.project.plant.domain.TMtActionlist;
 import com.ruoyi.project.plant.mapper.TMtKeymaintenanceMapper;
 import com.ruoyi.project.system.domain.SysDictData;
@@ -46,6 +47,8 @@ public class TMtKeymaintenanceController extends BaseController
     private ISysUserService sysUserService;
     @Autowired
     private SysPermissionService permissionService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
     /**
      * 查询下周关键维修工作列表
      */
@@ -136,6 +139,9 @@ public class TMtKeymaintenanceController extends BaseController
         tMtKeymaintenance.setUpdatedate(new Date());
         tMtKeymaintenance.setUpdaterCode(getUserId() + "");
         tMtKeymaintenance.setCreaterCode(getUserId() + "");
+        if (tMtKeymaintenance.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtKeymaintenance.getMeetingId());
+        }
         return toAjax(tMtKeymaintenanceService.insertTMtKeymaintenance(tMtKeymaintenance));
     }
 
@@ -148,6 +154,9 @@ public class TMtKeymaintenanceController extends BaseController
     {
         tMtKeymaintenance.setUpdatedate(new Date());
         tMtKeymaintenance.setUpdaterCode(getUserId() + "");
+        if (tMtKeymaintenance.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtKeymaintenance.getMeetingId());
+        }
         return toAjax(tMtKeymaintenanceService.updateTMtKeymaintenance(tMtKeymaintenance));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtMessageattentionController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.ruoyi.framework.security.service.SysPermissionService;
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import com.ruoyi.project.plant.domain.TMtKeymaintenance;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -44,6 +45,8 @@ public class TMtMessageattentionController extends BaseController
     private ISysUserService sysUserService;
     @Autowired
     private SysPermissionService permissionService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
     /**
      * 查询信息提醒列表
      */
@@ -109,6 +112,9 @@ public class TMtMessageattentionController extends BaseController
         tMtMessageattention.setUpdatedate(new Date());
         tMtMessageattention.setUpdaterCode(getUserId() + "");
         tMtMessageattention.setCreaterCode(getUserId() + "");
+        if (tMtMessageattention.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtMessageattention.getMeetingId());
+        }
         return toAjax(tMtMessageattentionService.insertTMtMessageattention(tMtMessageattention));
     }
 
@@ -121,6 +127,9 @@ public class TMtMessageattentionController extends BaseController
     {
         tMtMessageattention.setUpdatedate(new Date());
         tMtMessageattention.setUpdaterCode(getUserId() + "");
+        if (tMtMessageattention.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtMessageattention.getMeetingId());
+        }
         return toAjax(tMtMessageattentionService.updateTMtMessageattention(tMtMessageattention));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtOpextrackController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.plant.controller.weekMeeting;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +35,8 @@ public class TMtOpextrackController extends BaseController
 {
     @Autowired
     private ITMtOpextrackService tMtOpextrackService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
 
     /**
      * 查询OpEx项目跟踪列表
@@ -76,6 +81,12 @@ public class TMtOpextrackController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TMtOpextrack tMtOpextrack)
     {
+        tMtOpextrack.setUpdatedate(new Date());
+        tMtOpextrack.setUpdaterCode(getUserId() + "");
+        tMtOpextrack.setCreaterCode(getUserId() + "");
+        if (tMtOpextrack.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtOpextrack.getMeetingId());
+        }
         return toAjax(tMtOpextrackService.insertTMtOpextrack(tMtOpextrack));
     }
 
@@ -87,6 +98,11 @@ public class TMtOpextrackController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TMtOpextrack tMtOpextrack)
     {
+        tMtOpextrack.setUpdatedate(new Date());
+        tMtOpextrack.setUpdaterCode(getUserId() + "");
+        if (tMtOpextrack.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtOpextrack.getMeetingId());
+        }
         return toAjax(tMtOpextrackService.updateTMtOpextrack(tMtOpextrack));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtPersonController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.project.plant.controller.weekMeeting;
 
+import java.util.Date;
 import java.util.List;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import com.ruoyi.project.plant.domain.TMtdEmail;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.mapper.TStaffmgrMapper;
@@ -45,6 +47,8 @@ public class TMtPersonController extends BaseController
     private TStaffmgrMapper tStaffmgrMapper;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
     /**
      * 查询会议人员列表
      */
@@ -98,6 +102,12 @@ public class TMtPersonController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TMtPerson tMtPerson)
     {
+        tMtPerson.setUpdatedate(new Date());
+        tMtPerson.setUpdaterCode(getUserId() + "");
+        tMtPerson.setCreaterCode(getUserId() + "");
+        if (tMtPerson.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtPerson.getMeetingId());
+        }
         return toAjax(tMtPersonService.insertTMtPerson(tMtPerson));
     }
 
@@ -109,6 +119,11 @@ public class TMtPersonController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TMtPerson tMtPerson)
     {
+        tMtPerson.setUpdatedate(new Date());
+        tMtPerson.setUpdaterCode(getUserId() + "");
+        if (tMtPerson.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtPerson.getMeetingId());
+        }
         return toAjax(tMtPersonService.updateTMtPerson(tMtPerson));
     }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtRiskreminderController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.plant.controller.weekMeeting;
 
+import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.project.plant.controller.TMtMeetingController;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +35,8 @@ public class TMtRiskreminderController extends BaseController
 {
     @Autowired
     private ITMtRiskreminderService tMtRiskreminderService;
+    @Autowired
+    private TMtMeetingController tMtMeetingController;
 
     /**
      * 查询风险提醒列表
@@ -76,6 +81,12 @@ public class TMtRiskreminderController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TMtRiskreminder tMtRiskreminder)
     {
+        tMtRiskreminder.setUpdatedate(new Date());
+        tMtRiskreminder.setUpdaterCode(getUserId() + "");
+        tMtRiskreminder.setCreaterCode(getUserId() + "");
+        if (tMtRiskreminder.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtRiskreminder.getMeetingId());
+        }
         return toAjax(tMtRiskreminderService.insertTMtRiskreminder(tMtRiskreminder));
     }
 
@@ -87,6 +98,11 @@ public class TMtRiskreminderController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TMtRiskreminder tMtRiskreminder)
     {
+        tMtRiskreminder.setUpdatedate(new Date());
+        tMtRiskreminder.setUpdaterCode(getUserId() + "");
+        if (tMtRiskreminder.getIsHis() == 1) {
+            tMtMeetingController.getReport(null,tMtRiskreminder.getMeetingId());
+        }
         return toAjax(tMtRiskreminderService.updateTMtRiskreminder(tMtRiskreminder));
     }
 

master/src/main/java/com/ruoyi/project/plant/service/impl/TMtActionlistServiceImpl.java

@@ -9,8 +9,11 @@ import com.ruoyi.common.utils.poi.POIConstants;
 import com.ruoyi.common.utils.poi.PoiWordTools;
 import com.ruoyi.project.plant.domain.TTargetreview;
 import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +38,9 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
 
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询装置会议执行
      *
@@ -138,6 +144,17 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
         TMtActionlist tMtActionlist = new TMtActionlist();
         tMtActionlist.setMeetingId(meetingId);
         List<TMtActionlist> list = tMtActionlistMapper.selectTMtActionlistList(tMtActionlist);
+        for (TMtActionlist t:list
+        ) {
+            if (StringUtils.isNotEmpty(t.getResponsible())) {
+                t.setRespName(t.getResponsible());
+                SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
+                if (user != null) {
+                    t.setRespName(user.getNickName());
+                }
+            }
+        }
+
         List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
         System.out.println(JSON.toJSONString(dictList));
 
@@ -146,7 +163,7 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
                 // 表格第二行
                 XWPFTableRow tableOneRowTwo = tableOne.createRow();// 行
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", String.valueOf(i + 1));
-                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(1), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getResponsible());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(1), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getRespName());
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(2), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getAction());
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(3), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", DateUtils.parseDateToStr("yyyy-MM-dd",list.get(i).getDeadline()));
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(4), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", DictUtils.getDictVale(dictList ,list.get(i).getStatus()));

master/src/main/java/com/ruoyi/project/plant/service/impl/TMtKeymaintenanceServiceImpl.java

@@ -8,8 +8,11 @@ import com.ruoyi.common.utils.poi.POIConstants;
 import com.ruoyi.common.utils.poi.PoiWordTools;
 import com.ruoyi.project.plant.domain.TMtActionlist;
 import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,8 @@ import com.ruoyi.project.plant.mapper.TMtKeymaintenanceMapper;
 import com.ruoyi.project.plant.domain.TMtKeymaintenance;
 import com.ruoyi.project.plant.service.ITMtKeymaintenanceService;
 
+import javax.annotation.Resource;
+
 /**
  * 下周关键维修工作Service业务层处理
  *
@@ -27,10 +32,12 @@ import com.ruoyi.project.plant.service.ITMtKeymaintenanceService;
 @Service
 public class TMtKeymaintenanceServiceImpl implements ITMtKeymaintenanceService
 {
-    @Autowired
+    @Resource
     private TMtKeymaintenanceMapper tMtKeymaintenanceMapper;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 查询下周关键维修工作
@@ -125,6 +132,16 @@ public class TMtKeymaintenanceServiceImpl implements ITMtKeymaintenanceService
         tMtKeymaintenance.setMeetingId(meetingId);
         List<TMtKeymaintenance> list = tMtKeymaintenanceMapper.selectTMtKeymaintenanceList(tMtKeymaintenance);
         List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
+        for (TMtKeymaintenance t:list
+        ) {
+            if (StringUtils.isNotEmpty(t.getResponsible())) {
+                t.setRespName(t.getResponsible());
+                SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
+                if (user != null) {
+                    t.setRespName(user.getNickName());
+                }
+            }
+        }
 
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {

master/src/main/java/com/ruoyi/project/plant/service/impl/TMtMessageattentionServiceImpl.java

@@ -8,8 +8,11 @@ import com.ruoyi.common.utils.poi.POIConstants;
 import com.ruoyi.common.utils.poi.PoiWordTools;
 import com.ruoyi.project.plant.domain.TMtActionlist;
 import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,8 @@ import com.ruoyi.project.plant.mapper.TMtMessageattentionMapper;
 import com.ruoyi.project.plant.domain.TMtMessageattention;
 import com.ruoyi.project.plant.service.ITMtMessageattentionService;
 
+import javax.annotation.Resource;
+
 /**
  * 信息提醒Service业务层处理
  *
@@ -27,10 +32,13 @@ import com.ruoyi.project.plant.service.ITMtMessageattentionService;
 @Service
 public class TMtMessageattentionServiceImpl implements ITMtMessageattentionService
 {
-    @Autowired
+    @Resource
     private TMtMessageattentionMapper tMtMessageattentionMapper;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询信息提醒
      *
@@ -124,7 +132,16 @@ public class TMtMessageattentionServiceImpl implements ITMtMessageattentionServi
         tMtActionlist.setMeetingId(meetingId);
         List<TMtMessageattention> list = tMtMessageattentionMapper.selectTMtMessageattentionList(tMtActionlist);
         List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
-
+        for (TMtMessageattention t:list
+        ) {
+            if (StringUtils.isNotEmpty(t.getResponsible())) {
+                t.setRespName(t.getResponsible());
+                SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
+                if (user != null) {
+                    t.setRespName(user.getNickName());
+                }
+            }
+        }
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
                 // 表格第二行

master/src/main/java/com/ruoyi/project/plant/service/impl/TMtPersonServiceImpl.java

@@ -7,7 +7,9 @@ import com.ruoyi.common.utils.poi.POIConstants;
 import com.ruoyi.common.utils.poi.PoiWordTools;
 import com.ruoyi.project.plant.domain.TMtEhsopenitem;
 import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
@@ -32,6 +34,8 @@ public class TMtPersonServiceImpl implements ITMtPersonService
     private TMtPersonMapper tMtPersonMapper;
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询会议人员
      *
@@ -122,12 +126,20 @@ public class TMtPersonServiceImpl implements ITMtPersonService
         tMtPerson.setMeetingId(meetingId);
         tMtPerson.setIsCc(0l);
         List<TMtPerson> list = tMtPersonMapper.selectTMtPersonList(tMtPerson);
-
+        for (TMtPerson t: list
+        ) {
+            SysUser user = sysUserService.selectUserByStaffId(t.getStaffid());
+            if (user != null) {
+                t.setName(user.getNickName());
+                t.setContact(user.getEmail());
+                t.setUnit(user.getDept().getDeptName());
+            }
+        }
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
                 // 表格第二行
                 XWPFTableRow tableOneRowTwo = tableOne.createRow();// 行
-                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", DictUtils.getDictVale(staff ,list.get(i).getUnit())+ "  " + DictUtils.getDictVale(actualpost ,list.get(i).getActualpost()));
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", list.get(i).getUnit()+ "  " + DictUtils.getDictVale(actualpost ,list.get(i).getActualpost()));
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(1), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getName());
             }
         }
@@ -152,11 +164,22 @@ public class TMtPersonServiceImpl implements ITMtPersonService
         List<TMtPerson> list = tMtPersonMapper.selectTMtPersonList(tMtPerson);
         List<SysDictData> staff = iSysDictTypeService.selectDictDataByType("STAFF_UNIT");
         List<SysDictData> actualpost = iSysDictTypeService.selectDictDataByType("ACTUALPOST");
+
+        for (TMtPerson t: list
+        ) {
+            SysUser user = sysUserService.selectUserByStaffId(t.getStaffid());
+            if (user != null) {
+                t.setName(user.getNickName());
+                t.setContact(user.getEmail());
+                t.setUnit(user.getDept().getDeptName());
+            }
+        }
+
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
                 // 表格第二行
                 XWPFTableRow tableOneRowTwo = tableOne.createRow();// 行
-                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", DictUtils.getDictVale(staff ,list.get(i).getUnit())+ "  " + DictUtils.getDictVale(actualpost ,list.get(i).getActualpost()));
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", list.get(i).getUnit()+ "  " + DictUtils.getDictVale(actualpost ,list.get(i).getActualpost()));
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(1), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "40", list.get(i).getName());
             }
         }