上岗证/作业证书一览 - 删除字段“证件类型”、“证件号”、“班组长最近培训日期”、“锅炉水质处理最近培训日期”、“锅炉水质处理复审”

上岗证/作业证书一览 - 新增字段“锅炉水质处理证”
上岗证/作业证书一览 - 修改字段“建筑消防取证日期”为“消防设施操作员取证日期”

master/src/main/java/com/ruoyi/project/training/domain/TWorklicenseCertificate.java

@@ -179,6 +179,10 @@ public class TWorklicenseCertificate extends BaseEntity
     @Excel(name = "锅炉水质处理最近培训日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date waterdate;
 
+    /** 锅炉水质处理证 */
+    @Excel(name = "锅炉水质处理证")
+    private String waterid;
+
     /** 有效期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -221,6 +225,14 @@ public class TWorklicenseCertificate extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date updatedate;
 
+    public String getWaterid() {
+        return waterid;
+    }
+
+    public void setWaterid(String waterid) {
+        this.waterid = waterid;
+    }
+
     /** 部门编号 */
     private Long deptId;
 

master/src/main/resources/mybatis/training/TWorklicenseCertificateMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="foremannextreview"    column="foremannextreview"    />
         <result property="fireProtection"    column="fire_protection"    />
         <result property="waterdate"    column="waterdate"    />
+        <result property="waterid"    column="waterid"    />
         <result property="energydate"    column="energydate"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTWorklicenseCertificateVo">
-        select d.id, d.name, d.employeeid, d.idnum, d.classes, d.post, d.idtype, d.worklicense_idnum, d.boiler, d.cracking, d.hotarea, d.coldarea, d.aromatic, d.recertificatedate, d.validity, d.container, d.pipe, d.reviewdate, d.pipevalidity, d.certificate_no, d.boilerid, d.boilvalidity, d.hydrogenation, d.hydvalidity, d.hydnextreview, d.crackingid, d.crackingvalidity, d.crackingreview, d.refrigeration, d.refrigerationvalidity, d.refrigerationview, d.foremantrain, d.foremanreview, d.foremannextreview, d.fire_protection, d.waterdate, d.energydate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id,
+        select d.id, d.name, d.employeeid, d.idnum, d.classes, d.post, d.idtype, d.worklicense_idnum, d.boiler, d.cracking, d.hotarea, d.coldarea, d.aromatic, d.recertificatedate, d.validity, d.container, d.pipe, d.reviewdate, d.pipevalidity, d.certificate_no, d.boilerid, d.boilvalidity, d.hydrogenation, d.hydvalidity, d.hydnextreview, d.crackingid, d.crackingvalidity, d.crackingreview, d.refrigeration, d.refrigerationvalidity, d.refrigerationview, d.foremantrain, d.foremanreview, d.foremannextreview, d.fire_protection, d.waterdate, d.waterid, d.energydate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id,
              d.watervalidity,
              d.waterreview,
              d.energyvalidity,
@@ -103,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="foremannextreview != null "> and foremannextreview = #{foremannextreview}</if>
             <if test="fireProtection != null "> and fire_protection = #{fireProtection}</if>
             <if test="waterdate != null "> and waterdate = #{waterdate}</if>
+            <if test="waterid != null "> and waterid = #{waterid}</if>
             <if test="energydate != null "> and energydate = #{energydate}</if>
             <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
             <if test="createdate != null "> and createdate = #{createdate}</if>
@@ -172,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="foremannextreview != null">foremannextreview,</if>
             <if test="fireProtection != null">fire_protection,</if>
             <if test="waterdate != null">waterdate,</if>
+            <if test="waterid != null">waterid,</if>
             <if test="energydate != null">energydate,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createrCode != null">creater_code,</if>
@@ -221,6 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="foremannextreview != null">#{foremannextreview},</if>
             <if test="fireProtection != null">#{fireProtection},</if>
             <if test="waterdate != null">#{waterdate},</if>
+            <if test="waterid != null">#{waterid},</if>
             <if test="energydate != null">#{energydate},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createrCode != null">#{createrCode},</if>
@@ -273,6 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="foremannextreview != null">foremannextreview = #{foremannextreview},</if>
             <if test="fireProtection != null">fire_protection = #{fireProtection},</if>
             <if test="waterdate != null">waterdate = #{waterdate},</if>
+            <if test="waterid != null">waterid = #{waterid},</if>
             <if test="energydate != null">energydate = #{energydate},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>

ui/src/views/training/worklicensecertificate/index.vue

@@ -107,8 +107,6 @@
       <el-table-column label="身份证件号" align="center" prop="idnum" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="班组" align="center" prop="classes" :show-overflow-tooltip="true"/>
       <el-table-column label="职务" align="center" prop="post" :show-overflow-tooltip="true"/>
-      <el-table-column label="证件类型" align="center" prop="idtype" :show-overflow-tooltip="true"/>
-      <el-table-column label="证件号" align="center" prop="worklicenseIdnum" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="岗位">
         <el-table-column label="裂解" align="center" prop="cracking" :show-overflow-tooltip="true">
           <template slot-scope="scope">
@@ -234,11 +232,6 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="班组长安全生产合格证（3年复审）">
-        <el-table-column label="最近培训日期" align="center" prop="foremantrain" width="100">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.foremantrain, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="本次复审" align="center" prop="foremanreview" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.foremanreview, '{y}-{m}-{d}') }}</span>
@@ -255,7 +248,7 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="建筑消防（无复审）">
+      <el-table-column label="消防设施操作员（无复审）">
         <el-table-column label="取证日期" align="center" prop="fireProtection" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.fireProtection, '{y}-{m}-{d}') }}</span>
@@ -268,9 +261,10 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="锅炉水质处理">
-        <el-table-column label="最近培训日期" align="center" prop="waterdate" width="100">
+        <el-table-column label="锅炉水质处理证" align="center" prop="waterid" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waterdate, '{y}-{m}-{d}') }}</span>
+            <span>{{ scope.row.waterid }}</span>
+            <el-button v-if="scope.row.waterid != null" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'certificate-waterdate')"  circle></el-button>
           </template>
         </el-table-column>
         <el-table-column label="有效期" align="center" prop="watervalidity" width="100">
@@ -278,11 +272,6 @@
             <span>{{ parseTime(scope.row.watervalidity, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="复审" align="center" prop="waterreview" width="100">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.waterreview, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="附件" align="center" width="80">
           <template slot-scope="scope">
             <el-button icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'certificate-waterdate')"  circle></el-button>
@@ -364,12 +353,6 @@
             <el-form-item label="职务" prop="post">
               <el-input v-model="form.post" placeholder="请输入职务" />
             </el-form-item>
-            <el-form-item :label="$t('证件类型')" prop="idtype">
-              <el-input v-model="form.idtype" :placeholder="$t('请输入') + $t('证件类型')" />
-            </el-form-item>
-            <el-form-item label="证件号" prop="worklicenseIdnum">
-              <el-input v-model="form.worklicenseIdnum" placeholder="请输入证件号" />
-            </el-form-item>
             <el-col :span="6">
               <el-form-item :label="$t('裂解')" prop="cracking">
                 <el-checkbox v-model="form.cracking"></el-checkbox>
@@ -504,14 +487,6 @@
                               placeholder="选择复审">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="班组长最近培训日期" prop="foremantrain">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.foremantrain"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="选择班组长最近培训日期">
-              </el-date-picker>
-            </el-form-item>
             <el-form-item label="班组长本次复审" prop="foremanreview">
               <el-date-picker clearable size="small" style="width: 200px"
                               v-model="form.foremanreview"
@@ -528,21 +503,16 @@
                               placeholder="选择班组长下次复审">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="建筑消防取证日期" prop="fireProtection">
+            <el-form-item label="消防设施操作员取证日期" prop="fireProtection">
               <el-date-picker clearable size="small" style="width: 200px"
                               v-model="form.fireProtection"
                               type="date"
                               value-format="yyyy-MM-dd"
-                              placeholder="选择建筑消防取证日期">
+                              placeholder="选择消防设施操作员取证日期">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="锅炉水质处理最近培训日期" prop="waterdate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.waterdate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="选择锅炉水质处理最近培训日期">
-              </el-date-picker>
+            <el-form-item label="锅炉水质处理证" prop="waterid">
+              <el-input v-model="form.waterid" placeholder="请输入锅炉水质处理证" />
             </el-form-item>
             <el-form-item label="有效期" prop="watervalidity">
               <el-date-picker clearable size="small" style="width: 200px"
@@ -772,8 +742,6 @@ export default {
         idnum: null,
         classes: null,
         post: null,
-        idtype: null,
-        worklicenseIdnum: null,
         boiler: null,
         cracking: null,
         hotarea: null,
@@ -797,11 +765,11 @@ export default {
         refrigeration: null,
         refrigerationvalidity: null,
         refrigerationview: null,
-        foremantrain: null,
         foremanreview: null,
         foremannextreview: null,
         fireProtection: null,
         waterdate: null,
+        waterid: null,
         energydate: null,
         createrCode: null,
         createdate: null,
@@ -904,37 +872,40 @@ export default {
     },
     tableHeaderStyle({row, column, rowIndex, columnIndex}) {
       let style = "text-align:center;";
-      if ((rowIndex === 0 && columnIndex === 8) || (rowIndex === 1 && columnIndex === 0)
-        || (rowIndex === 1 && columnIndex === 1) || (rowIndex === 1 && columnIndex === 2)
-        || (rowIndex === 1 && columnIndex === 3)
-        ||(rowIndex === 0 && columnIndex === 9) || (rowIndex === 0 && columnIndex === 10)
-        || (rowIndex === 1 && columnIndex === 21) || (rowIndex === 1 && columnIndex === 22)
-        || (rowIndex === 1 && columnIndex === 23) || (rowIndex === 1 && columnIndex === 20)
-        || (rowIndex === 0 && columnIndex === 14)) {
+      if ((rowIndex === 0 && columnIndex === 6)//岗位
+        || (rowIndex === 1 && columnIndex === 0) || (rowIndex === 1 && columnIndex === 1)
+        || (rowIndex === 1 && columnIndex === 2) || (rowIndex === 1 && columnIndex === 3)
+        || (rowIndex === 0 && columnIndex === 7)//取复证日期
+        || (rowIndex === 0 && columnIndex === 8)//有效期
+        || (rowIndex === 0 && columnIndex === 12)//班组长安全生产合格证（3年复审）
+        || (rowIndex === 1 && columnIndex === 20) || (rowIndex === 1 && columnIndex === 21)
+        || (rowIndex === 1 && columnIndex === 22)) {
         return style += "background:#DDFFDD;";
       }
-      if ((rowIndex === 0 && columnIndex === 11) || (rowIndex === 1 && columnIndex === 5)
+      if ((rowIndex === 0 && columnIndex === 9)//压力容器和管道证书（4年复审）
+        || (rowIndex === 1 && columnIndex === 4) || (rowIndex === 1 && columnIndex === 5)
         || (rowIndex === 1 && columnIndex === 6) || (rowIndex === 1 && columnIndex === 7)
-        || (rowIndex === 1 && columnIndex === 8) || (rowIndex === 1 && columnIndex === 4)
-        || (rowIndex === 1 && columnIndex === 25) || (rowIndex === 1 && columnIndex === 24)
-        || (rowIndex === 0 && columnIndex === 15)) {
+        || (rowIndex === 1 && columnIndex === 8)
+        || (rowIndex === 0 && columnIndex === 13)//消防设施操作员（无复审）
+        || (rowIndex === 1 && columnIndex === 23) || (rowIndex === 1 && columnIndex === 24)) {
         return style += "background:#FFFFDD;";
       }
-      if ((rowIndex === 0 && columnIndex === 12) || (rowIndex === 1 && columnIndex === 10)
-        || (rowIndex === 1 && columnIndex === 9) || (rowIndex === 0 && columnIndex === 16)
-        || (rowIndex === 1 && columnIndex === 29) || (rowIndex === 1 && columnIndex === 28)
-        || (rowIndex === 1 && columnIndex === 27)
-        || (rowIndex === 1 && columnIndex === 26)) {
+      if ((rowIndex === 0 && columnIndex === 10)//锅炉证书（4年）
+        || (rowIndex === 1 && columnIndex === 9) || (rowIndex === 1 && columnIndex === 10)
+        || (rowIndex === 0 && columnIndex === 14)//锅炉水质处理
+        || (rowIndex === 1 && columnIndex === 25) || (rowIndex === 1 && columnIndex === 26)
+        || (rowIndex === 1 && columnIndex === 27)) {
         return style += "background:#DDFFFF;";
       }
-      if ((rowIndex === 0 && columnIndex === 13) || (rowIndex === 1 && columnIndex === 12)
+      if ((rowIndex === 0 && columnIndex === 11) //危险化学品安全生产（3年复审，6年有效期）
+        || (rowIndex === 1 && columnIndex === 11) || (rowIndex === 1 && columnIndex === 12)
         || (rowIndex === 1 && columnIndex === 13) || (rowIndex === 1 && columnIndex === 14)
         || (rowIndex === 1 && columnIndex === 15) || (rowIndex === 1 && columnIndex === 16)
         || (rowIndex === 1 && columnIndex === 17) || (rowIndex === 1 && columnIndex === 18)
-        || (rowIndex === 1 && columnIndex === 19) || (rowIndex === 1 && columnIndex === 11)
-        || (rowIndex === 1 && columnIndex === 30) || (rowIndex === 1 && columnIndex === 31)
-        || (rowIndex === 1 && columnIndex === 32) || (rowIndex === 1 && columnIndex === 33)
-          || (rowIndex === 0 && columnIndex === 17)) {
+        || (rowIndex === 1 && columnIndex === 19)
+        || (rowIndex === 0 && columnIndex === 15)//锅炉能效
+        || (rowIndex === 1 && columnIndex === 28) || (rowIndex === 1 && columnIndex === 29)
+        || (rowIndex === 1 && columnIndex === 30) || (rowIndex === 1 && columnIndex === 31)) {
         return style += "background:rgb(229, 249, 175);";
       }
     },
@@ -944,20 +915,24 @@ export default {
       if (row.isHighlight == 1) {
         style += " color: red;";
       }
-      if (columnIndex === 8||columnIndex === 9||columnIndex === 10||columnIndex === 11
-        ||columnIndex === 12||columnIndex === 13 ||columnIndex === 31
-        ||columnIndex === 32||columnIndex === 33||columnIndex === 30) {
+      if (columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9//岗位
+        || columnIndex === 10 || columnIndex === 11//取复证日期 有效期
+        || columnIndex === 28 || columnIndex === 29 || columnIndex === 30//班组长安全生产合格证（3年复审）
+      ) {
         return style += "background:#DDFFDD;";
-      } else if (columnIndex === 15||columnIndex === 16||columnIndex === 17||columnIndex === 18
-        ||columnIndex === 14 ||columnIndex === 35||columnIndex === 34) {
+      } else if (columnIndex === 12 || columnIndex === 13//压力容器和管道证书（4年复审）
+        || columnIndex === 14 || columnIndex === 15 || columnIndex === 16
+        || columnIndex === 31 || columnIndex === 32//消防设施操作员（无复审）
+      ) {
         return style += "background:#FFFFDD;";
-      } else if (columnIndex === 20||columnIndex === 19||columnIndex === 37||columnIndex === 36
-        ||columnIndex === 39||columnIndex === 38) {
+      } else if (columnIndex === 17 || columnIndex === 18//锅炉证书（4年）
+        || columnIndex === 33 || columnIndex === 34 || columnIndex === 35//锅炉水质处理
+      ) {
         return style += "background:#DDFFFF;";
-      } else if (columnIndex === 22||columnIndex === 23||columnIndex === 24 ||columnIndex === 25
-        ||columnIndex === 26||columnIndex === 27 ||columnIndex === 28||columnIndex === 29
-        ||columnIndex === 21 || columnIndex === 40 || columnIndex === 41
-        || columnIndex === 42 || columnIndex === 43) {
+      } else if (columnIndex === 19 || columnIndex === 20 || columnIndex === 21 || columnIndex === 22
+        || columnIndex === 23 || columnIndex === 24|| columnIndex === 25 || columnIndex === 26 || columnIndex === 27//危险化学品安全生产（3年复审，6年有效期）
+        || columnIndex === 36 || columnIndex === 37 || columnIndex === 38 || columnIndex === 39//锅炉能效
+      ) {
         return style += "background:rgb(229, 249, 175);";
       } else {
         return style;
@@ -1070,7 +1045,7 @@ export default {
       }else if (fileType === "certificate-foremantrain"){
         workType = "班组长安全生产合格证";
       }else if (fileType === "certificate-fireProtection"){
-        workType = "建筑消防作业证书";
+        workType = "消防设施操作员作业证书";
       }else if (fileType === "certificate-waterdate"){
         workType = "锅炉水质处理作业证书";
       }else if (fileType === "certificate-energydate"){
@@ -1126,8 +1101,6 @@ export default {
         idnum: null,
         classes: null,
         post: null,
-        idtype: null,
-        worklicenseIdnum: null,
         boiler: null,
         cracking: null,
         hotarea: null,
@@ -1151,11 +1124,11 @@ export default {
         refrigeration: null,
         refrigerationvalidity: null,
         refrigerationview: null,
-        foremantrain: null,
         foremanreview: null,
         foremannextreview: null,
         fireProtection: null,
         waterdate: null,
+        waterid: null,
         energydate: null,
         delFlag: null,
         createrCode: null,