1. 保安员导入去除是否持证 2. 考试成绩统计查询新增查询接口 3. 新增保安员证导入接口 4. 上岗证导出修改为导出即修改制证状态

Administrator

2021-12-31 d3397094c217c642d68313ca6b9996e6a133b362

1. 保安员导入去除是否持证
2. 考试成绩统计查询新增查询接口
3. 新增保安员证导入接口
4. 上岗证导出修改为导出即修改制证状态

 src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java

@@ -273,7 +273,7 @@
    }

    /**
     * 导出保安员证信息
     * 导出保安员证信息（上岗证）
     */
    @GetMapping("export-security-paper")
    public void exportSecurityPaper(AccreditationRecordsVo accreditationRecords, HttpServletResponse response) throws IOException {

 src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java

@@ -130,6 +130,13 @@
            List<ExportSecurityPaperExcel> list = new ArrayList<>();
            //遍历
            accreditationRecordsVos.forEach(accreditationRecordsVo -> {
                //导出即修改为已制证状态
                AccreditationRecords accreditationRecords1 = new AccreditationRecords();
                accreditationRecords1.setId(accreditationRecordsVo.getId());
                accreditationRecords1.setStatus(2);
                //修改
                this.updateById(accreditationRecords1);

                ExportSecurityPaperExcel excel = new ExportSecurityPaperExcel();
                //数据转换封装
                excel.setRealName(accreditationRecordsVo.getRealName());

 src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java

@@ -25,6 +25,7 @@
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.UpdateParamVo;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
@@ -418,8 +419,8 @@
     * @param query     page,size
     */
    @GetMapping("/score-page")
    public R<IPage<ExamScoreVO>> scorePage(Query query, String deptid, String jurisdiction) {
        IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),deptid,jurisdiction);
    public R<IPage<ExamScoreVO>> scorePage(Query query,InformationVO information) {
        IPage<ExamScoreVO> pages = examScoreService.scorePage(Condition.getPage(query),information);
        return R.data(pages);
    }

@@ -464,4 +465,16 @@
    public R refreshTrainExamScore() {
        return R.status(examScoreService.refreshTrainExamScore());
    }

    /**
     * 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
     * @param
     */
    @GetMapping("/getExamStatisInfo")
    public R getExamStatisInfo(InformationVO information) {
        return R.data(examScoreService.getExamStatisInfo(information));
    }



}

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java

@@ -7,6 +7,9 @@
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.ExamSocreStatis;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;

@@ -69,7 +72,7 @@
     * @param page  分页
     * @return
     */
    List<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction);
    List<ExamScoreVO> scorePage(IPage page,@Param("information") InformationVO information);

    /**
     * 查询所有考试不合格的数据
@@ -98,4 +101,11 @@
     * @return
     */
    List<ExportExamScoreExcel> getExamScoreList(@Param("examScore") ExamScoreVO examScoreVO);

    /**
     * 查询每个培训学校的考试信息
     * @param information
     * @return
     */
    List<ExamSocreStatis> getExamStatisInfo(@Param("information") InformationVO information);
}

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml

@@ -290,30 +290,32 @@
        exam.*,
        user.jurisdiction,
        user.real_name securityName,
        ke.exam_name examName
        ke.exam_name examName,sis.enterpriseName trainingUnitName
        FROM
        exam_score exam
        LEFT JOIN blade_user user
        ON exam.user_id = user.id
        left join
        sys_information si
        on
        si.departmentid = user.dept_id
        left join
        sys_jurisdiction sj
        on
        sj.id = si.jurisdiction
        left join
        ksxt_exam ke
        on
        exam.exam_id = ke.id
        left join blade_user user on exam.user_id = user.id
        left join sys_information si on si.departmentid = user.dept_id
        left join sys_jurisdiction sj on sj.id = si.jurisdiction
        left join ksxt_exam ke on exam.exam_id = ke.id
        left join sys_training_registration str on str.id = exam.apply_id
        left join sys_information sis on sis.departmentid = str.training_unit_id
        WHERE
        1 = 1
        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
            and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
        and ke.exam_type = 2
        <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
            and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
        </if>
        <if test="deptid!=null and deptid!=''">
            AND user.dept_id = #{deptid}
        <if test="information.securityName!=null and information.securityName!=''">
            AND user.real_name like concat('%',#{information.securityName},'%')
        </if>
        <if test="information.trainingUnitName!=null and information.trainingUnitName!=''">
            AND sis.enterpriseName like concat('%',#{information.trainingUnitName},'%')
        </if>
        <if test="information.deptid!=null and information.deptid!=''">
            AND user.dept_id = #{information.deptid}
        </if>
        <if test="information.qualified!=null">
            AND exam.qualified = #{information.qualified}
        </if>
    </select>

@@ -425,5 +427,76 @@
        order by es.id desc
    </select>

    <!--导出-按条件查询成绩数据-模拟考试-->
    <select id="getExamStatisInfo" resultType="org.springblade.modules.exam.vo.ExamSocreStatis">
        select m.id name, IFNULL(b,0) hgnum,IFNULL(c,0) bhgnum from
        (
          select 1 as id union
            select 2 union
            select 3 union
            select 4 union
            select 5 union
            select 6 union
            select 7 union
            select 8 union
            select 9 union
            select 10 union
            select 11 union
            select 12
        ) m
        left join
         (
            SELECT MONTH
                ( ke.start_time ) a,
                count(*) b
            FROM
                exam_score es
                left join sys_training_registration str on str.id = es.apply_id
                left join ksxt_exam ke on ke.id = es.exam_id
                left join blade_user bu on bu.id = es.user_id
                left join blade_dept bd on bd.id = bu.dept_id
                left join sys_information si on bd.id = si.departmentid
                left join sys_jurisdiction sj on si.jurisdiction = sj.id
            WHERE
                qualified = 0
                and training_unit_id = #{information.departmentid}
                <if test="information.deptid!=null and information.deptid!=''">
                    and bu.dept_id = #{information.deptid}
                </if>
                <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
                    and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
                </if>
            GROUP BY
                MONTH ( ke.start_time )
            ) n ON m.id = n.a
            left join
         (
            SELECT MONTH
                ( ke.start_time ) a,
                count(*) c
            FROM
                exam_score es
                left join sys_training_registration str on str.id = es.apply_id
                left join ksxt_exam ke on ke.id = es.exam_id
                left join blade_user bu on bu.id = es.user_id
                left join blade_dept bd on bd.id = bu.dept_id
                left join sys_information si on bd.id = si.departmentid
                left join sys_jurisdiction sj on si.jurisdiction = sj.id
            WHERE
                qualified = 1
                and training_unit_id = #{information.departmentid}
                <if test="information.deptid!=null and information.deptid!=''">
                    and bu.dept_id = #{information.deptid}
                </if>
                <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
                    and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
                </if>
            GROUP BY
                MONTH ( ke.start_time )
            ) i ON m.id = i.a
        ORDER BY
            id
    </select>


</mapper>

 src/main/java/org/springblade/modules/exam/service/ExamScoreService.java

@@ -7,6 +7,7 @@
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.UpdateParamVo;
import org.springblade.modules.information.vo.InformationVO;

import java.util.List;
import java.util.Map;
@@ -61,7 +62,7 @@
     * @param page  分页
     * @return
     */
    IPage<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction);
    IPage<ExamScoreVO> scorePage(IPage page,InformationVO information);

    /**
     * 考试成绩及状态修改
@@ -98,4 +99,10 @@
     * @return
     */
    boolean getExamScore(ExamScoreVO examScore);

    /**
     * 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
     * @param
     */
    Object getExamStatisInfo(InformationVO information);
}

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -18,9 +18,10 @@
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.service.ExamSubjectChoicesService;
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamResultVO;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.UpdateParamVo;
import org.springblade.modules.exam.vo.*;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.information.vo.InformationVO;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
@@ -67,6 +68,11 @@

    @Autowired
    private ExamAnswerRecordService examAnswerRecordService;

    @Autowired
    private IInformationService informationService;



    /**
     * 自定义分页数据
@@ -483,8 +489,8 @@
    }

    @Override
    public IPage<ExamScoreVO> scorePage(IPage page, String deptid, String jurisdiction) {
        return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction));
    public IPage<ExamScoreVO> scorePage(IPage page, InformationVO information) {
        return page.setRecords(baseMapper.scorePage(page,information));
    }

    /**
@@ -825,4 +831,52 @@
        }
        return false;
    }

    /**
     * 考试情况统计，按月统计各个培训学校考试合格人数和不合格人数
     * @param
     */
    @Override
    public Object getExamStatisInfo(InformationVO information) {
        //获取培训学校信息
        Information information2 = new Information();
        information2.setStats("1");
        List<Information> informationList = informationService.list(Condition.getQueryWrapper(information2));
        //创建 objectList 集合
        List<Object> objectList = new ArrayList<>();
        for (Information information1 : informationList) {
            //查询各个培训学校本年每月考试情况统计,不是测试学校
            if(!information1.getId().equals(469)) {
                //合格和不合格
                ExamSocreStatisVo statisVo = new ExamSocreStatisVo();
                ExamSocreStatisVo statisVo1 = new ExamSocreStatisVo();

                information.setDepartmentid(information1.getDepartmentid());
                //统计数据查询
                List<ExamSocreStatis> examStatisInfo = baseMapper.getExamStatisInfo(information);
                //数据转换
                List<Integer> list = new ArrayList<>();
                List<Integer> list1 = new ArrayList<>();
                for (ExamSocreStatis examSocreStatis : examStatisInfo) {
                    //合格人数集合
                    list.add(examSocreStatis.getHgnum());
                    //不合格人数集合
                    list1.add(examSocreStatis.getBhgnum());
                }
                //合格
                statisVo.setName(information1.getEnterprisename());
                statisVo.setType(1);
                statisVo.setExamSocreStatis(list);
                //不合格
                statisVo1.setName(information1.getEnterprisename());
                statisVo1.setType(2);
                statisVo1.setExamSocreStatis(list1);
                //数据封装
                objectList.add(statisVo);
                objectList.add(statisVo1);
            }
        }
        //返回数据
        return objectList;
    }
}

 src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java

@@ -106,4 +106,9 @@
     */
    private String sort;

    /**
     * 培训公司名称
     */
    private String trainingUnitName;

}

 src/main/java/org/springblade/modules/exam/vo/ExamSocreStatis.java

New file
@@ -0,0 +1,13 @@
package org.springblade.modules.exam.vo;

import lombok.Data;

@Data
public class ExamSocreStatis {

    private String name;

    private Integer hgnum;

    private Integer bhgnum;
}

 src/main/java/org/springblade/modules/exam/vo/ExamSocreStatisVo.java

New file
@@ -0,0 +1,25 @@
package org.springblade.modules.exam.vo;

import lombok.Data;

import java.util.List;

@Data
public class ExamSocreStatisVo {

    /**
     * 学校名称
     */
    private String name;

    /**
     * 是否合格  1：合格  2：不合格
     */
    private Integer type;

    /**
     * 人数对应的数组
     */
    private List<Integer> examSocreStatis;

}

 src/main/java/org/springblade/modules/information/vo/InformationVO.java

@@ -62,6 +62,16 @@
     */
    private String deptid;

    /**
     * 培训公司名称
     */
    private String trainingUnitName;

    /**
     * 保安员姓名
     */
    private String securityName;

    private Integer qualified;

}

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml

@@ -45,6 +45,9 @@
        <if test="permit.jurisdiction!=null and permit.jurisdiction != '' and permit.jurisdiction!='1372091709474910209'">
            and (sj.id = #{permit.jurisdiction} or sj.parent_id = #{permit.jurisdiction})
        </if>
        <if test="permit.cardid!=null and permit.cardid != ''">
            and  si.cardid=#{permit.cardid}
        </if>
<!--        <if test="permit.usetype=='1'.toString()">-->
<!--            and si.jurisdiction in(${jurisdiction})-->
<!--        </if>-->

 src/main/java/org/springblade/modules/securitypaper/controller/SecurityPaperController.java

@@ -1,14 +1,21 @@
package org.springblade.modules.securitypaper.controller;

import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.excel.SecurityPaperExcel;
import org.springblade.modules.securitypaper.excel.SecurityPaperImporter;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.excel.SecurityExcel;
import org.springblade.modules.system.excel.SecurityImporter;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

/**
 * @author zhongrj
@@ -83,4 +90,15 @@
        return R.data(detail);
    }


    /**
     * 导入保安员证数据
     */
    @PostMapping("import-security-paper")
    public R importSecurityPaper(MultipartFile file, Integer isCovered, String deptId) {
        SecurityPaperImporter securityImporter = new SecurityPaperImporter(securityPaperService, false,deptId);
        ExcelUtil.save(file, securityImporter, SecurityPaperExcel.class);
        return R.success("操作成功");
    }

}

 src/main/java/org/springblade/modules/securitypaper/excel/SecurityPaperExcel.java

New file
@@ -0,0 +1,75 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.securitypaper.excel;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;

import java.io.Serializable;

/**
 * UserExcel
 *
 * @author Chill
 */
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class SecurityPaperExcel implements Serializable {
    private static final long serialVersionUID = 1L;

    @ExcelProperty("企业名称*")
    @ColumnWidth(30)
    private String deptId;

    @ColumnWidth(10)
    @ExcelProperty("姓名*")
    private String realName;

    @ColumnWidth(15)
    @ExcelProperty("联系电话*")
    private String phone;

    @ExcelProperty("性别*")
    @ColumnWidth(10)
    private String sex;

    @ExcelProperty("身份证号*")
    @ColumnWidth(20)
    private String cardid;

    @ExcelProperty("民族")
    @ColumnWidth(10)
    private String nation;

    @ExcelProperty("身份证住址*")
    private String registered;

    @ExcelProperty("是否持证*")
    @ColumnWidth(15)
    private String hold;

    @ExcelProperty("保安员证编码")
    @ColumnWidth(20)
    private String securitynumber;


}

 src/main/java/org/springblade/modules/securitypaper/excel/SecurityPaperImporter.java

New file
@@ -0,0 +1,43 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.securitypaper.excel;

import lombok.RequiredArgsConstructor;
import org.springblade.core.excel.support.ExcelImporter;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.excel.SecurityExcel;
import org.springblade.modules.system.service.IUserService;

import java.util.List;

/**
 * 保安员证数据数据导入类
 *
 * @author zhongrj
 */
@RequiredArgsConstructor
public class SecurityPaperImporter implements ExcelImporter<SecurityPaperExcel> {

    private final SecurityPaperService service;
    private final Boolean isCovered;
    private final String deptId;

    @Override
    public void save(List<SecurityPaperExcel> data) {
        service.importSecurityPaper(data, isCovered,deptId);
    }
}

 src/main/java/org/springblade/modules/securitypaper/service/SecurityPaperService.java

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.excel.SecurityPaperExcel;

import java.util.List;

/**
 * 保安员证管理服务类
@@ -9,4 +12,11 @@
 */
public interface SecurityPaperService extends IService<SecurityPaper> {

    /**
     * 导入保安员证数据
     * @param data
     * @param isCovered
     * @param deptId
     */
    void importSecurityPaper(List<SecurityPaperExcel> data, Boolean isCovered, String deptId);
}

 src/main/java/org/springblade/modules/securitypaper/service/impl/SecurityPaperServiceImpl.java

@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.excel.SecurityPaperExcel;
import org.springblade.modules.securitypaper.mapper.SecurityPaperMapper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

/**
 * 保安员证管理服务实现类
@@ -16,5 +20,22 @@
@Service
@AllArgsConstructor
public class SecurityPaperServiceImpl extends ServiceImpl<SecurityPaperMapper, SecurityPaper> implements SecurityPaperService {

    /**
     * 导入保安员证数据
     * @param data
     * @param isCovered
     * @param deptId
     */
    @Override
    public void importSecurityPaper(List<SecurityPaperExcel> data, Boolean isCovered, String deptId) {
        data.forEach(securityPaperExcel -> {
            SecurityPaper securityPaper = new SecurityPaper();
            securityPaper.setIdCardNo(securityPaperExcel.getCardid());
            securityPaper.setPeopleName(securityPaperExcel.getRealName());
            securityPaper.setNumber(securityPaperExcel.getSecuritynumber());
            securityPaper.setCreateTime(new Date());
            //新增
            this.save(securityPaper);
        });
    }
}

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -881,7 +881,7 @@
        securityExcel.setCardid("360XXX19XXXXXX****");
        securityExcel.setNation("汉");
        securityExcel.setRegistered("江西省南昌市******");
        securityExcel.setHold("是");
//        securityExcel.setHold("是");
        securityExcel.setSecuritynumber("赣洪202100001");
        list.add(securityExcel);

@@ -893,7 +893,7 @@
        securityExcel1.setCardid("360XXX19XXXXXX****");
        securityExcel1.setNation("汉");
        securityExcel1.setRegistered("江西省南昌市******");
        securityExcel1.setHold("否");
//        securityExcel1.setHold("否");
        securityExcel1.setSecuritynumber("");
        list.add(securityExcel1);
        String fileName = null;
@@ -926,7 +926,7 @@
        securityExcel.setCardid("360XXX19XXXXXX****");
        securityExcel.setNation("汉");
        securityExcel.setRegistered("江西省南昌市******");
        securityExcel.setHold("是");
//        securityExcel.setHold("是");
        securityExcel.setSecuritynumber("赣洪202100001");
        list.add(securityExcel);

@@ -938,7 +938,7 @@
        securityExcel1.setCardid("360XXX19XXXXXX****");
        securityExcel1.setNation("汉");
        securityExcel1.setRegistered("江西省南昌市******");
        securityExcel1.setHold("否");
//        securityExcel1.setHold("否");
        securityExcel1.setSecuritynumber("");
        list.add(securityExcel1);
        String fileName = null;

 src/main/java/org/springblade/modules/system/excel/SecurityExcel.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.system.excel;

import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -62,10 +63,6 @@

    @ExcelProperty("身份证住址*")
    private String registered;

    @ExcelProperty("是否持证*")
    @ColumnWidth(15)
    private String hold;

    @ExcelProperty("保安员证编码")
    @ColumnWidth(20)

 src/main/java/org/springblade/modules/system/excel/SecurityYyExcel.java

@@ -63,10 +63,6 @@
    @ExcelProperty("身份证住址*")
    private String registered;

    @ExcelProperty("是否持证*")
    @ColumnWidth(15)
    private String hold;

    @ExcelProperty("保安员证编码")
    @ColumnWidth(20)
    private String securitynumber;

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -870,13 +870,10 @@
                user.setStatus(1);
                user.setIsDeleted(0);
                //判断是否持证
                if (null != userExcel.getHold() && userExcel.getHold() != "") {
                    if (userExcel.getHold().equals("是")) {
                        user.setHold("1");
                    }
                    if (userExcel.getHold().equals("否")) {
                        user.setHold("2");
                    }
                if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                    user.setHold("1");
                }else {
                    user.setHold("2");
                }
                //判断年龄，超过60岁的不入
//                if (AgeUtil.idCardToAge(user.getCardid())<60) {
@@ -936,20 +933,16 @@
                    if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
                        user2.setDeptId(dept1.getId().toString());
                        //判断是否持证
                        if (null != userExcel.getHold() && userExcel.getHold() != "") {
                            if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
                                user2.setHold("1");
                                //更新保安证编号
                                user2.setSecuritynumber(user.getSecuritynumber());
                            }
                            if (userExcel.getHold().equals("否")) {
                                user2.setHold("2");
                            }
                        }
                        if (null!=userExcel.getRegistered()){
                            user2.setRegistered(userExcel.getRegistered());
                        if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                            user.setHold("1");
                        }else {
                            user2.setRegistered("");
                            user.setHold("2");
                        }
                        if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                            user2.setHold("1");
                            user2.setSecuritynumber(user.getSecuritynumber());
                        }else {
                            user2.setHold("2");
                        }
                        //更新用户数据
                        user2.setUpdateTime(new Date());
@@ -973,15 +966,11 @@
                }else {
                    //如果是一致，则更新用户数据
                    //判断是否持证
                    if (null != userExcel.getHold() && userExcel.getHold() != "") {
                        if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
                            user2.setHold("1");
                            //更新保安证编号
                            user2.setSecuritynumber(user.getSecuritynumber());
                        }
                        if (userExcel.getHold().equals("否")) {
                            user2.setHold("2");
                        }
                    if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                        user2.setHold("1");
                        user2.setSecuritynumber(user.getSecuritynumber());
                    }else {
                        user2.setHold("2");
                    }
                    if (null!=userExcel.getRegistered()){
                        user2.setRegistered(userExcel.getRegistered());
@@ -1184,13 +1173,10 @@
                user.setStatus(1);
                user.setIsDeleted(0);
                //判断是否持证
                if (null != userExcel.getHold() && userExcel.getHold() != "") {
                    if (userExcel.getHold().equals("是")) {
                        user.setHold("1");
                    }
                    if (userExcel.getHold().equals("否")) {
                        user.setHold("2");
                    }
                if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                    user.setHold("1");
                }else {
                    user.setHold("2");
                }
                //分配保安角色
                Role role = new Role();
@@ -1299,15 +1285,21 @@
                    if (dept.getId().equals(1432626178757275649L) && dept1.getParentId().equals(1432626178757275649L)){
                        user2.setDeptId(dept1.getId().toString());
                        //判断是否持证
                        if (null != userExcel.getHold() && userExcel.getHold() != "") {
                            if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
                                user2.setHold("1");
                                //更新保安证编号
                                user2.setSecuritynumber(user.getSecuritynumber());
                            }
                            if (userExcel.getHold().equals("否")) {
                                user2.setHold("2");
                            }
//                        if (null != userExcel.getHold() && userExcel.getHold() != "") {
//                            if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
//                                user2.setHold("1");
//                                //更新保安证编号
//                                user2.setSecuritynumber(user.getSecuritynumber());
//                            }
//                            if (userExcel.getHold().equals("否")) {
//                                user2.setHold("2");
//                            }
//                        }
                        if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                            user2.setHold("1");
                            user2.setSecuritynumber(user.getSecuritynumber());
                        }else {
                            user2.setHold("2");
                        }
                        if (null!=userExcel.getRegistered()){
                            user2.setRegistered(userExcel.getRegistered());
@@ -1335,15 +1327,21 @@
                }else {
                    //如果是一致，则更新用户数据
                    //判断是否持证
                    if (null != userExcel.getHold() && userExcel.getHold() != "") {
                        if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
                            user2.setHold("1");
                            //更新保安证编号
                            user2.setSecuritynumber(user.getSecuritynumber());
                        }
                        if (userExcel.getHold().equals("否")) {
                            user2.setHold("2");
                        }
//                    if (null != userExcel.getHold() && userExcel.getHold() != "") {
//                        if (userExcel.getHold().equals("是") && userExcel.getSecuritynumber()!=null && !userExcel.getSecuritynumber().equals("")) {
//                            user2.setHold("1");
//                            //更新保安证编号
//                            user2.setSecuritynumber(user.getSecuritynumber());
//                        }
//                        if (userExcel.getHold().equals("否")) {
//                            user2.setHold("2");
//                        }
//                    }
                    if (null != userExcel.getSecuritynumber() && userExcel.getSecuritynumber() != "") {
                        user2.setHold("1");
                        user2.setSecuritynumber(user.getSecuritynumber());
                    }else {
                        user2.setHold("2");
                    }
                    if (null!=userExcel.getRegistered()){
                        user2.setRegistered(userExcel.getRegistered());