Merge remote-tracking branch 'origin/master'

huangzhen

2023-09-26 7a393cea127859281a4edd08d6f75630a8d429a5

Merge remote-tracking branch 'origin/master'

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/NcStaffController.java

@@ -50,6 +50,19 @@


    /**
     * 分页查询所有数据
     *
     * @param idCardNum 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "根据身份证查询")
    @GetMapping("query/{idCardNum}")
    public AjaxResult getByIdCardNum(@PathVariable String idCardNum) {
        return success(this.ncStaffService.getByIdCardNum(idCardNum));
    }


    /**
     * 新增数据
     *
     * @param addForm 实体对象

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java

@@ -1,7 +1,5 @@
package com.gkhy.exam.noncoalmine.controller;



import com.gkhy.exam.noncoalmine.model.addForm.ViolationRegistrationAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.ViolationRegistrationModForm;
import com.gkhy.exam.noncoalmine.model.query.ViolationRegistrationQuery;
@@ -48,6 +46,7 @@
            @ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "姓名"),
            @ApiImplicitParam(name = "idCard", dataTypeClass = String.class,value = "身份证号"),
            @ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "作业类型Id"),
            @ApiImplicitParam(name = "isCm", dataTypeClass = Long.class,value = "是否为煤矿：0为非，1是"),
    })
    @GetMapping("page/list")
    public TableDataInfo listByPage(ViolationRegistrationQuery query) {

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java

@@ -50,6 +50,8 @@
            @ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "姓名"),
            @ApiImplicitParam(name = "idCard", dataTypeClass = String.class,value = "身份证号"),
            @ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "作业类型Id"),
            @ApiImplicitParam(name = "isCm", dataTypeClass = Long.class,value = "是否为煤矿：0为非，1是"),

    })
    @GetMapping("/list/page")
    public TableDataInfo listByPage(WorkRegistrationQuery query) {

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/entity/WorkRegistration.java

@@ -33,7 +33,7 @@
    //IC卡编号
    private String icNum;
    //作业时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date workTime;
    //所属单位
    private String dept;

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/ViolationRegistrationAddForm.java

@@ -33,7 +33,7 @@
    //作业时间
    @ApiModelProperty(value = "作业时间",required = true)
    @NotNull(message = "请填写做业时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date violationTime;
    //违章附件
    @ApiModelProperty(value = "违章附件")
@@ -47,7 +47,7 @@
    @NotNull(message = "请选择操作类型")
    private Long operateTypeId;
    //是否为煤矿：0为非，1是
    @ApiModelProperty(value = "是否为煤矿",required = true)
    @ApiModelProperty(value = "是否为煤矿：0为非，1是",required = true)
    @NotNull(message = "是否为煤矿不可为空")
    private Integer isCm;
    //描述

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java

@@ -35,7 +35,7 @@
    //作业时间
    @ApiModelProperty(value = "作业时间",required = true)
    @NotNull(message = "请填写做业时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date workTime;
    //所属单位
    @ApiModelProperty(value = "所属单位")

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/ViolationRegistrationQuery.java

@@ -1,5 +1,6 @@
package com.gkhy.exam.noncoalmine.model.query;

import io.swagger.models.auth.In;
import lombok.Data;

/**
@@ -14,4 +15,5 @@
    private String name;
    private String idCard;
    private Long operateTypeId;
    private Integer isCm;
}

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/query/WorkRegistrationQuery.java

@@ -16,4 +16,5 @@
    private String name;
    private String idCard;
    private Long operateTypeId;
    private Integer isCm;
}

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/ViolationRegistrationVO.java

@@ -28,7 +28,7 @@
    //IC卡编号
    private String icNum;
    //违章时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date violationTime;
    //所属单位
    private String dept;

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/vo/WorkRegistrationVO.java

@@ -25,8 +25,8 @@
    //IC卡编号
    private String icNum;
    //作业时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date violationTime;
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date workTime;
    //所属单位
    private String dept;
    //操作类型id

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/NcStaffService.java

@@ -26,5 +26,7 @@
    NcStaff getByIdCard(String IdCard);

    void delBatch(List<Long> staffIds);

    NcStaffVO getByIdCardNum(String idCardNum);
}


 exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/NcStaffServiceImpl.java

@@ -69,7 +69,33 @@
        }
        return staffVOList;
    }
    @Override
    public NcStaffVO getByIdCardNum(String idCardNum) {
        NcStaff ncStaff = ncStaffMapper.selectOne(new LambdaQueryWrapper<NcStaff>()
                .eq(NcStaff::getDelFlag, (byte) 0)
                .eq(NcStaff::getIdCardNum, idCardNum));
        NcStaffVO ncStaffVO = new NcStaffVO();
        if(ncStaff != null){
            BeanUtils.copyProperties(ncStaff,ncStaffVO);
            List<NcStaffResume> resumeList = ncStaffResumeService.getByStaffId(ncStaff.getId());
            List<NcStaffTrain> trainList = ncStaffTrainService.getByStaffId(ncStaff.getId());
            List<NcExaminees> examineesList = ncExamineesService.getByIdCard(ncStaff.getIdCardNum());
            List<ViolationRegistrationVO> violationList = violationRegistrationService.getByIdCard(ncStaff.getIdCardNum(), (byte) 0);
            List<WorkRegistrationVO> workList = workRegistrationService.getByIdCard(ncStaff.getIdCardNum(), (byte) 0);
            List<NcCert> certList = ncCertService.getByIdCard(ncStaff.getIdCardNum());
            ncStaffVO.setResumeList(resumeList);
            ncStaffVO.setTrainList(trainList);
            ncStaffVO.setExamineeList(examineesList);
            ncStaffVO.setViolationList(violationList);
            ncStaffVO.setWorkList(workList);
            ncStaffVO.setCertList(certList);
            ncStaffVO.setCertCount(certList.size());
            ncStaffVO.setViolationCount(violationList.size());
            ncStaffVO.setWorkCount(workList.size());
        }
        return ncStaffVO;

    }
    /**
     * 新增
     * @param addForm
@@ -145,6 +171,8 @@
        this.update(updateWrapper);
    }



    //修改履历
    public void updateBatchResume(List<NcStaffResumeAddForm> resumeFormList,NcStaff ncStaff){
        if(!CollectionUtils.isEmpty(resumeFormList)){

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/ViolationRegistrationServiceImpl.java

@@ -12,6 +12,7 @@
import com.gkhy.exam.noncoalmine.model.vo.ViolationRegistrationVO;
import com.gkhy.exam.noncoalmine.model.vo.WorkRegistrationVO;
import com.gkhy.exam.noncoalmine.service.ViolationRegistrationService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.file.entity.AttachmentInfo;
import com.ruoyi.file.mapper.AttachmentInfoMapper;
@@ -91,9 +92,9 @@
     */
    public List<ViolationRegistrationVO> getByIdCard(String idCard,byte isCm){
        List<ViolationRegistration> violationRegistrations = baseMapper.selectList(new LambdaQueryWrapper<ViolationRegistration>()
                .eq(ViolationRegistration::getDelFlag, 0)
                .eq(ViolationRegistration::getDelFlag, (byte)0)
                .eq(ViolationRegistration::getIdCard, idCard)
                .eq(idCard != null,ViolationRegistration::getIsCm,isCm));
                .eq(ViolationRegistration::getIsCm,isCm));
        List<ViolationRegistrationVO> list = violationRegistrations.stream().map(registration -> {
            ViolationRegistrationVO violationRegistrationVO = new ViolationRegistrationVO();
            BeanUtils.copyProperties(registration, violationRegistrationVO);
@@ -123,6 +124,9 @@
     * @return
     */
    private String getAttachmentUrl(String keys){
        if(StringUtils.isEmpty(keys)){
            return null;
        }
        String[] arry = keys.split(",");
        StringBuffer paths = new StringBuffer();
        List<AttachmentInfo> attachmentList = attachmentInfoService.findByKeys(Arrays.asList(arry));

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/service/impl/WorkRegistrationServiceImpl.java

@@ -77,9 +77,9 @@
     */
    public List<WorkRegistrationVO> getByIdCard(String idCard, byte isCm){
        List<WorkRegistration> workRegistrations = baseMapper.selectList(new LambdaQueryWrapper<WorkRegistration>()
                .eq(WorkRegistration::getDelFlag, 0)
                .eq(WorkRegistration::getDelFlag, (byte)0)
                .eq(WorkRegistration::getIdCard, idCard)
                .eq(idCard != null,WorkRegistration::getIsCm,isCm));
                .eq(WorkRegistration::getIsCm,isCm));
        List<WorkRegistrationVO> list = workRegistrations.stream().map(workRegistration -> {
            WorkRegistrationVO workRegistrationVO = new WorkRegistrationVO();
            BeanUtils.copyProperties(workRegistration, workRegistrationVO);

 exam-system/src/main/resources/mapper/noncoalmine/ViolationRegistrationMapper.xml

@@ -32,9 +32,12 @@
        <if test="query.idCard != null and query.idCard != ''">
            and id_card like concat('%', #{query.idCard}, '%')
        </if>
        <if test="query.operateTypeId != null and query.operateTypeId != 0">
        <if test="query.operateTypeId != null">
            and (operate_type_id = #{query.operateTypeId} OR operate_type_id IN ( SELECT t.id FROM sys_operate_type t WHERE find_in_set(#{query.operateTypeId}, ancestors)))
        </if>
        <if test="query.isCm != null">
            and is_cm = #{query.isCm}
        </if>
        order by create_time desc

    </select>

 exam-system/src/main/resources/mapper/noncoalmine/WorkRegistrationMapper.xml

@@ -31,9 +31,12 @@
        <if test="query.idCard != null and query.idCard != ''">
            and id_card like concat('%', #{query.idCard}, '%')
        </if>
        <if test="query.operateTypeId != null and query.operateTypeId != 0">
        <if test="query.operateTypeId != null">
            and (operate_type_id = #{query.operateTypeId} OR operate_type_id IN ( SELECT t.id FROM sys_operate_type t WHERE find_in_set(#{query.operateTypeId}, ancestors)))
        </if>
        <if test="query.isCm != null">
            and is_cm = #{query.isCm}
        </if>
        order by create_time desc
    </select>