增加安全承诺公告 是否签字 签字时间字段查询

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

@@ -90,6 +90,6 @@ public class TSafetyCommitmentAnnouncement extends BaseEntity
     private String signOrNot;
 
     private String sign;
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date signTime;
 }

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

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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,sign_or_not,sign 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,sign_time from t_safety_commitment_announcement
     </sql>
 
     <select id="selectTSafetyCommitmentAnnouncementList" parameterType="TSafetyCommitmentAnnouncement" resultMap="TSafetyCommitmentAnnouncementResult">

danger-manage-web/src/views/safetyManagement/announcement/index.vue

@@ -52,6 +52,18 @@
           <span v-if="scope.row.status == '0'">已承诺</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否签字" align="center" prop="signOrNot" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.signOrNot == '0'">未签字</span>
+          <span v-if="scope.row.signOrNot == '1'">已签字</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="签字时间" align="center" prop="signTime" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.signTime == null">-</span>
+          <span v-else>{{scope.row.signTime}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="查看报告" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button