LY 周会议 权限

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

@@ -199,7 +199,7 @@ public class TMtActionlistController extends BaseController {
     public AjaxResult edit(@RequestBody TMtActionlist tMtActionlist) {
         tMtActionlist.setUpdatedate(new Date());
         tMtActionlist.setUpdaterCode(getUserId() + "");
-        if (tMtActionlist.getIsHis() == 1) {
+        if (tMtActionlist.getIsHis() != null && tMtActionlist.getIsHis() == 1) {
             tMtMeetingController.getReport(null, tMtActionlist.getMeetingId());
         }
         //指定岗位

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

@@ -31,8 +31,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/plant/ehsopenitem")
-public class TMtEhsopenitemController extends BaseController
-{
+public class TMtEhsopenitemController extends BaseController {
     @Autowired
     private ITMtEhsopenitemService tMtEhsopenitemService;
     @Autowired
@@ -43,8 +42,7 @@ public class TMtEhsopenitemController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMtEhsopenitem tMtEhsopenitem)
-    {
+    public TableDataInfo list(TMtEhsopenitem tMtEhsopenitem) {
         startPage();
         List<TMtEhsopenitem> list = tMtEhsopenitemService.selectTMtEhsopenitemList(tMtEhsopenitem);
         return getDataTable(list);
@@ -55,8 +53,7 @@ public class TMtEhsopenitemController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:meeting:list')")
     @GetMapping("/ehsData")
-    public List<TMtEhsopenitem> ehsData(TMtEhsopenitem tMtEhsopenitem)
-    {
+    public List<TMtEhsopenitem> ehsData(TMtEhsopenitem tMtEhsopenitem) {
         List<TMtEhsopenitem> list = tMtEhsopenitemService.selectTMtEhsopenitemList(tMtEhsopenitem);
         return list;
     }
@@ -68,8 +65,7 @@ public class TMtEhsopenitemController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:meeting:export')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TMtEhsopenitem tMtEhsopenitem)
-    {
+    public AjaxResult export(TMtEhsopenitem tMtEhsopenitem) {
         List<TMtEhsopenitem> list = tMtEhsopenitemService.selectTMtEhsopenitemList(tMtEhsopenitem);
         ExcelUtil<TMtEhsopenitem> util = new ExcelUtil<TMtEhsopenitem>(TMtEhsopenitem.class);
         return util.exportExcel(list, "ehsopenitem");
@@ -80,8 +76,7 @@ public class TMtEhsopenitemController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:meeting:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tMtEhsopenitemService.selectTMtEhsopenitemById(id));
     }
 
@@ -91,13 +86,13 @@ public class TMtEhsopenitemController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TMtEhsopenitem tMtEhsopenitem)
-    {
+    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());
+        if (tMtEhsopenitem.getIsHis() != null && tMtEhsopenitem.getIsHis() == 1) {
+
+            tMtMeetingController.getReport(null, tMtEhsopenitem.getMeetingId());
         }
         return toAjax(tMtEhsopenitemService.insertTMtEhsopenitem(tMtEhsopenitem));
     }
@@ -108,12 +103,12 @@ public class TMtEhsopenitemController extends BaseController
     @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TMtEhsopenitem tMtEhsopenitem)
-    {
+    public AjaxResult edit(@RequestBody TMtEhsopenitem tMtEhsopenitem) {
         tMtEhsopenitem.setUpdatedate(new Date());
         tMtEhsopenitem.setUpdaterCode(getUserId() + "");
-        if (tMtEhsopenitem.getIsHis() == 1) {
-            tMtMeetingController.getReport(null,tMtEhsopenitem.getMeetingId());
+        if (tMtEhsopenitem.getIsHis() != null && tMtEhsopenitem.getIsHis() == 1) {
+
+            tMtMeetingController.getReport(null, tMtEhsopenitem.getMeetingId());
         }
         return toAjax(tMtEhsopenitemService.updateTMtEhsopenitem(tMtEhsopenitem));
     }
@@ -123,9 +118,8 @@ public class TMtEhsopenitemController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tMtEhsopenitemService.deleteTMtEhsopenitemByIds(ids));
     }
 }

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

@@ -84,8 +84,9 @@ public class TMtInterlockController extends BaseController
         tMtInterlock.setUpdatedate(new Date());
         tMtInterlock.setUpdaterCode(getUserId() + "");
         tMtInterlock.setCreaterCode(getUserId() + "");
-        if (tMtInterlock.getIsHis() == 1) {
-            tMtMeetingController.getReport(null,tMtInterlock.getMeetingId());
+        if (tMtInterlock.getIsHis() != null && tMtInterlock.getIsHis() == 1) {
+
+                tMtMeetingController.getReport(null,tMtInterlock.getMeetingId());
         }
         return toAjax(tMtInterlockService.insertTMtInterlock(tMtInterlock));
     }
@@ -100,7 +101,8 @@ public class TMtInterlockController extends BaseController
     {
         tMtInterlock.setUpdatedate(new Date());
         tMtInterlock.setUpdaterCode(getUserId() + "");
-        if (tMtInterlock.getIsHis() == 1) {
+        if (tMtInterlock.getIsHis() != null && tMtInterlock.getIsHis() == 1) {
+
             tMtMeetingController.getReport(null,tMtInterlock.getMeetingId());
         }
         return toAjax(tMtInterlockService.updateTMtInterlock(tMtInterlock));

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

@@ -84,8 +84,9 @@ public class TMtOpextrackController extends BaseController
         tMtOpextrack.setUpdatedate(new Date());
         tMtOpextrack.setUpdaterCode(getUserId() + "");
         tMtOpextrack.setCreaterCode(getUserId() + "");
-        if (tMtOpextrack.getIsHis() == 1) {
-            tMtMeetingController.getReport(null,tMtOpextrack.getMeetingId());
+        if (tMtOpextrack.getIsHis() != null && tMtOpextrack.getIsHis() == 1) {
+
+                tMtMeetingController.getReport(null,tMtOpextrack.getMeetingId());
         }
         return toAjax(tMtOpextrackService.insertTMtOpextrack(tMtOpextrack));
     }
@@ -100,7 +101,8 @@ public class TMtOpextrackController extends BaseController
     {
         tMtOpextrack.setUpdatedate(new Date());
         tMtOpextrack.setUpdaterCode(getUserId() + "");
-        if (tMtOpextrack.getIsHis() == 1) {
+        if (tMtOpextrack.getIsHis() != null && 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

@@ -105,7 +105,8 @@ public class TMtPersonController extends BaseController
         tMtPerson.setUpdatedate(new Date());
         tMtPerson.setUpdaterCode(getUserId() + "");
         tMtPerson.setCreaterCode(getUserId() + "");
-        if (tMtPerson.getIsHis() == 1) {
+        if (tMtPerson.getIsHis() != null && tMtPerson.getIsHis() == 1) {
+
             tMtMeetingController.getReport(null,tMtPerson.getMeetingId());
         }
         return toAjax(tMtPersonService.insertTMtPerson(tMtPerson));
@@ -121,7 +122,7 @@ public class TMtPersonController extends BaseController
     {
         tMtPerson.setUpdatedate(new Date());
         tMtPerson.setUpdaterCode(getUserId() + "");
-        if (tMtPerson.getIsHis() == 1) {
+        if (tMtPerson.getIsHis() != null && 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

@@ -84,7 +84,7 @@ public class TMtRiskreminderController extends BaseController
         tMtRiskreminder.setUpdatedate(new Date());
         tMtRiskreminder.setUpdaterCode(getUserId() + "");
         tMtRiskreminder.setCreaterCode(getUserId() + "");
-        if (tMtRiskreminder.getIsHis() == 1) {
+        if (tMtRiskreminder.getIsHis() != null && tMtRiskreminder.getIsHis() == 1) {
             tMtMeetingController.getReport(null,tMtRiskreminder.getMeetingId());
         }
         return toAjax(tMtRiskreminderService.insertTMtRiskreminder(tMtRiskreminder));
@@ -100,7 +100,8 @@ public class TMtRiskreminderController extends BaseController
     {
         tMtRiskreminder.setUpdatedate(new Date());
         tMtRiskreminder.setUpdaterCode(getUserId() + "");
-        if (tMtRiskreminder.getIsHis() == 1) {
+        if (tMtRiskreminder.getIsHis() != null && tMtRiskreminder.getIsHis() == 1) {
+
             tMtMeetingController.getReport(null,tMtRiskreminder.getMeetingId());
         }
         return toAjax(tMtRiskreminderService.updateTMtRiskreminder(tMtRiskreminder));

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

@@ -473,6 +473,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('装置会议执行');
     },

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

@@ -376,6 +376,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('EHS开项跟踪');
     },

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

@@ -298,6 +298,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('关键机组联锁旁路');
     },

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

@@ -465,6 +465,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('下周关键维修工作');
     },

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

@@ -93,14 +93,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="checkPermi(['plant:meeting:edit']) || scope.row.responsible == getStaffId()"
+            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="checkPermi(['plant:meeting:remove']) || scope.row.responsible == getStaffId()"
+            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible)"
 
           >{{ $t('删除') }}</el-button>
         </template>
@@ -415,6 +415,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('信息提醒');
     },

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

@@ -342,6 +342,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('OpEx项目跟踪');
     },

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

@@ -317,6 +317,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.open = true;
       this.title = this.$t('新增') + " " + this.$t('风险提醒');
     },