Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TSafetyCommitmentAnnouncementController.java

+package com.zehong.web.controller.safetyManagement;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TSafetyCommitmentAnnouncement;
+import com.zehong.system.service.ITSafetyCommitmentAnnouncementService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 安全承诺公告Controller
+ * 
+ * @author zehong
+ * @date 2022-12-21
+ */
+@RestController
+@RequestMapping("/safetyManagement/announcement")
+public class TSafetyCommitmentAnnouncementController extends BaseController
+{
+    @Autowired
+    private ITSafetyCommitmentAnnouncementService tSafetyCommitmentAnnouncementService;
+
+    /**
+     * 查询安全承诺公告列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:announcement:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        startPage();
+        List<TSafetyCommitmentAnnouncement> list = tSafetyCommitmentAnnouncementService.selectTSafetyCommitmentAnnouncementList(tSafetyCommitmentAnnouncement);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增安全承诺公告验证
+     */
+    @GetMapping("/getCurrent")
+    public AjaxResult getCurrent(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        Calendar calender = Calendar.getInstance();
+        calender.setTime(new Date());
+        String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calender.getTime());
+
+        calender.set(Calendar.HOUR_OF_DAY, 0);
+        calender.set(Calendar.MINUTE, 0);
+        calender.set(Calendar.SECOND, 0);
+        String beginTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calender.getTime());
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("beginTime", beginTime);
+        map.put("endTime", endTime);
+        tSafetyCommitmentAnnouncement.setParams(map);
+        List<TSafetyCommitmentAnnouncement> list = tSafetyCommitmentAnnouncementService.selectTSafetyCommitmentAnnouncementList(tSafetyCommitmentAnnouncement);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出安全承诺公告列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:announcement:export')")
+    @Log(title = "安全承诺公告", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        List<TSafetyCommitmentAnnouncement> list = tSafetyCommitmentAnnouncementService.selectTSafetyCommitmentAnnouncementList(tSafetyCommitmentAnnouncement);
+        ExcelUtil<TSafetyCommitmentAnnouncement> util = new ExcelUtil<TSafetyCommitmentAnnouncement>(TSafetyCommitmentAnnouncement.class);
+        return util.exportExcel(list, "安全承诺公告数据");
+    }
+
+    /**
+     * 获取安全承诺公告详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:announcement:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tSafetyCommitmentAnnouncementService.selectTSafetyCommitmentAnnouncementById(id));
+    }
+
+    /**
+     * 新增安全承诺公告
+     */
+    //@PreAuthorize("@ss.hasPermi('system:announcement:add')")
+    @Log(title = "安全承诺公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        return toAjax(tSafetyCommitmentAnnouncementService.insertTSafetyCommitmentAnnouncement(tSafetyCommitmentAnnouncement));
+    }
+
+    /**
+     * 修改安全承诺公告
+     */
+    //@PreAuthorize("@ss.hasPermi('system:announcement:edit')")
+    @Log(title = "安全承诺公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        return toAjax(tSafetyCommitmentAnnouncementService.updateTSafetyCommitmentAnnouncement(tSafetyCommitmentAnnouncement));
+    }
+
+    /**
+     * 删除安全承诺公告
+     */
+    //@PreAuthorize("@ss.hasPermi('system:announcement:remove')")
+    @Log(title = "安全承诺公告", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tSafetyCommitmentAnnouncementService.deleteTSafetyCommitmentAnnouncementByIds(ids));
+    }
+}

danger-manage-admin/src/main/java/com/zehong/web/controller/train/TTrainPlanController.java

 package com.zehong.web.controller.train;
 
 import java.util.List;
+import java.util.Map;
 
+import com.alibaba.fastjson.JSON;
 import com.zehong.system.domain.vo.PlanVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -87,7 +89,9 @@ public class TTrainPlanController extends BaseController
     {
         TTrainPlan tTrainPlan = new TTrainPlan();
         tTrainPlan.setPlanName(planVo.getPlanName());
-        return AjaxResult.success(tTrainPlanService.insertTTrainPlan(tTrainPlan,planVo.getPostIds()));
+        tTrainPlan.setPersonnelType(planVo.getPersonnelType());
+        List<Map<String,Object>> list = (List<Map<String,Object>>) JSON.parse(planVo.getPeopleList());
+        return AjaxResult.success(tTrainPlanService.insertTTrainPlan(tTrainPlan,list));
     }
 
     /**
@@ -104,7 +108,9 @@ public class TTrainPlanController extends BaseController
         TTrainPlan tTrainPlan = new TTrainPlan();
         tTrainPlan.setPlanId(planVo.getPlanId());
         tTrainPlan.setPlanName(planVo.getPlanName());
-        return toAjax(tTrainPlanService.updateTTrainPlan(tTrainPlan,planVo.getPostIds()));
+        tTrainPlan.setPersonnelType(planVo.getPersonnelType());
+        List<Map<String,Object>> list = (List<Map<String,Object>>) JSON.parse(planVo.getPeopleList());
+        return toAjax(tTrainPlanService.updateTTrainPlan(tTrainPlan,list));
     }
 
     /**

danger-manage-system/src/main/java/com/zehong/system/domain/TSafetyCommitmentAnnouncement.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 安全承诺公告对象 t_safety_commitment_announcement
+ * 
+ * @author zehong
+ * @date 2022-12-21
+ */
+@Data
+public class TSafetyCommitmentAnnouncement extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 安全承诺公告id */
+    private Long id;
+
+    /** 生产装置 */
+    @Excel(name = "生产装置")
+    private Long productionUnit;
+
+    /** 运行装置 */
+    @Excel(name = "运行装置")
+    private Long runningDevice;
+
+    /** 停产装置 */
+    @Excel(name = "停产装置")
+    private Long shutdownDevice;
+
+    /** 检修装置 */
+    @Excel(name = "检修装置")
+    private Long maintenanceDevice;
+
+    /** 动火作业 */
+    @Excel(name = "动火作业")
+    private Long hotWork;
+
+    /** 特殊动火作业 */
+    @Excel(name = "特殊动火作业")
+    private Long specialHotWork;
+
+    /** 一级动火作业 */
+    @Excel(name = "一级动火作业")
+    private Long classOneHotWork;
+
+    /** 二级动火作业 */
+    @Excel(name = "二级动火作业")
+    private Long classTwoHotWork;
+
+    /** 是否受限空间作业（0是，1否） */
+    @Excel(name = "是否受限空间作业", readConverterExp = "0=是，1否")
+    private String isConfinedSpace;
+
+    /** 是否试生产（0是，1否） */
+    @Excel(name = "是否试生产", readConverterExp = "0=是，1否")
+    private String isTrialProduction;
+
+    /** 罐装、仓库等重大危险源是否处于安全状态（0是，1否） */
+    @Excel(name = "罐装、仓库等重大危险源是否处于安全状态", readConverterExp = "0=是，1否")
+    private String isSecurityStatus;
+
+    /** 风险等级 */
+    @Excel(name = "风险等级")
+    private String assessmentLevel;
+
+    /** 主要负责人 */
+    @Excel(name = "主要负责人")
+    private String keyPerson;
+
+    /** 承诺公告 */
+    @Excel(name = "承诺公告")
+    private String announcement;
+
+    private String status;
+
+    /** 承诺日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "承诺日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date commitmentDate;
+}

danger-manage-system/src/main/java/com/zehong/system/domain/vo/PlanVo.java

@@ -8,7 +8,9 @@ public class PlanVo {
 
     private String planName;
 
-    private Long[] postIds;
+    private Integer personnelType;
 
+    private Long[] postIds;
 
+    private String peopleList;
 }

danger-manage-system/src/main/java/com/zehong/system/domain/vo/UserCourseVo.java

@@ -31,4 +31,6 @@ public class UserCourseVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+
+    private String dataKind;
 }

danger-manage-system/src/main/java/com/zehong/system/mapper/TSafetyCommitmentAnnouncementMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TSafetyCommitmentAnnouncement;
+
+/**
+ * 安全承诺公告Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-12-21
+ */
+public interface TSafetyCommitmentAnnouncementMapper 
+{
+    /**
+     * 查询安全承诺公告
+     * 
+     * @param id 安全承诺公告ID
+     * @return 安全承诺公告
+     */
+    public TSafetyCommitmentAnnouncement selectTSafetyCommitmentAnnouncementById(Long id);
+
+    /**
+     * 查询安全承诺公告列表
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 安全承诺公告集合
+     */
+    public List<TSafetyCommitmentAnnouncement> selectTSafetyCommitmentAnnouncementList(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement);
+
+    /**
+     * 新增安全承诺公告
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 结果
+     */
+    public int insertTSafetyCommitmentAnnouncement(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement);
+
+    /**
+     * 修改安全承诺公告
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 结果
+     */
+    public int updateTSafetyCommitmentAnnouncement(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement);
+
+    /**
+     * 删除安全承诺公告
+     * 
+     * @param id 安全承诺公告ID
+     * @return 结果
+     */
+    public int deleteTSafetyCommitmentAnnouncementById(Long id);
+
+    /**
+     * 批量删除安全承诺公告
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTSafetyCommitmentAnnouncementByIds(Long[] ids);
+}

danger-manage-system/src/main/java/com/zehong/system/mapper/TTrainPlanMapper.java

@@ -52,7 +52,7 @@ public interface TTrainPlanMapper
      * @param postIds
      * @return
      */
-    public int insetsPlanPost(@Param("planId") Long planId, @Param("postIds")Long[] postIds);
+    public int insetsPlanPost(@Param("planId") Long planId, @Param("list")List<Map<String,Object>> list);
 
     /**
      * 删除计划职位

danger-manage-system/src/main/java/com/zehong/system/service/ITSafetyCommitmentAnnouncementService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TSafetyCommitmentAnnouncement;
+
+/**
+ * 安全承诺公告Service接口
+ * 
+ * @author zehong
+ * @date 2022-12-21
+ */
+public interface ITSafetyCommitmentAnnouncementService 
+{
+    /**
+     * 查询安全承诺公告
+     * 
+     * @param id 安全承诺公告ID
+     * @return 安全承诺公告
+     */
+    public TSafetyCommitmentAnnouncement selectTSafetyCommitmentAnnouncementById(Long id);
+
+    /**
+     * 查询安全承诺公告列表
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 安全承诺公告集合
+     */
+    public List<TSafetyCommitmentAnnouncement> selectTSafetyCommitmentAnnouncementList(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement);
+
+    /**
+     * 新增安全承诺公告
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 结果
+     */
+    public int insertTSafetyCommitmentAnnouncement(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement);
+
+    /**
+     * 修改安全承诺公告
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 结果
+     */
+    public int updateTSafetyCommitmentAnnouncement(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement);
+
+    /**
+     * 批量删除安全承诺公告
+     * 
+     * @param ids 需要删除的安全承诺公告ID
+     * @return 结果
+     */
+    public int deleteTSafetyCommitmentAnnouncementByIds(Long[] ids);
+
+    /**
+     * 删除安全承诺公告信息
+     * 
+     * @param id 安全承诺公告ID
+     * @return 结果
+     */
+    public int deleteTSafetyCommitmentAnnouncementById(Long id);
+}

danger-manage-system/src/main/java/com/zehong/system/service/ITTrainPlanService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TTrainPlan;
 
 /**
@@ -34,7 +36,7 @@ public interface ITTrainPlanService
      * @param tTrainPlan 培训计划
      * @return 结果
      */
-    public Long insertTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds);
+    public Long insertTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list);
 
     /**
      * 修改培训计划
@@ -42,7 +44,7 @@ public interface ITTrainPlanService
      * @param tTrainPlan 培训计划
      * @return 结果
      */
-    public int updateTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds);
+    public int updateTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list);
 
     /**
      * 批量删除培训计划

danger-manage-system/src/main/java/com/zehong/system/service/impl/TSafetyCommitmentAnnouncementServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TSafetyCommitmentAnnouncementMapper;
+import com.zehong.system.domain.TSafetyCommitmentAnnouncement;
+import com.zehong.system.service.ITSafetyCommitmentAnnouncementService;
+
+/**
+ * 安全承诺公告Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-12-21
+ */
+@Service
+public class TSafetyCommitmentAnnouncementServiceImpl implements ITSafetyCommitmentAnnouncementService 
+{
+    @Autowired
+    private TSafetyCommitmentAnnouncementMapper tSafetyCommitmentAnnouncementMapper;
+
+    /**
+     * 查询安全承诺公告
+     * 
+     * @param id 安全承诺公告ID
+     * @return 安全承诺公告
+     */
+    @Override
+    public TSafetyCommitmentAnnouncement selectTSafetyCommitmentAnnouncementById(Long id)
+    {
+        return tSafetyCommitmentAnnouncementMapper.selectTSafetyCommitmentAnnouncementById(id);
+    }
+
+    /**
+     * 查询安全承诺公告列表
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 安全承诺公告
+     */
+    @Override
+    public List<TSafetyCommitmentAnnouncement> selectTSafetyCommitmentAnnouncementList(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        return tSafetyCommitmentAnnouncementMapper.selectTSafetyCommitmentAnnouncementList(tSafetyCommitmentAnnouncement);
+    }
+
+    /**
+     * 新增安全承诺公告
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 结果
+     */
+    @Override
+    public int insertTSafetyCommitmentAnnouncement(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        return tSafetyCommitmentAnnouncementMapper.insertTSafetyCommitmentAnnouncement(tSafetyCommitmentAnnouncement);
+    }
+
+    /**
+     * 修改安全承诺公告
+     * 
+     * @param tSafetyCommitmentAnnouncement 安全承诺公告
+     * @return 结果
+     */
+    @Override
+    public int updateTSafetyCommitmentAnnouncement(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        return tSafetyCommitmentAnnouncementMapper.updateTSafetyCommitmentAnnouncement(tSafetyCommitmentAnnouncement);
+    }
+
+    /**
+     * 批量删除安全承诺公告
+     * 
+     * @param ids 需要删除的安全承诺公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSafetyCommitmentAnnouncementByIds(Long[] ids)
+    {
+        return tSafetyCommitmentAnnouncementMapper.deleteTSafetyCommitmentAnnouncementByIds(ids);
+    }
+
+    /**
+     * 删除安全承诺公告信息
+     * 
+     * @param id 安全承诺公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSafetyCommitmentAnnouncementById(Long id)
+    {
+        return tSafetyCommitmentAnnouncementMapper.deleteTSafetyCommitmentAnnouncementById(id);
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java

@@ -196,7 +196,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
         }
         //新增考试人员
         List<JSONObject> personList = JSONObject.parseArray(course.getTestPersons(),JSONObject.class);
-        List<String> persons = personList.stream().map(item ->(String)item.get("staffId")).collect(Collectors.toList());
+        List<String> persons = personList.stream().map(item ->(String)item.get("peoPleId")).collect(Collectors.toList());
         tTrainCourseMapper.insertUserCourse(tTrainCourse.getCourseId(),persons,tTrainCourse.getPersonnelType());
         tTrainCourse.setStatus(1);
         tTrainCourse.setReleaseTime(new Date());

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainPlanServiceImpl.java

@@ -64,11 +64,11 @@ public class TTrainPlanServiceImpl implements ITTrainPlanService
      */
     @Override
     @Transactional
-    public Long insertTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds)
+    public Long insertTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list)
     {
         tTrainPlan.setCreateTime(DateUtils.getNowDate());
         int a = tTrainPlanMapper.insertTTrainPlan(tTrainPlan);
-        tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),postIds);
+        tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),list);
         return tTrainPlan.getPlanId();
     }
 
@@ -80,11 +80,11 @@ public class TTrainPlanServiceImpl implements ITTrainPlanService
      */
     @Override
     @Transactional
-    public int updateTTrainPlan(TTrainPlan tTrainPlan,Long[] postIds)
+    public int updateTTrainPlan(TTrainPlan tTrainPlan,List<Map<String,Object>> list)
     {
         int a = tTrainPlanMapper.updateTTrainPlan(tTrainPlan);
         tTrainPlanMapper.deletePlanPost(tTrainPlan.getPlanId());
-        tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),postIds);
+        tTrainPlanMapper.insetsPlanPost(tTrainPlan.getPlanId(),list);
         return a;
     }
 

danger-manage-system/src/main/resources/mapper/system/TSafetyCommitmentAnnouncementMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TSafetyCommitmentAnnouncementMapper">
+    
+    <resultMap type="TSafetyCommitmentAnnouncement" id="TSafetyCommitmentAnnouncementResult">
+        <result property="id"    column="id"    />
+        <result property="productionUnit"    column="production_unit"    />
+        <result property="runningDevice"    column="running_device"    />
+        <result property="shutdownDevice"    column="shutdown_device"    />
+        <result property="maintenanceDevice"    column="maintenance_device"    />
+        <result property="hotWork"    column="hot_work"    />
+        <result property="specialHotWork"    column="special_hot_work"    />
+        <result property="classOneHotWork"    column="class_one_hot_work"    />
+        <result property="classTwoHotWork"    column="class_two_hot_work"    />
+        <result property="isConfinedSpace"    column="is_confined_space"    />
+        <result property="isTrialProduction"    column="is_trial_production"    />
+        <result property="isSecurityStatus"    column="is_security_status"    />
+        <result property="assessmentLevel"    column="assessment_level"    />
+        <result property="keyPerson"    column="key_person"    />
+        <result property="announcement"    column="announcement"    />
+        <result property="commitmentDate"    column="commitment_date"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectTSafetyCommitmentAnnouncementVo">
+        select id, production_unit, running_device, shutdown_device, maintenance_device, hot_work, special_hot_work, class_one_hot_work, class_two_hot_work, is_confined_space, is_trial_production, is_security_status, assessment_level, key_person, announcement, commitment_date, status from t_safety_commitment_announcement
+    </sql>
+
+    <select id="selectTSafetyCommitmentAnnouncementList" parameterType="TSafetyCommitmentAnnouncement" resultMap="TSafetyCommitmentAnnouncementResult">
+        <include refid="selectTSafetyCommitmentAnnouncementVo"/>
+        <where>  
+            <if test="productionUnit != null "> and production_unit = #{productionUnit}</if>
+            <if test="runningDevice != null "> and running_device = #{runningDevice}</if>
+            <if test="shutdownDevice != null "> and shutdown_device = #{shutdownDevice}</if>
+            <if test="maintenanceDevice != null "> and maintenance_device = #{maintenanceDevice}</if>
+            <if test="hotWork != null "> and hot_work = #{hotWork}</if>
+            <if test="specialHotWork != null "> and special_hot_work = #{specialHotWork}</if>
+            <if test="classOneHotWork != null "> and class_one_hot_work = #{classOneHotWork}</if>
+            <if test="classTwoHotWork != null "> and class_two_hot_work = #{classTwoHotWork}</if>
+            <if test="isConfinedSpace != null  and isConfinedSpace != ''"> and is_confined_space = #{isConfinedSpace}</if>
+            <if test="isTrialProduction != null  and isTrialProduction != ''"> and is_trial_production = #{isTrialProduction}</if>
+            <if test="isSecurityStatus != null  and isSecurityStatus != ''"> and is_security_status = #{isSecurityStatus}</if>
+            <if test="assessmentLevel != null  and assessmentLevel != ''"> and assessment_level = #{assessmentLevel}</if>
+            <if test="keyPerson != null  and keyPerson != ''"> and key_person = #{keyPerson}</if>
+            <if test="announcement != null  and announcement != ''"> and announcement = #{announcement}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND commitment_date &gt;= #{params.beginTime}
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND commitment_date &lt;= #{params.endTime}
+            </if>
+        </where>
+        order by commitment_date desc
+    </select>
+    
+    <select id="selectTSafetyCommitmentAnnouncementById" parameterType="Long" resultMap="TSafetyCommitmentAnnouncementResult">
+        <include refid="selectTSafetyCommitmentAnnouncementVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTSafetyCommitmentAnnouncement" parameterType="TSafetyCommitmentAnnouncement">
+        insert into t_safety_commitment_announcement
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="productionUnit != null">production_unit,</if>
+            <if test="runningDevice != null">running_device,</if>
+            <if test="shutdownDevice != null">shutdown_device,</if>
+            <if test="maintenanceDevice != null">maintenance_device,</if>
+            <if test="hotWork != null">hot_work,</if>
+            <if test="specialHotWork != null">special_hot_work,</if>
+            <if test="classOneHotWork != null">class_one_hot_work,</if>
+            <if test="classTwoHotWork != null">class_two_hot_work,</if>
+            <if test="isConfinedSpace != null">is_confined_space,</if>
+            <if test="isTrialProduction != null">is_trial_production,</if>
+            <if test="isSecurityStatus != null">is_security_status,</if>
+            <if test="assessmentLevel != null">assessment_level,</if>
+            <if test="keyPerson != null">key_person,</if>
+            <if test="announcement != null">announcement,</if>
+            <if test="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="productionUnit != null">#{productionUnit},</if>
+            <if test="runningDevice != null">#{runningDevice},</if>
+            <if test="shutdownDevice != null">#{shutdownDevice},</if>
+            <if test="maintenanceDevice != null">#{maintenanceDevice},</if>
+            <if test="hotWork != null">#{hotWork},</if>
+            <if test="specialHotWork != null">#{specialHotWork},</if>
+            <if test="classOneHotWork != null">#{classOneHotWork},</if>
+            <if test="classTwoHotWork != null">#{classTwoHotWork},</if>
+            <if test="isConfinedSpace != null">#{isConfinedSpace},</if>
+            <if test="isTrialProduction != null">#{isTrialProduction},</if>
+            <if test="isSecurityStatus != null">#{isSecurityStatus},</if>
+            <if test="assessmentLevel != null">#{assessmentLevel},</if>
+            <if test="keyPerson != null">#{keyPerson},</if>
+            <if test="announcement != null">#{announcement},</if>
+            <if test="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTSafetyCommitmentAnnouncement" parameterType="TSafetyCommitmentAnnouncement">
+        update t_safety_commitment_announcement
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productionUnit != null">production_unit = #{productionUnit},</if>
+            <if test="runningDevice != null">running_device = #{runningDevice},</if>
+            <if test="shutdownDevice != null">shutdown_device = #{shutdownDevice},</if>
+            <if test="maintenanceDevice != null">maintenance_device = #{maintenanceDevice},</if>
+            <if test="hotWork != null">hot_work = #{hotWork},</if>
+            <if test="specialHotWork != null">special_hot_work = #{specialHotWork},</if>
+            <if test="classOneHotWork != null">class_one_hot_work = #{classOneHotWork},</if>
+            <if test="classTwoHotWork != null">class_two_hot_work = #{classTwoHotWork},</if>
+            <if test="isConfinedSpace != null">is_confined_space = #{isConfinedSpace},</if>
+            <if test="isTrialProduction != null">is_trial_production = #{isTrialProduction},</if>
+            <if test="isSecurityStatus != null">is_security_status = #{isSecurityStatus},</if>
+            <if test="assessmentLevel != null">assessment_level = #{assessmentLevel},</if>
+            <if test="keyPerson != null">key_person = #{keyPerson},</if>
+            <if test="announcement != null">announcement = #{announcement},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="commitmentDate != null">commitment_date = #{commitmentDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTSafetyCommitmentAnnouncementById" parameterType="Long">
+        delete from t_safety_commitment_announcement where id = #{id}
+    </delete>
+
+    <delete id="deleteTSafetyCommitmentAnnouncementByIds" parameterType="String">
+        delete from t_safety_commitment_announcement where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/TTrainCourseMapper.xml

@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="userCourseList" resultType="com.zehong.system.domain.vo.UserCourseVo">
         SELECT uc.user_course_id AS userCourseId,uc.state ,uc.examination_time AS examinationTime,
         uc.`examination_result` AS examinationResult,uc.`create_time` AS createTime,
-        c.`course_name` AS courseName, c.`topic_num` AS topicNum,c.`release_time` AS releaseTime,
+        c.`course_name` AS courseName, c.`topic_num` AS topicNum,c.`release_time` AS releaseTime,c.data_kind as dataKind,
         p.`plan_name` AS courseType,c.course_id as courseId,c.qualified_num as qualifiedNum
         FROM t_train_user_course uc
         LEFT JOIN t_train_course c ON c.`course_id` = uc.`course_id`

danger-manage-system/src/main/resources/mapper/system/TTrainPlanMapper.xml

@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <insert id="insetsPlanPost">
         INSERT INTO t_train_plan_post(plan_id,post_id) VALUES
-        <foreach collection="postIds" separator="," item="item">
-            (#{planId},#{item})
+        <foreach collection="list" separator="," item="item">
+            (#{planId},#{item.staffId})
         </foreach>
 
     </insert>
@@ -84,8 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectTrainPostByPlanId" parameterType="Long" resultType="com.zehong.system.domain.vo.PlanPostVo">
-        SELECT  p.`post_id` as postId,p.`post_name` as postName,IF(pp.`post_id` IS NULL,FALSE,TRUE) AS ischeck  FROM sys_post p
-	    LEFT JOIN t_train_plan_post pp ON ( p.`post_id` = pp.`post_id` AND pp.`plan_id` = #{planId} )
+        SELECT u.user_id AS postId, u.staff_name AS postName,TRUE AS ischeck  FROM
+	    t_train_plan_post p LEFT JOIN sys_user u ON u.`user_id` = p.`post_id`
+	    WHERE p.`plan_id` = #{planId}
     </select>
     <select id="selectAlluserByplanId" resultType="java.lang.String">
         SELECT post_id FROM  t_train_plan_post  WHERE plan_id =#{planId}

danger-manage-web/src/api/educationPlanExam/trainingProgram.js

@@ -52,5 +52,11 @@ export function deletePlan(query) {
     params: query
   })
 }
+export function getPlan(query) {
+  return request({
+    url: '/system/plan/'+ query,
+    method: 'get',
+  })
+}
 
 

danger-manage-web/src/api/safetyManagement/announcement.js

+import request from '@/utils/request'
+
+// 查询安全承诺公告列表
+export function listAnnouncement(query) {
+  return request({
+    url: '/safetyManagement/announcement/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询安全承诺公告详细
+export function getCurrent(query) {
+  return request({
+    url: '/safetyManagement/announcement/getCurrent',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询安全承诺公告详细
+export function getAnnouncement(id) {
+  return request({
+    url: '/safetyManagement/announcement/' + id,
+    method: 'get'
+  })
+}
+
+// 新增安全承诺公告
+export function addAnnouncement(data) {
+  return request({
+    url: '/safetyManagement/announcement',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改安全承诺公告
+export function updateAnnouncement(data) {
+  return request({
+    url: '/safetyManagement/announcement',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除安全承诺公告
+export function delAnnouncement(id) {
+  return request({
+    url: '/safetyManagement/announcement/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出安全承诺公告
+export function exportAnnouncement(query) {
+  return request({
+    url: '/safetyManagement/announcement/export',
+    method: 'get',
+    params: query
+  })
+}

danger-manage-web/src/views/educationPlanExam/lessonsProgram/index.vue

@@ -112,13 +112,13 @@
           <a v-else :href="enclosure" class="down-load">下载附件</a>
         </template>
       </el-table-column>
-      <el-table-column label="视频" align="center" prop="video">
-        <template v-slot="{ row: { courseName, video } }">
-          <a @click="downLoadVideo(video, courseName)" class="down-load"
-            >下载视频</a
-          >
-        </template>
-      </el-table-column>
+      <!--<el-table-column label="视频" align="center" prop="video">-->
+        <!--<template v-slot="{ row: { courseName, video } }">-->
+          <!--<a @click="downLoadVideo(video, courseName)" class="down-load"-->
+            <!--&gt;下载视频</a-->
+          <!--&gt;-->
+        <!--</template>-->
+      <!--</el-table-column>-->
       <el-table-column
         label="发布时间"
         align="center"

danger-manage-web/src/views/educationPlanExam/myLessons/components/LearnItem.vue

@@ -8,8 +8,12 @@
 -->
 <template>
   <div class="item flex">
-    <div class="title">{{ itemData.courseType||'-' }}</div>
-    <div class="lesson">{{ itemData.courseName }}</div>
+    <div class="title" style="text-align: center">{{ itemData.courseType||'-' }}</div>
+    <div class="allone">
+      <img v-if="itemData.dataKind==0" style="height: 18px" src="@/assets/img/ykao.png"/>
+      <img v-if="itemData.dataKind==1" style="height: 18px" src="@/assets/img/skao.png"/>
+      <div class="lesson" style="width: 75%">  {{ itemData.courseName }}</div>
+    </div>
     <div class="time">发布时间：{{ itemData.createTime }}</div>
     <div class="bottom flex">
       <div @click="click" class="btn" :class="{ again: yesOrNo }">
@@ -133,6 +137,11 @@ export default {
       }
     }
   }
+  .allone{
+    display:flex;
+    flex-direction:row;
+    justify-content:flex-start;
+  }
   .img {
     position: absolute;
     width: 100px;

danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Dia.vue

+<!--
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2022-09-22 10:38:49
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2022-12-19 14:01:37
+ * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/addLesson.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <el-dialog
+    class="add-lession"
+    :title="title"
+    :visible.sync="visible"
+    width="1020px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :before-close="dialogCancel"
+    @closed="closeFinished"
+    destroy-on-close
+  >
+    <div v-if="visible" ref="myBody" class="body">
+      <transition name="fade" mode="out-in">
+        <component
+          :is="currentComponent"
+          :bankId.sync="bankId"
+          :subjectId.sync="subjectId"
+          ref="current"
+        ></component>
+      </transition>
+      <!-- <Lesson ref='lesson'/> -->
+      <!-- <AddQuestion />
+      <QuestionList/> -->
+    </div>
+
+    <div slot="footer" class="dialog-footer">
+      <!--<el-button-->
+        <!--type="primary"-->
+        <!--v-if="this.componentsNum == 1 || this.componentsNum == 3"-->
+        <!--@click="save"-->
+        <!--&gt;保存</el-button-->
+      <!--&gt;-->
+
+      <!--<el-button type="primary" @click="saveAndNext">{{-->
+        <!--saveNextText-->
+      <!--}}</el-button>-->
+      <el-button
+        v-if="this.componentsNum == 2"
+        type="primary"
+        @click="savePlan"
+        >{{ "确认" }}</el-button
+      >
+      <el-button @click="dialogCancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import Lesson from "./Lesson";
+import AddQuestion from "../../textPaper/components/AddQuestion";
+import QuestionList from "../../textPaper/components/QuestionList";
+
+export default {
+  name: "AnswerLesson",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    componentsNum: {
+      type: Number,
+      default: 1,
+    },
+    bankId: {
+      type: Number,
+    },
+  },
+  // components: {
+  //   Lesson,
+  //   AddQuestion,
+  //   QuestionList,
+  // },
+
+  data() {
+    return {
+      title: "录入课程",
+      currentComponent: Lesson,
+      // 当前题目查看
+      subjectId: null,
+    };
+  },
+  watch: {
+    componentsNum: {
+      handler(num) {
+        if (num === 1) {
+          this.currentComponent = Lesson;
+          if (this.bankId) {
+            this.title = "修改课程";
+          } else {
+            this.title = "新增课程";
+          }
+        } else if (num === 2) {
+          this.currentComponent = QuestionList;
+
+          this.title = "题目列表";
+        } else {
+          this.currentComponent = AddQuestion;
+          if (this.subjectId) {
+            this.title = "修改题目";
+          } else {
+            this.title = "新增题目";
+          }
+        }
+      },
+      deep: true,
+    },
+  },
+  computed: {
+    saveNextText() {
+      let text;
+      if (this.componentsNum == 1) {
+        text = "保存并录入题目";
+      } else if (this.componentsNum == 2) {
+        text = "录入考题";
+      } else {
+        text = "保存并录入下一题";
+      }
+      return text;
+    },
+  },
+  methods: {
+    saveBody() {
+      this.startHeight = this.$refs.myBody.offsetHeight - 55 + "px";
+    },
+
+    closeFinished() {},
+    // 关闭之后
+    // 只保存
+    save() {
+      // this.answerClear();
+      this.$refs.current.save();
+    },
+    savePlan() {
+      // this.answerClear();
+      this.$refs.current.savePlan();
+    },
+    // 保存并录入
+    saveAndNext() {
+      this.$refs.current.saveAndNext();
+    },
+    // 隐藏与显示dialog
+    dialogCancel() {
+      this.$emit("update:visible", false);
+    },
+    // 把ID改变了
+    changeCourseId(bankId) {
+      this.$emit("update:bankId", bankId);
+    },
+    // 改变当前组件
+    componentsNumChange(num) {
+      this.$emit("update:componentsNum", num);
+    },
+
+    answerClear() {
+      this.answerArr = [];
+      this.changeCourseId(null);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.body {
+  width: 100%;
+  height: 100%;
+  padding-right: 40px;
+  padding-left: 36px;
+}
+</style>

danger-manage-web/src/views/educationPlanExam/trainingProgram/components/Item.vue

@@ -19,6 +19,10 @@
           </div>
         </div>
       </div>
+      <div class="right flex"  style="line-height: 110px;">
+          <div style="margin-left: 20px" v-if="infoData.personnelType==1">员工培训</div>
+          <div style="margin-left: 20px" v-if="infoData.personnelType==2">承包商培训</div>
+      </div>
       <div class="middle flex">
         <div>
           <div class="top">参与培训人员</div>
@@ -93,7 +97,9 @@ export default {
   methods: {
     edit() {
       // 编辑
-      this.$emit("edit", this.oldInfoData);
+      //console.log(this.infoData);
+      this.$parent.addClick(this.infoData);
+      //this.$emit("edit", this.oldInfoData);
     },
     save() {
       if (this.infoData.planName == "") {
@@ -177,7 +183,7 @@ export default {
     transition: all 0.5s;
     width: 93.2%;
     max-width: 1600px;
-    height: 111px;
+    min-height: 111px;
     border: 1px solid #cecece;
     box-shadow: -4px 0px 0px 0px rgba(0, 0, 0, 0.1);
     background: linear-gradient(
@@ -196,6 +202,7 @@ export default {
       height: 100%;
       align-items: center;
       justify-content: right;
+      margin-top: 25px;
       .left-item {
         transition: all 0.5s;
         width: 200px;

danger-manage-web/src/views/educationPlanExam/trainingProgram/index.vue

@@ -28,7 +28,7 @@
         v-for="item in list"
         :key="item.planId"
         :infoData="item"
-        :personnelOptions="personnelOptions"
+        :personnelOptions="item.postIds"
         @edit="edit"
         @save="itemSave"
         @deletePlan="deletePlan"
@@ -60,16 +60,22 @@
           </el-checkbox-group>
         </el-form-item>
       </el-form>
-
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogSubmitForm">确 定</el-button>
         <el-button @click="dialogCancel">取 消</el-button>
       </div>
     </el-dialog>
+    <Dia
+      ref="Dia"
+      :componentsNum.sync="componentsNum"
+      :bankId.sync="bankId"
+      :visible.sync="dilogFlag"
+    />
   </div>
 </template>
 
 <script>
+  import Dia from "./components/Dia";
 import Item from "./components/Item";
 import {
   getPersonnel,
@@ -91,7 +97,7 @@ const personnelOptions = [
 export default {
   name: "trainingProgram",
   components: {
-    Item,
+    Item,Dia
   },
   data() {
     return {
@@ -106,6 +112,10 @@ export default {
         planName: "",
         postIds: [],
       },
+      componentsNum: 2,
+      // 点击的id，如果是新增为空
+      bankId: null,
+      dilogFlag: false,
       rules: {
         planName: [
           {
@@ -143,17 +153,21 @@ export default {
       });
     },
     getPlanList() {
+    this.dilogFlag = false;
       return getPlanList().then((res) => {
         console.log(res.data);
         this.list = res.data.map((item) => {
           return {
             planId: item.planId,
             planName: item.planName,
-            postIds: item.postList
+            personnelType:item.personnelType,
+            postIds: item.postList,
+            postList: item.postList
               .filter((item) => item.ischeck)
               .map((item) => item.postId),
           };
         });
+        console.log(this.list);
       });
     },
     addPlan(plan) {
@@ -214,8 +228,18 @@ export default {
       this.isActiveId = 999;
     },
     changeList() {},
-    addClick() {
-      this.addOpen = true;
+    addClick(form) {
+
+    this.$refs.Dia.title = "新增培训计划";
+    this.componentsNum = 2;
+    this.bankId = null;
+    this.dilogFlag = true;
+    if(form.planId!=undefined){
+      //console.log("=======")
+      this.$refs.Dia.title = "修改培训计划";
+      this.bankId  = form.planId;
+    }
+      //this.addOpen = true;
     },
     dialogSubmitForm() {
       this.$refs["form"].validate((valid) => {