Forráskód Böngészése

LY 周会议 预览

ly 1 éve
szülő
commit
dcd22af9f1

+ 39 - 8
master/src/main/java/com/ruoyi/project/plant/service/impl/TMtActionlistServiceImpl.java

@@ -144,18 +144,49 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
         TMtActionlist tMtActionlist = new TMtActionlist();
         tMtActionlist.setMeetingId(meetingId);
         List<TMtActionlist> list = tMtActionlistMapper.selectTMtActionlistList(tMtActionlist);
-        for (TMtActionlist t:list
+        List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTUALPOST");
+
+        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());
+            //指定人
+            if ("1".equals(t.getIsPerson())) {
+                if (StringUtils.isNotEmpty(t.getResponsible())) {
+                    String[] respArr = t.getResponsible().split(",");
+                    for (int i = 0; i < respArr.length; i++) {
+                        SysUser user = sysUserService.selectUserByStaffId(respArr[i]);
+                        if (user != null) {
+                            if (i == 0) {
+                                t.setRespName(user.getNickName());
+                            } else {
+                                t.setRespName(t.getRespName() + "," + user.getNickName());
+                            }
+                        }
+                    }
+                }
+            }
+            //指定岗位
+            else if ("2".equals(t.getIsPerson())) {
+                if (StringUtils.isNotEmpty(t.getPosition())) {
+                    String[] arr = t.getPosition().split(",");
+                    for (int i = 0; i < arr.length; i++) {
+                        if (i == 0) {
+                            t.setRespName(DictUtils.getDictVale(dictList ,arr[i]));
+                        }else {
+                            t.setRespName(t.getRespName() + "," + DictUtils.getDictVale(dictList ,arr[i]));
+                        }
+
+                    }
+
                 }
             }
+
+            if (t.getUpdaterCode() != null) {
+                SysUser updater = sysUserService.selectUserById(Long.parseLong(t.getUpdaterCode()));
+                t.setUpdaterCode(updater.getNickName());
+            }
         }
 
-        List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
+        List<SysDictData> dictList2 = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
         System.out.println(JSON.toJSONString(dictList));
 
         if (CollectionUtils.isNotEmpty(list)) {
@@ -166,7 +197,7 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
                 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()));
+                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(dictList2 ,list.get(i).getStatus()));
                 PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(5), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.BG_COLOR, "20", list.get(i).getRemarks());
             }
         }

+ 4 - 6
master/src/main/java/com/ruoyi/project/plant/service/impl/TMtEhsopenitemServiceImpl.java

@@ -114,9 +114,8 @@ public class TMtEhsopenitemServiceImpl implements ITMtEhsopenitemService
 
         // 表格第一行,对于每个列,必须使用createCell(),而不是getCell(),因为第一行嘛,肯定是属于创建的,没有create哪里来的get呢
         XWPFTableRow tableOneRowOne = tableOne.getRow(0);// 行
-        PoiWordTools.setWordCellSelfStyle(tableOneRowOne.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,    POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT, POIConstants.VERTICAL,POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "20", "开项类别");
+        PoiWordTools.setWordCellSelfStyle(tableOneRowOne.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,    POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT, POIConstants.VERTICAL,POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "40", "开项类别");
         PoiWordTools.setWordCellSelfStyle(tableOneRowOne.createCell(), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,  POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "40", "未关闭开项数量");
-        PoiWordTools.setWordCellSelfStyle(tableOneRowOne.createCell(), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,  POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "40", "关闭率");
         PoiWordTools.setWordCellSelfStyle(tableOneRowOne.createCell(), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,  POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "40", "逾期数量");
         TMtEhsopenitem tMtEhsopenitem = new TMtEhsopenitem();
         tMtEhsopenitem.setMeetingId(meetingId);
@@ -126,10 +125,9 @@ public class TMtEhsopenitemServiceImpl implements ITMtEhsopenitemService
             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", list.get(i).getCategory());
-                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).getClosed() + "");
-                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).getNotopen() +"");
-                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", list.get(i).getExpired() + "");
+                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, "40", list.get(i).getCategory());
+                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).getNotopen() + "");
+                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).getExpired() + "");
             }
         }
     }

+ 2 - 4
master/src/main/java/com/ruoyi/project/plant/service/impl/TMtInterlockServiceImpl.java

@@ -112,8 +112,7 @@ public class TMtInterlockServiceImpl implements ITMtInterlockService
 
         // 表格第一行,对于每个列,必须使用createCell(),而不是getCell(),因为第一行嘛,肯定是属于创建的,没有create哪里来的get呢
         XWPFTableRow tableOneRowOne = tableOne.getRow(0);// 行
-        PoiWordTools.setWordCellSelfStyle(tableOneRowOne.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,    POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT, POIConstants.VERTICAL,POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "20", "序号");
-        PoiWordTools.setWordCellSelfStyle(tableOneRowOne.createCell(), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,  POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "40", "                      主要内容                      ");
+        PoiWordTools.setWordCellSelfStyle(tableOneRowOne.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE,  POIConstants.FONT_BOLD_C, POIConstants.ALIGNMENT,POIConstants.VERTICAL, POIConstants.FONT_COLOR, POIConstants.MT_BG_TITLE_COLOR, "60", "                      主要内容                      ");
         TMtInterlock tMtActionlist = new TMtInterlock();
         tMtActionlist.setMeetingId(meetingId);
         List<TMtInterlock> list = tMtInterlockMapper.selectTMtInterlockList(tMtActionlist);
@@ -122,8 +121,7 @@ public class TMtInterlockServiceImpl implements ITMtInterlockService
             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", 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).getMaincontents());
+                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, "40", list.get(i).getMaincontents());
             }
         }
     }

+ 24 - 6
master/src/main/java/com/ruoyi/project/plant/service/impl/TMtKeymaintenanceServiceImpl.java

@@ -132,13 +132,31 @@ public class TMtKeymaintenanceServiceImpl implements ITMtKeymaintenanceService
         tMtKeymaintenance.setMeetingId(meetingId);
         List<TMtKeymaintenance> list = tMtKeymaintenanceMapper.selectTMtKeymaintenanceList(tMtKeymaintenance);
         List<SysDictData> dictList = iSysDictTypeService.selectDictDataByType("ACTION_STATUS");
+        List<SysDictData> dictList2 = iSysDictTypeService.selectDictDataByType("ACTUALPOST");
+
         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 ("1".equals(t.getIsPerson())) {
+                if (StringUtils.isNotEmpty(t.getResponsible())) {
+                    t.setRespName(t.getResponsible());
+                    SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
+                    if (user != null) {
+                        t.setRespName(user.getNickName());
+                    }
+                }
+            }
+            //指定岗位
+            else if ("2".equals(t.getIsPerson())) {
+                if (StringUtils.isNotEmpty(t.getPosition())) {
+                    String[] arr = t.getPosition().split(",");
+                    for (int i = 0; i < arr.length; i++) {
+                        if (i == 0) {
+                            t.setRespName(DictUtils.getDictVale(dictList2 ,arr[i]));
+                        }else {
+                            t.setRespName(t.getRespName() + "," + DictUtils.getDictVale(dictList2 ,arr[i]));
+                        }
+                    }
                 }
             }
         }
@@ -148,7 +166,7 @@ public class TMtKeymaintenanceServiceImpl implements ITMtKeymaintenanceService
                 // 表格第二行
                 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, "2000", 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, "4000", 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, "4000",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, "4000", 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, "4000", 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, "4000", DictUtils.getDictVale(dictList ,list.get(i).getStatus()));

+ 25 - 7
master/src/main/java/com/ruoyi/project/plant/service/impl/TMtMessageattentionServiceImpl.java

@@ -132,13 +132,31 @@ 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
+        List<SysDictData> dictList2 = iSysDictTypeService.selectDictDataByType("ACTUALPOST");
+
+        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 ("1".equals(t.getIsPerson())) {
+                if (StringUtils.isNotEmpty(t.getResponsible())) {
+                    t.setRespName(t.getResponsible());
+                    SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
+                    if (user != null) {
+                        t.setRespName(user.getNickName());
+                    }
+                }
+            }
+            //指定岗位
+            else if ("2".equals(t.getIsPerson())) {
+                if (StringUtils.isNotEmpty(t.getPosition())) {
+                    String[] arr = t.getPosition().split(",");
+                    for (int i = 0; i < arr.length; i++) {
+                        if (i == 0) {
+                            t.setRespName(DictUtils.getDictVale(dictList2, arr[i]));
+                        } else {
+                            t.setRespName(t.getRespName() + "," + DictUtils.getDictVale(dictList2, arr[i]));
+                        }
+                    }
                 }
             }
         }
@@ -147,7 +165,7 @@ public class TMtMessageattentionServiceImpl implements ITMtMessageattentionServi
                 // 表格第二行
                 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", 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()));