安全技术交底，监控修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/controller/JxAqjcglController.java

@@ -10,6 +10,8 @@ import org.dromara.device.domain.bo.DeviceInfoBo;
 import org.dromara.device.domain.vo.DeviceInfoVo;
 import org.dromara.device.service.IDeviceInfoService;
 import org.dromara.mechanical.jxaqgl.domain.vo.JxAnqjcgHeadVo;
+import org.dromara.project.domain.vo.projectteam.BusProjectTeamForemanVo;
+import org.dromara.project.service.IBusProjectTeamService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -43,6 +45,22 @@ public class JxAqjcglController extends BaseController {
 
     private final IDeviceInfoService deviceInfoService;
 
+    private final IBusProjectTeamService busProjectTeamService;
+
+
+
+
+
+    /**
+     * 根据项目id查询项目班组班组长信息列表
+     */
+    @SaCheckPermission("jxaqgl:aqjcgl:list")
+    @GetMapping("/listForeman/{projectId}")
+    public R<List<BusProjectTeamForemanVo>> listForeman(@NotNull(message = "项目id不能为空")
+                                                        @PathVariable Long projectId) {
+        return R.ok(busProjectTeamService.queryForemanListByProjectId(projectId));
+    }
+
 
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/gcjkjl/domain/HseGcjk.java

@@ -49,6 +49,12 @@ public class HseGcjk extends BaseEntity {
      */
     private String deName;
 
+
+    /**
+     * 监控名称
+     */
+    private String monitorName;
+
     /**
      * 监控内容
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/gcjkjl/domain/bo/HseGcjkBo.java

@@ -52,6 +52,12 @@ public class HseGcjkBo extends BaseEntity {
      */
     private String deName;
 
+
+    /**
+     * 监控名称
+     */
+    private String monitorName;
+
     /**
      * 监控内容
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/gcjkjl/domain/vo/HseGcjkVo.java

@@ -74,6 +74,12 @@ public class HseGcjkVo implements Serializable {
     @ExcelProperty(value = "监控频次")
     private String monitorFrequency;
 
+
+    /**
+     * 监控名称
+     */
+    private String monitorName;
+
     /**
      * 监控责任人姓名
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/jsjd/domain/HseJsjd.java

@@ -43,6 +43,11 @@ public class HseJsjd extends BaseEntity {
      */
     private String deName;
 
+    /**
+     * 交底名称
+     */
+    private String disclosureName;
+
     /**
      * 项目id
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/jsjd/domain/bo/HseJsjdBo.java

@@ -33,6 +33,12 @@ public class HseJsjdBo extends BaseEntity {
      */
     private String disclosureNo;
 
+
+    /**
+     * 交底名称
+     */
+    private String disclosureName;
+
     /**
      * 危大工程ID
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/jsjd/domain/vo/HseJsjdVo.java

@@ -43,6 +43,10 @@ public class HseJsjdVo implements Serializable {
     @ExcelProperty(value = "交底编号")
     private String disclosureNo;
 
+    /**
+     * 交底名称
+     */
+    private String disclosureName;
     /**
      * 危大工程ID
      */