LY 周会议

master/src/main/java/com/ruoyi/common/utils/poi/POIConstants.java

@@ -26,7 +26,8 @@ public class POIConstants {
 
 	//字体颜色
 	public static final String FONT_COLOR ="#000000";
-
+	//字体颜色
+	public static final String FONT_COLOR_BLUE ="#0000FF";
 	//表格标题背景颜色
 	public static final String BG_TITLE_COLOR ="#80bdf9";
 	public static final String MT_BG_TITLE_COLOR ="#FFFFFF";

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

@@ -191,14 +191,18 @@ public class TMtActionlistServiceImpl implements ITMtActionlistService
 
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
+                String fontColor = POIConstants.FONT_COLOR;
+                if (list.get(i).getIsNew() == 1l) {
+                    fontColor = POIConstants.FONT_COLOR_BLUE;
+                }
                 // 表格第二行
                 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).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(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());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, 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, fontColor, 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, fontColor, 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, fontColor, 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, fontColor, 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, fontColor, POIConstants.BG_COLOR, "20", list.get(i).getRemarks());
             }
         }
     }

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

@@ -123,11 +123,15 @@ public class TMtEhsopenitemServiceImpl implements ITMtEhsopenitemService
 
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
+                String fontColor = POIConstants.FONT_COLOR;
+                if (list.get(i).getIsNew() == 1l) {
+                    fontColor = POIConstants.FONT_COLOR_BLUE;
+                }
                 // 表格第二行
                 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, "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() + "");
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, 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, fontColor, 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, fontColor, POIConstants.BG_COLOR, "40", list.get(i).getExpired() + "");
             }
         }
     }

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

@@ -119,9 +119,13 @@ public class TMtInterlockServiceImpl implements ITMtInterlockService
 
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
+                String fontColor = POIConstants.FONT_COLOR;
+                if (list.get(i).getIsNew() == 1l) {
+                    fontColor = POIConstants.FONT_COLOR_BLUE;
+                }
                 // 表格第二行
                 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, "40", list.get(i).getMaincontents());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, POIConstants.BG_COLOR, "40", list.get(i).getMaincontents());
             }
         }
     }

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

@@ -163,14 +163,18 @@ public class TMtKeymaintenanceServiceImpl implements ITMtKeymaintenanceService
 
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
+                String fontColor = POIConstants.FONT_COLOR;
+                if (list.get(i).getIsNew() == 1l) {
+                    fontColor = POIConstants.FONT_COLOR_BLUE;
+                }
                 // 表格第二行
                 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).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()));
-                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, "2000", list.get(i).getRemarks());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, 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, fontColor, 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,fontColor, 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, fontColor, 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, fontColor, POIConstants.BG_COLOR, "4000", DictUtils.getDictVale(dictList ,list.get(i).getStatus()));
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(5), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, POIConstants.BG_COLOR, "2000", list.get(i).getRemarks());
             }
         }
     }

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

@@ -1,5 +1,7 @@
 package com.ruoyi.project.plant.service.impl;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.project.plant.domain.*;
@@ -84,6 +86,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
              ) {
             a.setMeetingId(tMtMeeting.getId());
             a.setIsHis(1l);
+            if (areDatesInSameWeek(a.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                a.setIsNew(1l);
+            }
             tMtActionlistMapper.insertTMtActionlist(a);
         }
 
@@ -94,6 +99,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         ) {
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
+            if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                m.setIsNew(1l);
+            }
             tMtEhsopenitemMapper.insertTMtEhsopenitem(m);
         }
 
@@ -104,6 +112,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
              ) {
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
+            if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                m.setIsNew(1l);
+            }
             tMtKeymaintenanceMapper.insertTMtKeymaintenance(m);
         }
 
@@ -114,6 +125,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         ) {
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
+            if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                m.setIsNew(1l);
+            }
             tMtMessageattentionMapper.insertTMtMessageattention(m);
         }
 
@@ -124,6 +138,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         ) {
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
+            if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                m.setIsNew(1l);
+            }
             tMtInterlockMapper.insertTMtInterlock(m);
         }
 
@@ -134,6 +151,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         ) {
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
+            if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                m.setIsNew(1l);
+            }
             tMtRiskreminderMapper.insertTMtRiskreminder(m);
         }
 
@@ -144,6 +164,9 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         ) {
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
+            if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
+                m.setIsNew(1l);
+            }
             tMtOpextrackMapper.insertTMtOpextrack(m);
         }
 
@@ -156,9 +179,26 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
             m.setIsHis(1l);
             tMtPersonMapper.insertTMtPerson(m);
         }
+        return 1;
+    }
 
+    public static boolean areDatesInSameWeek(Date date1, Date date2) {
+        if (date1 == null || date2 == null) {
+            return false; // 如果日期为空，返回false
+        }
 
-        return 1;
+        Calendar cal1 = Calendar.getInstance();
+        Calendar cal2 = Calendar.getInstance();
+
+        cal1.setTime(date1);
+        cal2.setTime(date2);
+
+        int week1 = cal1.get(Calendar.WEEK_OF_YEAR);
+        int week2 = cal2.get(Calendar.WEEK_OF_YEAR);
+        int year1 = cal1.get(Calendar.YEAR);
+        int year2 = cal2.get(Calendar.YEAR);
+
+        return (year1 == year2) && (week1 == week2);
     }
 
     /**

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

@@ -163,13 +163,17 @@ public class TMtMessageattentionServiceImpl implements ITMtMessageattentionServi
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
                 // 表格第二行
+                String fontColor = POIConstants.FONT_COLOR;
+                if (list.get(i).getIsNew() == 1l) {
+                    fontColor = POIConstants.FONT_COLOR_BLUE;
+                }
                 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).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()));
-                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());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, 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,fontColor, 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, fontColor, 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, fontColor, 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, fontColor, POIConstants.BG_COLOR, "40", DictUtils.getDictVale(dictList ,list.get(i).getStatus()));
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(5), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT,POIConstants.VERTICAL, fontColor, POIConstants.BG_COLOR, "20", list.get(i).getRemarks());
             }
         }
     }

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

@@ -122,12 +122,16 @@ public class TMtRiskreminderServiceImpl implements ITMtRiskreminderService
 
         if (CollectionUtils.isNotEmpty(list)) {
             for (int i = 0; i < list.size(); i++) {
+                String fontColor = POIConstants.FONT_COLOR;
+                if (list.get(i).getIsNew() == 1l) {
+                    fontColor = POIConstants.FONT_COLOR_BLUE;
+                }
                 // 表格第二行
                 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(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).getRisk());
-                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).getAssessment());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(0), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT, POIConstants.VERTICAL, fontColor, 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, fontColor, POIConstants.BG_COLOR, "40", list.get(i).getMaincontents());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(2), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT, POIConstants.VERTICAL, fontColor, POIConstants.BG_COLOR, "40", list.get(i).getRisk());
+                PoiWordTools.setWordCellSelfStyle(tableOneRowTwo.getCell(3), POIConstants.FONT_NAME, POIConstants.MT_FONT_SIZE, POIConstants.FONT_BOLD, POIConstants.ALIGNMENT, POIConstants.VERTICAL, fontColor, POIConstants.BG_COLOR, "40", list.get(i).getAssessment());
             }
         }
     }

ui/src/router/index.js

@@ -216,7 +216,7 @@ export const constantRoutes = [
         path: 'detail/:id(\\d+)',
         component: (resolve) => require(['@/views/plant/dailyMeeting/detail'], resolve),
         name: 'detail',
-        meta: { title: '调度会议详情' }
+        meta: { title: '调度会议详情'}
       },
       {
         path: 'dailyMeetingConfig',

ui/src/views/components/meeting/actionlist.vue

@@ -92,7 +92,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="actionlistList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="actionlistList" @selection-change="handleSelectionChange" :row-class-name="rowClassName" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('责任人')" width="100" align="center" prop="respName" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('行动')" width="400"  align="center" prop="action" />
@@ -474,6 +474,14 @@
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
+      }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -483,6 +491,7 @@
       }
       // this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
       this.form.inputdate = new Date()
+      this.respList = [this.$store.state.user.staffId]
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('装置会议执行');
     },
@@ -585,3 +594,9 @@
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/meeting/ehsopenitem.vue

@@ -73,22 +73,21 @@
           v-hasPermi="['plant:ehsopenitem:edit']"
         >{{ $t('删除') }}</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-s-data"
-          size="mini"
-          @click="handleData"
-        >{{ $t('数据分析') }}</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          icon="el-icon-s-data"-->
+<!--          size="mini"-->
+<!--          @click="handleData"-->
+<!--        >{{ $t('数据分析') }}</el-button>-->
+<!--      </el-col>-->
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ehsopenitemList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="ehsopenitemList" @selection-change="handleSelectionChange" :row-class-name="rowClassName" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('开项类别')" align="center" prop="category" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('未关闭开项数量')" align="center" prop="notopen" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('关闭率')" align="center" prop="closed" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('逾期数量')" align="center" prop="expired" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('录入日期')" align="center" prop="inputdate" width="100">
         <template slot-scope="scope">
@@ -135,13 +134,18 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item :label="$t('开项类别')" prop="category">
-          <el-input v-model="form.category" :placeholder="$t('请输入') + $t('开项类别')" />
+          <el-select v-model="form.category" :placeholder="$t('请选择') + $t('开项类别')">
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item :label="$t('未关闭开项数量')" prop="notopen">
           <el-input v-model="form.notopen" :placeholder="$t('请输入') + $t('未关闭开项数量')" />
-        </el-form-item>
-        <el-form-item :label="$t('关闭率')" prop="closed">
-          <el-input v-model="form.closed" :placeholder="$t('请输入') + $t('关闭率')" />
+
         </el-form-item>
         <el-form-item :label="$t('逾期数量')" prop="expired">
           <el-input v-model="form.expired" :placeholder="$t('请输入') + $t('逾期数量')" />
@@ -288,6 +292,40 @@
       },
       // 表单参数
       form: {},
+      categoryOptions: [{
+        value: '安全巡检开项',
+        label: '安全巡检开项'
+      }, {
+        value: '审计开项',
+        label: '审计开项'
+      }, {
+        value: '政府检查开项',
+        label: '政府检查开项'
+      }, {
+        value: '会议中的EHS开项',
+        label: '会议中的EHS开项'
+      },{
+        value: '事故调查开项',
+        label: '事故调查开项'
+      },{
+        value: '项目/MOC EHS审查',
+        label: '项目/MOC EHS审查'
+      },{
+        value: '消防演练开项',
+        label: '消防演练开项'
+      },{
+        value: '现场EHS检查',
+        label: '现场EHS检查'
+      },{
+        value: '5S改进开项',
+        label: '5S改进开项'
+      }, {
+        value: 'Stature开项',
+        label: 'Stature开项'
+      }, {
+        value: '其他',
+        label: '其他'
+      }],
       // 表单校验
       rules: {
       }
@@ -307,9 +345,6 @@
     this.queryParams.meetingId = this.$route.params && this.$route.params.tableId;
     this.getList();
     this.getTreeselect();
-    this.getDicts("PLANT_DIVIDE").then(response => {
-      this.plantCodeOptions = response.data;
-    });
   },
   methods: {
     /** 查询EHS开项跟踪列表 */
@@ -327,14 +362,6 @@
               this.deptOptions = response.data;
           });
      },
-    // 装置字典翻译
-    plantCodeFormat(row, column) {
-      return this.selectDictLabel(this.plantCodeOptions, row.plantCode);
-    },
-    // 状态字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
-    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -474,7 +501,20 @@
     //数据分析
     handleData(){
       this.drawer = true
-    }
+    },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
+      }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/meeting/interlock.vue

@@ -40,7 +40,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="interlockList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="interlockList" @selection-change="handleSelectionChange" :row-class-name="rowClassName"  :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('主要内容')" align="center" prop="maincontents" />
       <el-table-column :label="$t('录入日期')" align="center" prop="inputdate" width="100">
@@ -390,7 +390,20 @@
       // 提交上传文件
       submitFileForm() {
           this.$refs.upload.submit();
+      },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
       }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/meeting/keymaintenance.vue

@@ -83,7 +83,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="keymaintenanceList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="keymaintenanceList" @selection-change="handleSelectionChange"  :row-class-name="rowClassName" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('责任人')" align="center" prop="respName" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('行动')" width="400" align="center" prop="action" />
@@ -472,8 +472,10 @@
         this.form.isHis = 1
       }
       this.form.inputdate = new Date()
+      this.respList = [this.$store.state.user.staffId]
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('下周关键维修工作');
+
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -570,7 +572,20 @@
       //数据分析
       handleData(){
         this.drawer = true
+      },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
       }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/meeting/messageattention.vue

@@ -68,7 +68,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="messageattentionList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="messageattentionList" @selection-change="handleSelectionChange" :row-class-name="rowClassName"  :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('责任人')" align="center" prop="respName" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('行动')" align="center" prop="action" width="400"/>
@@ -425,6 +425,7 @@
         this.form.isHis = 1
       }
       this.form.inputdate = new Date()
+      this.respList = [this.$store.state.user.staffId]
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('信息提醒');
     },
@@ -519,7 +520,20 @@
       // 提交上传文件
       submitFileForm() {
           this.$refs.upload.submit();
+      },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
       }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/meeting/opextrack.vue

@@ -76,7 +76,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="opextrackList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="opextrackList" @selection-change="handleSelectionChange" :row-class-name="rowClassName"  :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('进行中')" align="center" prop="ongoing" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('已完成')" align="center" prop="finished" :show-overflow-tooltip="true"/>
@@ -439,7 +439,20 @@
       // 提交上传文件
       submitFileForm() {
           this.$refs.upload.submit();
+      },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
       }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/meeting/riskreminder.vue

@@ -58,7 +58,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="riskreminderList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+    <el-table v-loading="loading" :data="riskreminderList" @selection-change="handleSelectionChange" :row-class-name="rowClassName"  :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('主要内容')" align="center" prop="maincontents" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('风险')" align="center" prop="risk" :show-overflow-tooltip="true"/>
@@ -329,7 +329,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date()
+      this.form.inputdate = new Date() //当天日期
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('风险提醒');
     },
@@ -416,7 +416,20 @@
       // 提交上传文件
       submitFileForm() {
           this.$refs.upload.submit();
+      },
+    rowClassName({ row }) {
+      // 根据 row 对象的属性值判断并返回相应的类名
+      if (row.isNew == 1) {
+        return 'blue-row';
       }
+      // 如果不需要改变样式，返回空字符串
+      return '';
+    },
   }
 };
 </script>
+<style lang="scss" scoped>
+.blue-row {
+  color: blue;
+}
+</style>

ui/src/views/components/yulan/index.vue

@@ -32,6 +32,7 @@ export default {
       imgs:[],
       pptView:false,
       ppt: false,
+      loadingFlash: null,
       pdf: {
         title: '',
         pdfUrl: '',

ui/src/views/plant/dailyMeeting/detail.vue

@@ -102,7 +102,7 @@
           </tr>
           <tr class="yellowbg">
             <td>1.2</td>
-            <td>负荷：裂解：<el-input v-model="form.split" style="width: 160px"></el-input>
+            <td>负荷（t/hr）：裂解：<el-input v-model="form.split" style="width: 160px"></el-input>
               PGU：<el-input v-model="form.pgu" style="width: 160px"></el-input>
               AEU：<el-input v-model="form.aeu" style="width: 160px"></el-input>
             </td>
@@ -204,7 +204,7 @@
             <td></td>
           </tr>
           <tr class="yellowbg" v-for="(item5, index) in form.items5" :key="'item5'+index">
-            <td>2.{{ 1 + index}}</td>
+            <td>5.{{ 1 + index}}</td>
             <td><el-input type="textarea" :autosize="{ minRows: 1}" v-model="item5.description">
 
             </el-input></td>
@@ -299,8 +299,11 @@ export default {
     }
   },
   created() {
+    const pId = this.$route.params && this.$route.params.id;
     getDailyMeetingConfig(1).then(response => { // 地点
       this.venueOptions = response.data.dictList;
+      if (pId == 0) {
+        this.form.venue = this.venueOptions[0].dictValue      }
     });
 
     getDailyMeetingConfig(3).then(response => { // 运行明细
@@ -339,7 +342,7 @@ export default {
     getDailyMeetingConfig(9).then(response => { // cracker
       this.actionOptions = response.data.dictList;
     });
-    const pId = this.$route.params && this.$route.params.id;
+
     if (pId != 0) {
       getDailyMeeting(pId).then(response => {
         this.form = response.data
@@ -355,6 +358,9 @@ export default {
         "2、环保注意事项"
       this.attendCrackerList = this.attendCrackerOptions;
       this.optModeData = "9+1+A+B"
+      this.form.meetingDate = new Date()
+      console.log(this.$store.state.user.staffId)
+      this.form.recorder = this.$store.state.user.staffId
     }
   },
   methods: {

ui/src/views/plant/weekmeeting/index.vue

@@ -261,7 +261,8 @@ export default {
       let param = {}
       getLastMeeting(param).then(response => {
         this.form = response.data;
-        this.form.meetingDate = null
+        this.form.meetingDate = new Date() //当天日期
+        this.form.recorder = this.$store.state.user.name
         this.open = true;
         this.title = this.$t('新增') + " " + this.$t('装置会议');
       });