fix(bug修复): 用户部门显示allDeptName

luoyb

2021-05-12 bfd4ded5aaf7fcead591435d504bea9105d2fd2e

fix(bug修复): 用户部门显示allDeptName

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java

@@ -11,57 +11,56 @@
import java.util.Date;

/**
*
* name:Position
* package:cc.mrbird.febs.server.system.controller
* description:岗位信息数据表映射实体
*
* @author Alan
* @date 2021-02-16 11:52:53
* @since JDK1.8
*/
 * name:Position
 * package:cc.mrbird.febs.server.system.controller
 * description:岗位信息数据表映射实体
 *
 * @author Alan
 * @date 2021-02-16 11:52:53
 * @since JDK1.8
 */
@Data
@TableName("t_position")
public class Position implements Serializable{
public class Position implements Serializable {

            @FieldInfo(name = "positionId",type = "varchar",explain = "岗位Id")
            @TableId(value = "positionId")
            private Long positionId=0L;
    @FieldInfo(name = "positionId", type = "varchar", explain = "岗位Id")
    @TableId(value = "positionId")
    private Long positionId = 0L;

            @FieldInfo(name = "positionName",type = "varchar",explain = "岗位名称")
            @TableField("positionName")
            private String positionName="";
    @FieldInfo(name = "positionName", type = "varchar", explain = "岗位名称")
    @TableField("positionName")
    private String positionName = "";

            @FieldInfo(name = "positionCode",type = "varchar",explain = "岗位编码")
            @TableField("positionCode")
            private String positionCode="";
    @FieldInfo(name = "positionCode", type = "varchar", explain = "岗位编码")
    @TableField("positionCode")
    private String positionCode = "";

            @FieldInfo(name = "customerId",type = "bigint",explain = "租户Id")
            @TableField("customerId")
            private Long customerId=0L;
    @FieldInfo(name = "customerId", type = "bigint", explain = "租户Id")
    @TableField("customerId")
    private Long customerId = 0L;

            @FieldInfo(name = "createTime",type = "datetime",explain = "记录创建时间")
            @TableField("createTime")
            private Date createTime;
    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    private Date createTime;

            @FieldInfo(name = "creator",type = "varchar",explain = "记录创建人")
            @TableField("creator")
            private String creator="";
    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
    @TableField("creator")
    private String creator = "";

            @FieldInfo(name = "modifyTime",type = "datetime",explain = "记录最后更新时间")
            @TableField("modifyTime")
            private Date modifyTime;
    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
    @TableField("modifyTime")
    private Date modifyTime;

            @FieldInfo(name = "modifier",type = "varchar",explain = "记录最后更新人")
            @TableField("modifier")
            private String modifier="";
    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
    @TableField("modifier")
    private String modifier = "";

            @FieldInfo(name = "delFlag",type = "bit",explain = "记录删除标志。0-未删除 1-已删除，默认0")
            @TableField("delFlag")
            private Integer delFlag=0;
    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
    @TableField("delFlag")
    private Integer delFlag = 0;

            @TableField("version")
            @Version
            private Integer version=0;
    @TableField("version")
    @Version
    private Integer version = 0;

}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/FebsServerHrApplication.java

@@ -8,6 +8,8 @@
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.EnableTransactionManagement;

/**
@@ -19,6 +21,7 @@
@EnableTransactionManagement
@EnableDistributedTransaction
@MapperScan("cc.mrbird.febs.server.hr.mapper")
@EnableScheduling
public class FebsServerHrApplication {

    public static void main(String[] args) {

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java

@@ -53,7 +53,11 @@
    @TableField(exist = false)
    @ExcelField(value = "部门(护卫点)")
    private String allDeptName = "";
    

    // @FieldInfo(name = "deptName", type = "bit", explain = "部门(护卫点)")
    @TableField(exist = false)
    private String deptName = "";

    @TableField(exist = false)
    @ExcelField(value = "岗位")
    private String newJobName= "";

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java

@@ -207,7 +207,12 @@
    @SqlParser(filter=true)
    IPage<EmpBaseInfo> clbaseInfoList(@Param("page")Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("manOld") String manOld,@Param("womanOld") String womanOld,@Param("list") List<String> lists);


    @Update("<script> " +
            " UPDATE t_emp_baseinfo SET seniority = CONCAT(FLOOR(TimeStampDiff(MONTH, entryDate, NOW()) / 12), '年',MOD(TimeStampDiff(MONTH, entryDate, NOW()),12),'月'),\n" +
            " modifyTime = NOW() \n" +
            " WHERE empStatus =0; \n" +
            "</script>")
    int updateSeniority();


}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/IEmpBaseInfoService.java

@@ -202,4 +202,6 @@
    boolean verifyCertificateNumb(EmpBaseInfo empBaseInfo);

    List<EmpBaseInfo> listAll(QueryWrapper<EmpBaseInfo> wrapper);

    boolean updateSeniority();
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccidentCasesServiceImpl.java

@@ -77,7 +77,7 @@
            queryWrapper.like("a.CertificateNumb", empAccidentcases.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getDeptName())) {
            queryWrapper.like("a.DeptName", empAccidentcases.getDeptName());
            queryWrapper.like("b.allDeptName", empAccidentcases.getDeptName());
        }
        if (StringUtils.isNotBlank(empAccidentcases.getInjuredTimeStr())) {
            queryWrapper.between("a.InjuredTime", empAccidentcases.getInjuredTimeStr().split(",")[0],

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java

@@ -71,7 +71,7 @@
            queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
            queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
            queryWrapper.like("b.allDeptName", empBadrecord.getDeptName());
        }
        if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
            queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java

@@ -1379,4 +1379,9 @@
        }
        return tempName;
    }

    @Override
    public boolean updateSeniority() {
        return empBaseInfoMapper.updateSeniority()>0;
    }
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java

@@ -74,7 +74,7 @@
            queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empContractinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
            queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
@@ -82,9 +82,9 @@
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
            queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        }
        // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
        //     queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        // }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
        }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java

@@ -70,7 +70,7 @@
            queryWrapper.like("a.CertificateNumb", empDimissionattend.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
            queryWrapper.like("a.DeptName", empDimissionattend.getDeptName());
            queryWrapper.like("b.allDeptName", empDimissionattend.getDeptName());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
            queryWrapper.like("a.AttendYear", empDimissionattend.getAttendYear());

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java

@@ -64,6 +64,9 @@
        if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
        }
        if (StringUtils.isNotBlank(empDimissionlog.getAllDeptName())) {
            queryWrapper.like("c.allDeptName", empDimissionlog.getDeptName());
        }
        Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java

@@ -72,7 +72,7 @@
            queryWrapper.like("a.CertificateNumb", empInsurance.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empInsurance.getDeptName())) {
            queryWrapper.like("a.DeptName", empInsurance.getDeptName());
            queryWrapper.like("b.allDeptName", empInsurance.getDeptName());
        }
        if (StringUtils.isNotBlank(empInsurance.getApplayDateStr())) {
            queryWrapper.between("a.ApplayDate", empInsurance.getApplayDateStr().split(",")[0],

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java

@@ -65,7 +65,7 @@
            queryWrapper.like("b.certificateNumb", empJobchange.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empJobchange.getDeptName())) {
            queryWrapper.like("a.newDeptName", empJobchange.getDeptName());
            queryWrapper.like("c.allDeptName", empJobchange.getDeptName());
        }
        if (StringUtils.isNotBlank(empJobchange.getChangeDateStr())) {
            queryWrapper.between("a.changeDate", empJobchange.getChangeDateStr().split(",")[0],  empJobchange.getChangeDateStr().split(",")[1]);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java

@@ -73,7 +73,7 @@
            queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
            queryWrapper.like("a.DeptName", empLabortrouble.getDeptName());
            queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
        }
        if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
            queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java

@@ -76,7 +76,7 @@
            queryWrapper.like("a.CertificateNumb", empLeaveinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java

@@ -79,7 +79,7 @@
            queryWrapper.like("a.CertificateNumb", empOccupational.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empOccupational.getDeptName())) {
            queryWrapper.like("a.DeptName", empOccupational.getDeptName());
            queryWrapper.like("b.allDeptName", empOccupational.getDeptName());
        }
        if (StringUtils.isNotBlank(empOccupational.getInjuredTimeStr())) {
            queryWrapper.between("a.InjuredTime", empOccupational.getInjuredTimeStr().split(",")[0],

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpPhysicalExamServiceImpl.java

@@ -75,7 +75,7 @@
            queryWrapper.like("a.CertificateNumb", empPhysicalexam.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getDeptName())) {
            queryWrapper.like("a.DeptName", empPhysicalexam.getDeptName());
            queryWrapper.like("b.allDeptName", empPhysicalexam.getDeptName());
        }
        if (StringUtils.isNotBlank(empPhysicalexam.getPhysicalExamDateStr())) {
            queryWrapper.between("a.PhysicalExamDate", empPhysicalexam.getPhysicalExamDateStr().split(",")[0], empPhysicalexam.getPhysicalExamDateStr().split(",")[1]);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java

@@ -73,7 +73,7 @@
            queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empResign.getDeptName())) {
            queryWrapper.like("a.DeptName", empResign.getDeptName());
            queryWrapper.like("b.allDeptName", empResign.getDeptName());
        }
        if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
            queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0],  empResign.getApplayDateStr().split(",")[1]);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java

@@ -75,7 +75,7 @@
            queryWrapper.like("a.CertificateNumb", empUnemployment.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empUnemployment.getDeptName())) {
            queryWrapper.like("a.DeptName", empUnemployment.getDeptName());
            queryWrapper.like("b.allDeptName", empUnemployment.getDeptName());
        }
        if (StringUtils.isNotBlank(empUnemployment.getApplayDateStr())) {
            queryWrapper.between("a.ApplayDate", empUnemployment.getApplayDateStr().split(",")[0],  empUnemployment.getApplayDateStr().split(",")[1]);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java

New file
@@ -0,0 +1,45 @@
package cc.mrbird.febs.server.hr.task;

import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.CommandLineRunner;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * name: ScheduledTask
 * package: cc.mrbird.febs.server.hr.task
 * description: 定时任务
 * date: 2021-04-27 20:38
 *
 * @author luoyibo
 * @version 0.1
 * @since JDK 1.8
 */
@Slf4j
@Component
public class ScheduledTask implements CommandLineRunner {
    @Resource
    IEmpBaseInfoService empBaseInfoService;

    /**
     *
     * 每天凌晨1点计算一次工龄
     *
     * date 2021-04-27 20:44
     * @author: luoyibo
     * @return void
     */
    @Scheduled(cron = "0 0 1 * * ?")
    public void calculateSeniority(){
        log.info("每天凌晨1点计算一次工龄");
        empBaseInfoService.updateSeniority();
    }
    @Override
    public void run(String... args) throws Exception {
        calculateSeniority();
    }
}