资质汇总表--字段改动

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerCertificateInfoController.java

@@ -98,6 +98,13 @@ public class LedgerCertificateInfoController extends BaseController {
         return toAjax(certificateInfoService.updateCertificateInfo(ledgerCertificateInfo));
     }
 
+    @PreAuthorize("@ss.hasPermi('ledger:certificate:remove')")
+    @Log(title = "证书信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id) {
+        return toAjax(certificateInfoService.deleteCertificateInfoById(id));
+    }
+
     /**
      * 删除证书信息
      */

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerCertificateInfoMapper.java

@@ -59,13 +59,6 @@ public interface LedgerCertificateInfoMapper {
      */
     public int deleteCertificateInfoByIds(Long[] ids);
 
-    /**
-     * 根据身份证号查询证书信息
-     * 
-     * @param idCard 身份证号
-     * @return 证书信息
-     */
-    public LedgerCertificateInfo selectCertificateInfoByIdCard(String idCard);
 
     /**
      * 根据证书编号查询证书信息

airport-ledger/src/main/resources/mapper/personnel/LedgerCertificateInfoMapper.xml

@@ -7,19 +7,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="LedgerCertificateInfo" id="CertificateInfoResult">
         <id     property="id"              column="id"              />
         <result property="tenantId"        column="tenant_id"       />
-        <result property="unitName"        column="unit_name"       />
         <result property="userId"          column="user_id"         />
         <result property="personName"      column="person_name"     />
-        <result property="gender"          column="gender"          />
-        <result property="birthDate"       column="birth_date"      />
-        <result property="idCard"          column="id_card"         />
         <result property="certLevel"       column="cert_level"      />
         <result property="issueDate"       column="issue_date"      />
         <result property="certNo"          column="cert_no"         />
         <result property="theoryScore"     column="theory_score"    />
         <result property="practiceScore"   column="practice_score"  />
         <result property="evalScore"       column="eval_score"      />
-        <result property="employmentType"  column="employment_type" />
         <result property="serviceMonths"   column="service_months"  />
         <result property="expiryDate"      column="expiry_date"     />
         <result property="status"          column="status"          />
@@ -33,9 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCertificateInfoVo">
-        select id, tenant_id, unit_name, user_id, person_name, gender, birth_date, id_card, 
+        select id, tenant_id,  user_id, person_name,
                cert_level, issue_date, cert_no, theory_score, practice_score, eval_score, 
-               employment_type, service_months, expiry_date, status, expire_days, remark,
+               service_months, expiry_date, status, expire_days, remark,
                create_by, create_time, update_by, update_time, del_flag
         from ledger_certificate_info
     </sql>
@@ -45,20 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             del_flag = '0'
             <if test="tenantId != null and tenantId != ''"> and tenant_id = #{tenantId}</if>
-            <if test="unitName != null and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
             <if test="personName != null and personName != ''"> and person_name like concat('%', #{personName}, '%')</if>
-            <if test="gender != null and gender != ''"> and gender = #{gender}</if>
-            <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
             <if test="certLevel != null and certLevel != ''"> and cert_level = #{certLevel}</if>
             <if test="certNo != null and certNo != ''"> and cert_no = #{certNo}</if>
-            <if test="employmentType != null and employmentType != ''"> and employment_type = #{employmentType}</if>
             <if test="status != null and status != ''"> and status = #{status}</if>
-            <if test="params.beginBirthDate != null and params.beginBirthDate != ''">
-                and date_format(birth_date,'%Y%m%d') &gt;= date_format(#{params.beginBirthDate},'%Y%m%d')
-            </if>
-            <if test="params.endBirthDate != null and params.endBirthDate != ''">
-                and date_format(birth_date,'%Y%m%d') &lt;= date_format(#{params.endBirthDate},'%Y%m%d')
-            </if>
             <if test="params.beginIssueDate != null and params.beginIssueDate != ''">
                 and date_format(issue_date,'%Y%m%d') &gt;= date_format(#{params.beginIssueDate},'%Y%m%d')
             </if>
@@ -80,11 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id} and del_flag = '0'
     </select>
 
-    <select id="selectCertificateInfoByIdCard" parameterType="String" resultMap="CertificateInfoResult">
-        <include refid="selectCertificateInfoVo"/>
-        where id_card = #{idCard} and del_flag = '0' limit 1
-    </select>
-
     <select id="selectCertificateInfoByCertNo" parameterType="String" resultMap="CertificateInfoResult">
         <include refid="selectCertificateInfoVo"/>
         where cert_no = #{certNo} and del_flag = '0' limit 1
@@ -124,19 +104,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into ledger_certificate_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
-            <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="userId != null">user_id,</if>
             <if test="personName != null and personName != ''">person_name,</if>
-            <if test="gender != null and gender != ''">gender,</if>
-            <if test="birthDate != null">birth_date,</if>
-            <if test="idCard != null and idCard != ''">id_card,</if>
             <if test="certLevel != null and certLevel != ''">cert_level,</if>
             <if test="issueDate != null">issue_date,</if>
             <if test="certNo != null and certNo != ''">cert_no,</if>
             <if test="theoryScore != null">theory_score,</if>
             <if test="practiceScore != null">practice_score,</if>
             <if test="evalScore != null">eval_score,</if>
-            <if test="employmentType != null and employmentType != ''">employment_type,</if>
             <if test="serviceMonths != null">service_months,</if>
             <if test="expiryDate != null">expiry_date,</if>
             <if test="status != null and status != ''">status,</if>
@@ -148,19 +123,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
-            <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="userId != null">#{userId},</if>
             <if test="personName != null and personName != ''">#{personName},</if>
-            <if test="gender != null and gender != ''">#{gender},</if>
-            <if test="birthDate != null">#{birthDate},</if>
-            <if test="idCard != null and idCard != ''">#{idCard},</if>
             <if test="certLevel != null and certLevel != ''">#{certLevel},</if>
             <if test="issueDate != null">#{issueDate},</if>
             <if test="certNo != null and certNo != ''">#{certNo},</if>
             <if test="theoryScore != null">#{theoryScore},</if>
             <if test="practiceScore != null">#{practiceScore},</if>
             <if test="evalScore != null">#{evalScore},</if>
-            <if test="employmentType != null and employmentType != ''">#{employmentType},</if>
             <if test="serviceMonths != null">#{serviceMonths},</if>
             <if test="expiryDate != null">#{expiryDate},</if>
             <if test="status != null and status != ''">#{status},</if>
@@ -176,19 +146,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ledger_certificate_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
-            <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="personName != null and personName != ''">person_name = #{personName},</if>
-            <if test="gender != null and gender != ''">gender = #{gender},</if>
-            <if test="birthDate != null">birth_date = #{birthDate},</if>
-            <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
             <if test="certLevel != null and certLevel != ''">cert_level = #{certLevel},</if>
             <if test="issueDate != null">issue_date = #{issueDate},</if>
             <if test="certNo != null and certNo != ''">cert_no = #{certNo},</if>
             <if test="theoryScore != null">theory_score = #{theoryScore},</if>
             <if test="practiceScore != null">practice_score = #{practiceScore},</if>
             <if test="evalScore != null">eval_score = #{evalScore},</if>
-            <if test="employmentType != null and employmentType != ''">employment_type = #{employmentType},</if>
             <if test="serviceMonths != null">service_months = #{serviceMonths},</if>
             <if test="expiryDate != null">expiry_date = #{expiryDate},</if>
             <if test="status != null and status != ''">status = #{status},</if>
@@ -222,16 +187,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="batchInsertCertificateInfo" useGeneratedKeys="true" keyProperty="list.id">
         insert into ledger_certificate_info
-        (tenant_id, unit_name, user_id, person_name, gender, birth_date, id_card,
+        (tenant_id, user_id, person_name,
          cert_level, issue_date, cert_no, theory_score, practice_score, eval_score,
-         employment_type, service_months, expiry_date, status, expire_days, remark,
+         service_months, expiry_date, status, expire_days, remark,
          create_by, create_time, del_flag)
         values
         <foreach collection="list" item="item" separator=",">
-            (#{item.tenantId}, #{item.unitName}, #{item.userId}, #{item.personName},
-             #{item.gender}, #{item.birthDate}, #{item.idCard}, #{item.certLevel},
+            (#{item.tenantId}, #{item.userId}, #{item.personName}, #{item.certLevel},
              #{item.issueDate}, #{item.certNo}, #{item.theoryScore}, #{item.practiceScore},
-             #{item.evalScore}, #{item.employmentType}, #{item.serviceMonths},
+             #{item.evalScore}, #{item.serviceMonths},
              #{item.expiryDate}, #{item.status}, #{item.expireDays}, #{item.remark},
              #{item.createBy}, sysdate(), '0')
         </foreach>
@@ -241,19 +205,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" separator=";">
             update ledger_certificate_info
             set tenant_id = #{item.tenantId},
-                unit_name = #{item.unitName},
                 user_id = #{item.userId},
                 person_name = #{item.personName},
-                gender = #{item.gender},
-                birth_date = #{item.birthDate},
-                id_card = #{item.idCard},
                 cert_level = #{item.certLevel},
                 issue_date = #{item.issueDate},
                 cert_no = #{item.certNo},
                 theory_score = #{item.theoryScore},
                 practice_score = #{item.practiceScore},
                 eval_score = #{item.evalScore},
-                employment_type = #{item.employmentType},
                 service_months = #{item.serviceMonths},
                 expiry_date = #{item.expiryDate},
                 status = #{item.status},