多选

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

@@ -113,6 +113,20 @@ public class TSafetyCommitmentAnnouncementController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
     {
+        System.out.println(tSafetyCommitmentAnnouncement);
+        return toAjax(tSafetyCommitmentAnnouncementService.updateTSafetyCommitmentAnnouncement(tSafetyCommitmentAnnouncement));
+    }
+
+    /**
+     * 修改安全承诺公告
+     * @param tSafetyCommitmentAnnouncement
+     * @return
+     */
+    @RequestMapping("/updateTSafetyCommitmentAnnouncement")
+    public AjaxResult updateTSafetyCommitmentAnnouncement(@RequestBody TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        //设置签字状态
+        tSafetyCommitmentAnnouncement.setSignOrNot("1");
         return toAjax(tSafetyCommitmentAnnouncementService.updateTSafetyCommitmentAnnouncement(tSafetyCommitmentAnnouncement));
     }
 

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

@@ -3,6 +3,7 @@ package com.zehong.system.domain;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
@@ -10,11 +11,12 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 安全承诺公告对象 t_safety_commitment_announcement
- * 
+ *
  * @author zehong
  * @date 2022-12-21
  */
 @Data
+@ToString
 public class TSafetyCommitmentAnnouncement extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -84,4 +86,8 @@ public class TSafetyCommitmentAnnouncement extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "承诺日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date commitmentDate;
+
+    private String signOrNot;
+
+    private String sign;
 }

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

@@ -3,7 +3,7 @@
 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"    />
@@ -22,15 +22,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="announcement"    column="announcement"    />
         <result property="commitmentDate"    column="commitment_date"    />
         <result property="status"    column="status"    />
+        <result property="signOrNot"    column="sign_or_not"    />
+        <result property="sign"    column="sign"    />
     </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
+        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,sign_or_not,sign from t_safety_commitment_announcement
     </sql>
 
     <select id="selectTSafetyCommitmentAnnouncementList" parameterType="TSafetyCommitmentAnnouncement" resultMap="TSafetyCommitmentAnnouncementResult">
         <include refid="selectTSafetyCommitmentAnnouncementVo"/>
-        <where>  
+        <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>
@@ -45,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="signOrNot != null  and signOrNot != ''"> and sign_or_not = #{signOrNot}</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}
@@ -55,12 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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=",">
@@ -120,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="announcement != null">announcement = #{announcement},</if>
             <if test="status != null">status = #{status},</if>
             <if test="commitmentDate != null">commitment_date = #{commitmentDate},</if>
+            <if test="sign != null">sign = #{sign},</if>
+            <if test="signOrNot != null">sign_or_not = #{signOrNot}</if>
         </trim>
         where id = #{id}
     </update>
@@ -129,9 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTSafetyCommitmentAnnouncementByIds" parameterType="String">
-        delete from t_safety_commitment_announcement where id in 
+        delete from t_safety_commitment_announcement where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file