LY 周会议 更新人

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

@@ -3,7 +3,12 @@ package com.ruoyi.project.plant.controller.weekMeeting;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.utils.DictUtils;
 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;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -36,7 +41,8 @@ public class TMtEhsopenitemController extends BaseController {
     private ITMtEhsopenitemService tMtEhsopenitemService;
     @Autowired
     private TMtMeetingController tMtMeetingController;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询EHS开项跟踪列表
      */
@@ -45,6 +51,13 @@ public class TMtEhsopenitemController extends BaseController {
     public TableDataInfo list(TMtEhsopenitem tMtEhsopenitem) {
         startPage();
         List<TMtEhsopenitem> list = tMtEhsopenitemService.selectTMtEhsopenitemList(tMtEhsopenitem);
+        for (TMtEhsopenitem t:list
+        ) {
+            if (t.getUpdaterCode() != null) {
+                SysUser updater = sysUserService.selectUserById( Long.parseLong(t.getUpdaterCode()));
+                t.setUpdaterCode(updater.getNickName());
+            }
+        }
         return getDataTable(list);
     }
 

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

@@ -4,6 +4,9 @@ import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.project.plant.controller.TMtMeetingController;
+import com.ruoyi.project.plant.domain.TMtEhsopenitem;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,7 +40,8 @@ public class TMtInterlockController extends BaseController
     private ITMtInterlockService tMtInterlockService;
     @Autowired
     private TMtMeetingController tMtMeetingController;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询关键机组联锁旁路列表
      */
@@ -47,6 +51,13 @@ public class TMtInterlockController extends BaseController
     {
         startPage();
         List<TMtInterlock> list = tMtInterlockService.selectTMtInterlockList(tMtInterlock);
+        for (TMtInterlock t:list
+        ) {
+            if (t.getUpdaterCode() != null) {
+                SysUser updater = sysUserService.selectUserById( Long.parseLong(t.getUpdaterCode()));
+                t.setUpdaterCode(updater.getNickName());
+            }
+        }
         return getDataTable(list);
     }
 

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

@@ -4,6 +4,9 @@ import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.project.plant.controller.TMtMeetingController;
+import com.ruoyi.project.plant.domain.TMtInterlock;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,7 +40,8 @@ public class TMtOpextrackController extends BaseController
     private ITMtOpextrackService tMtOpextrackService;
     @Autowired
     private TMtMeetingController tMtMeetingController;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询OpEx项目跟踪列表
      */
@@ -47,6 +51,13 @@ public class TMtOpextrackController extends BaseController
     {
         startPage();
         List<TMtOpextrack> list = tMtOpextrackService.selectTMtOpextrackList(tMtOpextrack);
+        for (TMtOpextrack t:list
+        ) {
+            if (t.getUpdaterCode() != null) {
+                SysUser updater = sysUserService.selectUserById( Long.parseLong(t.getUpdaterCode()));
+                t.setUpdaterCode(updater.getNickName());
+            }
+        }
         return getDataTable(list);
     }
 

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

@@ -4,6 +4,9 @@ import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.project.plant.controller.TMtMeetingController;
+import com.ruoyi.project.plant.domain.TMtOpextrack;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,7 +40,8 @@ public class TMtRiskreminderController extends BaseController
     private ITMtRiskreminderService tMtRiskreminderService;
     @Autowired
     private TMtMeetingController tMtMeetingController;
-
+    @Autowired
+    private ISysUserService sysUserService;
     /**
      * 查询风险提醒列表
      */
@@ -47,6 +51,13 @@ public class TMtRiskreminderController extends BaseController
     {
         startPage();
         List<TMtRiskreminder> list = tMtRiskreminderService.selectTMtRiskreminderList(tMtRiskreminder);
+        for (TMtRiskreminder t:list
+        ) {
+            if (t.getUpdaterCode() != null) {
+                SysUser updater = sysUserService.selectUserById( Long.parseLong(t.getUpdaterCode()));
+                t.setUpdaterCode(updater.getNickName());
+            }
+        }
         return getDataTable(list);
     }
 

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

@@ -481,7 +481,8 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
+      // this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('装置会议执行');
     },

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

@@ -95,6 +95,12 @@
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="更新日期" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -377,7 +383,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('EHS开项跟踪');
     },

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

@@ -48,13 +48,14 @@
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="更新人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
       <el-table-column label="更新日期" align="center" prop="updatedate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -302,7 +303,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('关键机组联锁旁路');
     },

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

@@ -471,7 +471,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('下周关键维修工作');
     },

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

@@ -424,8 +424,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
-
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('信息提醒');
     },

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

@@ -88,6 +88,12 @@
       </el-table-column>
       <el-table-column :label="$t('年份')" align="center" prop="year" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('预计收益')" align="center" prop="benefit" :show-overflow-tooltip="true"/>
+      <el-table-column label="更新人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="更新日期" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -346,8 +352,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
-
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('OpEx项目跟踪');
     },

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

@@ -69,6 +69,12 @@
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="更新日期" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -323,8 +329,7 @@
         this.form.meetingId = this.$route.params.tableId
         this.form.isHis = 1
       }
-      this.form.inputdate = new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), 0, 0)
-
+      this.form.inputdate = new Date()
       this.open = true;
       this.title = this.$t('新增') + " " + this.$t('风险提醒');
     },