重点人员导入调整，未成年人根据模板导入负责人、单位信息；增加身份证有效判断

src/main/java/com/scpyun/platform/jilinsscgsdp/utils/FileDataListener.java

@@ -324,6 +324,10 @@ public class FileDataListener extends AnalysisEventListener<KeyPersonImp> {
 
     //excel解析内容转换及位置处理判断
     private String enc(KeyPersonImp person, Boolean judge) {
+        if("6".equals(sysType)){//根据模板，将重点人责任单位、重点人责任人赋值给责任单位、责任人
+            person.setResponsibleCompany(person.getResponsibleCompanyByKeyPersonnel());
+            person.setResponsiblePerson(person.getResponsiblePersonKeyPersonnel());
+        }
         if(person.getFolk()!=null && !person.getFolk().equals("")){
             String mz = null;
             for(String key : mzMap.keySet()){
@@ -503,7 +507,7 @@ public class FileDataListener extends AnalysisEventListener<KeyPersonImp> {
                 !person.getSex().trim().isEmpty() &&
                 person.getPhone() != null &&
                 !person.getPhone().trim().isEmpty() &&
-                !IdcardUtil.isValidCard(person.getCardNo()); //"证件号不正确"
+                IdcardUtil.isValidCard(person.getCardNo()); //"证件号正确"
     }
 
     /**

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyPersonRatingHistoryDao.xml

@@ -169,6 +169,8 @@
         responsible_person_by_assistance,
         responsible_company_by_key_personnel,
         responsible_person_key_personnel,
+        responsible_company,
+        responsible_person,
         hazard_assessment_level, create_user) VALUES
         <foreach collection="list" item="person" index="index" separator=",">
             (#{person.id}, #{person.sysType}, #{person.name}, #{person.sex}, #{person.folk},
@@ -178,6 +180,7 @@
             #{person.address}, #{person.involvingConflictsDisputes}, #{person.riskLevel},
             #{person.responsibleCompanyByAssistance}, #{person.responsiblePersonByAssistance},
             #{person.responsibleCompanyByKeyPersonnel}, #{person.responsiblePersonKeyPersonnel},
+            #{person.responsibleCompany}, #{person.responsiblePerson},
             #{person.hazardAssessmentLevel}, #{person.createUser})
         </foreach>
     </insert>
@@ -213,13 +216,13 @@
                 registered_residence = #{registeredResidence},
             </if>
             <if test="cityId != null and cityId != ''">
-                `city_id` = #{cityId}
+                `city_id` = #{cityId},
             </if>
             <if test="areaId != null and areaId != ''">
-                `area_id` = #{areaId}
+                `area_id` = #{areaId},
             </if>
             <if test="streetId != null and streetId != ''">
-                `street_id` = #{streetId}
+                `street_id` = #{streetId},
             </if>
             <if test="communityId != null and communityId != ''">
                 `community_id` = #{communityId},
@@ -245,6 +248,12 @@
             <if test="responsiblePersonKeyPersonnel != null and responsiblePersonKeyPersonnel != ''">
                 responsible_person_key_personnel = #{responsiblePersonKeyPersonnel},
             </if>
+            <if test="responsibleCompany != null and responsibleCompany != ''">
+                responsible_company = #{responsibleCompany},
+            </if>
+            <if test="responsiblePerson != null and responsiblePerson != ''">
+                responsible_person = #{responsiblePerson},
+            </if>
             <if test="hazardAssessmentLevel != null and hazardAssessmentLevel != ''">
                 hazard_assessment_level = #{hazardAssessmentLevel},
             </if>
@@ -288,6 +297,8 @@
         responsible_person_by_assistance,
         responsible_company_by_key_personnel,
         responsible_person_key_personnel,
+        responsible_company,
+        responsible_person,
         hazard_assessment_level, create_user, region) VALUES
         <foreach collection="list" item="person" index="index" separator=",">
             (#{person.id}, #{person.sysType}, #{person.name}, #{person.sex}, #{person.folk},
@@ -297,6 +308,7 @@
             #{person.address}, #{person.involvingConflictsDisputes}, #{person.riskLevel},
             #{person.responsibleCompanyByAssistance}, #{person.responsiblePersonByAssistance},
             #{person.responsibleCompanyByKeyPersonnel}, #{person.responsiblePersonKeyPersonnel},
+            #{person.responsibleCompany}, #{person.responsiblePerson},
             #{person.hazardAssessmentLevel}, #{person.createUser}, '1')
         </foreach>
     </insert>
@@ -333,13 +345,13 @@
                 registered_residence = #{registeredResidence},
             </if>
             <if test="cityId != null and cityId != ''">
-                `city_id` = #{cityId}
+                `city_id` = #{cityId},
             </if>
             <if test="areaId != null and areaId != ''">
-                `area_id` = #{areaId}
+                `area_id` = #{areaId},
             </if>
             <if test="streetId != null and streetId != ''">
-                `street_id` = #{streetId}
+                `street_id` = #{streetId},
             </if>
             <if test="communityId != null and communityId != ''">
                 `community_id` = #{communityId},
@@ -365,6 +377,12 @@
             <if test="responsiblePersonKeyPersonnel != null and responsiblePersonKeyPersonnel != ''">
                 responsible_person_key_personnel = #{responsiblePersonKeyPersonnel},
             </if>
+            <if test="responsibleCompany != null and responsibleCompany != ''">
+                responsible_company = #{responsibleCompany},
+            </if>
+            <if test="responsiblePerson != null and responsiblePerson != ''">
+                responsible_person = #{responsiblePerson},
+            </if>
             <if test="hazardAssessmentLevel != null and hazardAssessmentLevel != ''">
                 hazard_assessment_level = #{hazardAssessmentLevel},
             </if>