从业记录查询修改，导入接口修改，年龄查询按身份证查

Administrator

2021-08-26 e542a78c3be53518204dff0649bee46b7bb966af

从业记录查询修改，导入接口修改，年龄查询按身份证查

 src/main/java/org/springblade/common/constant/AgeUtil.java

New file
@@ -0,0 +1,44 @@
package org.springblade.common.constant;

import java.util.Calendar;

public class AgeUtil {

    /**
     * 根据身份证计算年龄
     *
     * @param idcard
     * @return
     */
    public static Integer idCardToAge(String idcard) {

        if (idcard.length() != 15 && idcard.length() != 18){
            return null;
        }

        //身份证日期截取
        Integer selectYear = Integer.valueOf(idcard.substring(6, 10));         //出生的年份
        Integer selectMonth = Integer.valueOf(idcard.substring(10, 12));       //出生的月份
        Integer selectDay = Integer.valueOf(idcard.substring(12, 14));         //出生的日期
        //当前时间
        Calendar cal = Calendar.getInstance();
        Integer yearMinus = cal.get(Calendar.YEAR) - selectYear;
        Integer monthMinus = cal.get(Calendar.MONTH) + 1 - selectMonth;
        Integer dayMinus = cal.get(Calendar.DATE) - selectDay;
        Integer age = yearMinus;
        if (yearMinus < 0) {
            age = 0;
        } else if (yearMinus == 0) {
            age = 0;
        } else if (yearMinus > 0) {
            if (monthMinus == 0) {
                if (dayMinus < 0) {
                    age = age - 1;
                }
            } else if (monthMinus > 0) {
                age = age + 1;
            }
        }
        return age;
    }
}

 src/main/java/org/springblade/modules/experience/entity/Experience.java

@@ -71,8 +71,8 @@
     */
    @ApiModelProperty(value = "入职时间")
    @TableField("entryTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date entrytime;

    /**
@@ -80,8 +80,8 @@
     */
    @ApiModelProperty(value = "离职时间")
    @TableField("departureTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date departuretime;

    /**

 src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.java

@@ -40,7 +40,7 @@
     * @param experience
     * @return
     */
    List<ExperienceVO> selectExperiencePage(IPage page, ExperienceVO experience);
    List<ExperienceVO> selectExperiencePage(IPage page, @Param("experience") ExperienceVO experience);
    List<Map<Object,String>> selectExperienceInfo(String cardid);

    /**

 src/main/java/org/springblade/modules/experience/mapper/ExperienceMapper.xml

@@ -14,11 +14,12 @@
        <result column="leaving" property="leaving"/>
        <result column="cardId" property="cardid"/>
        <result column="companyname" property="companyname"/>
        <result column="securityId" property="securityid"/>
    </resultMap>


    <select id="selectExperiencePage" resultMap="experienceResultMap">
        select * from sys_experience where is_deleted = 0
        select * from sys_experience where securityId=#{experience.securityid}
    </select>



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

@@ -422,7 +422,7 @@
        userExcel.setRegistered("江西南昌");
        userExcel.setRtime("2021-05-01");
        userExcel.setHold("是");
        userExcel.setSex("赣洪202100001");
        userExcel.setSecuritynumber("赣洪202100001");
        list.add(userExcel);
        UserExcel userExcel1 = new UserExcel();
        userExcel1.setDeptId("xxx保安公司");
@@ -439,7 +439,7 @@
        userExcel1.setRegistered("江西南昌");
        userExcel1.setRtime("2021-05-01");
        userExcel1.setHold("否");
        userExcel1.setSex("");
        userExcel1.setSecuritynumber("");
        list.add(userExcel1);
        ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
    }

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

@@ -26,6 +26,7 @@
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.cache.UserCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.enums.DictEnum;
@@ -139,7 +140,15 @@

    @Override
    public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
        return page.setRecords(baseMapper.selectUserPages(page, user));
        List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
        userVOS.forEach(userVO -> {
            if (null!=userVO.getCardid() && userVO.getCardid()!=""){
                userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
            }else {
                userVO.setAge(null);
            }
        });
        return page.setRecords(userVOS);
    }

    @Override
@@ -335,6 +344,8 @@
            }
            //设置部门id
            user.setDeptId(userDeptService.selectIn(user.getDeptId()));
            //设置账号
            user.setAccount(user.getCardid());
            //获取默认密码配置
            user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
            //新增
@@ -577,6 +588,8 @@
            }
            //设置部门id
            user.setDeptId(userDeptService.selectIn(user.getDeptId()));
            //设置账号
            user.setAccount(user.getCardid());
            //获取默认密码配置
            user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
            //新增