Merge branch 'develop'

zenglf

2023-10-31 729d1f77dee77833879d82149d1731802b981733

Merge branch 'develop'

 lxzn-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java

@@ -39,6 +39,31 @@
        }
    }

    public static Result<?> imporReturnOperationCertificate(int totalLines,int partSuccessLines,int errorLines,int successLines,List<String> errorMessage) throws IOException {
        if (errorLines == 0 && partSuccessLines == 0) {
            return Result.ok("共" + successLines + "行数据全部导入成功！");
        } else {
            JSONObject result = new JSONObject(5);
            int totalCount = successLines + errorLines;
            int fullSuccessLines = successLines - partSuccessLines;
            result.put("totalCount", totalCount);
            result.put("errorCount", errorLines);
            result.put("fullSuccessLines", fullSuccessLines);
            result.put("totalLines",totalLines);
            result.put("partSuccessLines",partSuccessLines);
            result.put("msg", "总上传行数：" + totalLines + "，完全导入成功行数：" + fullSuccessLines + "，部分导入成功行数："+partSuccessLines+"，导入失败行数：" + errorLines);
            String fileUrl = PmsUtil.saveErrorTxtByList(errorMessage, "userImportExcelErrorLog");
            int lastIndex = fileUrl.lastIndexOf(File.separator);
            String fileName = fileUrl.substring(lastIndex + 1);
            result.put("fileUrl", "/sys/common/static/" + fileUrl);
            result.put("fileName", fileName);
            Result res = Result.ok(result);
            res.setCode(201);
            res.setMessage("文件导入成功，但有错误。");
            return res;
        }
    }

    public static List<String> importDateSave(List<?> list, Class serviceClass, List<String> errorMessage, String errorFlag)  {
        IService bean =(IService) SpringContextUtils.getBean(serviceClass);
        for (int i = 0; i < list.size(); i++) {

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java

@@ -3,6 +3,7 @@
import java.io.UnsupportedEncodingException;
import java.io.IOException;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -10,9 +11,20 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.OperationCertificateApplyDetail;
import org.jeecg.modules.eam.service.IdentityService;
import org.jeecg.common.util.ImportExcelUtil;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.OperationCertificateImportVo;
import org.jeecg.modules.system.entity.SysDict;
import org.jeecg.modules.system.entity.SysDictItem;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDictItemService;
import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.service.SysIdentityService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -24,11 +36,7 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.OperationCertificateDetail;
import org.jeecg.modules.eam.entity.OperationCertificate;
import org.jeecg.modules.eam.vo.OperationCertificatePage;
import org.jeecg.modules.eam.service.IOperationCertificateService;
import org.jeecg.modules.eam.service.IOperationCertificateDetailService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -62,6 +70,16 @@

     @Autowired
     private IdentityService identityService;
     @Autowired
     private ISysUserService userService;
     @Autowired
     private IEamEquipmentService equipmentService;
     @Autowired
     private IProfessionService professionService;
     @Autowired
     private ISysDictService sysDictService;
     @Autowired
     private ISysDictItemService sysDictItemService;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -259,37 +277,121 @@
    */
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_operation_certificate:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
          // èŽ·å–上传文件对象
          MultipartFile file = entity.getValue();
          ImportParams params = new ImportParams();
          params.setTitleRows(2);
          params.setHeadRows(1);
          params.setNeedSave(true);
          try {
              List<OperationCertificatePage> list = ExcelImportUtil.importExcel(file.getInputStream(), OperationCertificatePage.class, params);
              for (OperationCertificatePage page : list) {
                  OperationCertificate po = new OperationCertificate();
                  BeanUtils.copyProperties(page, po);
                  operationCertificateService.saveMain(po, page.getOperationCertificateDetailList());
              }
              return Result.OK("文件导入成功！数据行数:" + list.size());
          } catch (Exception e) {
              log.error(e.getMessage(),e);
              return Result.error("文件导入失败:"+e.getMessage());
          } finally {
              try {
                  file.getInputStream().close();
              } catch (IOException e) {
                  e.printStackTrace();
              }
          }
      }
      return Result.OK("文件导入失败！");
    }
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException  {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // é”™è¯¯ä¿¡æ¯
        List<String> errorMessage = new ArrayList<>();
        int successLines = 0, errorLines = 0,totalLines = 0,partSuccessLines = 0;
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            // èŽ·å–上传文件对象
            MultipartFile file = entity.getValue();
            ImportParams params = new ImportParams();
            params.setNeedSave(true);
            try {
                    List<OperationCertificateImportVo> list = ExcelImportUtil.importExcel(file.getInputStream(), OperationCertificateImportVo.class, params);
                    totalLines = list.size();
                    for (int i = 0; i < list.size(); i++) {
                    OperationCertificateImportVo operationCertificateImportVo = list.get(i);
                    OperationCertificate operationCertificate = new OperationCertificate();
                    operationCertificate.setNum(identityService.getNumByTypeAndLength("OperationCertificate",4));
                    //根据人员姓名查询人员id
                    List<SysUser> userList = userService.lambdaQuery().eq(SysUser::getRealname,operationCertificateImportVo.getName().trim())
                            .eq(SysUser::getWorkNo,operationCertificateImportVo.getWorkNo().trim()).eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0).list();
                    if(CollectionUtils.isEmpty(userList)){
                        errorMessage.add("第" + (i + 1) + "行导入失败,原因:人员不存在或工作证号与人员姓名不匹配,请先维护人员信息;");
                        errorLines++;
                        continue;
                    }else{
                        operationCertificate.setUserId(userList.get(0).getUsername());
                    }
                    //工种查询
                    Profession profession = professionService.lambdaQuery().eq(Profession::getName,operationCertificateImportVo.getProfession().trim()).eq(Profession::getDelFlag,CommonConstant.DEL_FLAG_0).one();
                    if(profession == null){
                        Profession profession1 = new Profession();
                        profession1.setNum(identityService.getNumByTypeAndLength("Profession",4));
                        profession1.setName(operationCertificateImportVo.getProfession().trim());
                        professionService.save(profession1);
                        operationCertificate.setProfession(profession1.getId());
                    }else {
                        operationCertificate.setProfession(profession.getId());
                    }
                    //技能等级判断
                    if(CollectionUtils.isEmpty(sysDictItemService.lambdaQuery().eq(SysDictItem::getDictId,sysDictService.lambdaQuery().eq(SysDict::getDictCode,"technical_level").one().getId()).eq(SysDictItem::getItemText,operationCertificateImportVo.getTechnicalLevel().trim()).list())){
                        errorMessage.add("第" + (i + 1) + "行导入失败,原因:技能等级不存在,请先维护技能等级;");
                        errorLines++;
                        continue;
                    }else{
                        operationCertificate.setTechnicalLevel(sysDictItemService.lambdaQuery().eq(SysDictItem::getDictId,sysDictService.lambdaQuery().eq(SysDict::getDictCode,"technical_level").one().getId()).eq(SysDictItem::getItemText,operationCertificateImportVo.getTechnicalLevel().trim()).one().getItemValue());
                    }
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                    operationCertificate.setIssueDate(operationCertificateImportVo.getIssueDate());
                    operationCertificate.setStartTime(operationCertificateImportVo.getIssueDate());
                    Date currentDate = operationCertificateImportVo.getIssueDate();
                    Calendar c = Calendar.getInstance();
                    c.setTime(currentDate);
                    c.add(Calendar.YEAR, 1);
                    currentDate = c.getTime();
                    operationCertificate.setEndTime(currentDate);
                    operationCertificate.setCurrentCycleScore(12);
                    operationCertificate.setRemark(operationCertificateImportVo.getRemark());
                    List<String> equipments  = Arrays.asList(operationCertificateImportVo.getEquipmentNum().split("/"));
                    List<String> equipmentIds = new ArrayList<>();
                    int a = 0;
                    for(int j = 0; j<equipments.size();j++){
                        List<Equipment> equipmentList = equipmentService.lambdaQuery().eq(Equipment::getNum,equipments.get(j)).eq(Equipment::getDelFlag,CommonConstant.DEL_FLAG_0).list();
                        if(CollectionUtils.isNotEmpty(equipmentList)){
                            equipmentIds.add(equipmentList.get(0).getId());
                        }else {
                            errorMessage.add("第" + (i + 1) + "行统一编号为"+equipments.get(j)+"的设备导入失败,原因:设备台账中不存在该设备,请先维护设备信息;");
                            a++;
                            continue;
                        }
                    }
                    if(a == equipments.size()){
                        errorLines++;
                        a = 0;
                        continue;
                    }else if(a > 0 && a < equipments.size()){
                        partSuccessLines++;
                        a = 0;
                    }
                    if(CollectionUtils.isEmpty(equipmentIds)){
                        errorMessage.add("第" + (i + 1) + "行导入失败,原因:设备不存在,请先维护设备信息;");
                        errorLines++;
                        continue;
                    }else{
                        operationCertificate.setEquipmentIds(equipmentIds.stream().map(String::toString).collect(Collectors.joining(",")));
                    }
                    operationCertificate.setStatus("1");
                    //查询当前人员是否已有操作证
                    List<OperationCertificate> operationCertificateList = operationCertificateService.lambdaQuery().eq(OperationCertificate::getUserId,userList.get(0).getUsername()).eq(OperationCertificate::getDelFlag,CommonConstant.DEL_FLAG_0).list();
                    if(CollectionUtils.isEmpty(operationCertificateList)){
                        operationCertificateService.save(operationCertificate);
                    }else {
                        //将设备增加到操作证
                        String newEquipmentIds = operationCertificateList.get(0).getEquipmentIds().concat(",").concat(operationCertificate.getEquipmentIds());
                        operationCertificate.setId(operationCertificateList.get(0).getId());
                        HashSet<String> set = new HashSet<String>(Arrays.asList(newEquipmentIds.split(",")));
                        operationCertificate.setEquipmentIds(set.stream().collect(Collectors.joining(",")));
                        operationCertificateService.updateById(operationCertificate);
                    }
                    successLines++;
                }
            } catch (Exception e) {
                errorMessage.add("发生异常：" + e.getMessage());
                log.error(e.getMessage(), e);
                return (Result<?>) errorMessage;
            } finally {
                try {
                    file.getInputStream().close();
                } catch (IOException e) {
                    log.error(e.getMessage(), e);
                }
            }
        }
        return ImportExcelUtil.imporReturnOperationCertificate(totalLines,partSuccessLines,errorLines, successLines, errorMessage);
    }
     /**
      * é€šè¿‡ä¸»è¡¨ID查询
      * @return

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/ProfessionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,177 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.Profession;
import org.jeecg.modules.eam.service.IProfessionService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;

 /**
 * @Description: mom_eam_profession
 * @Author: jeecg-boot
 * @Date:   2023-10-30
 * @Version: V1.0
 */
@Api(tags="mom_eam_profession")
@RestController
@RequestMapping("/eam/profession")
@Slf4j
public class ProfessionController extends JeecgController<Profession, IProfessionService> {
    @Autowired
    private IProfessionService professionService;
	
    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param profession
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_eam_profession-分页列表查询")
    @ApiOperation(value="mom_eam_profession-分页列表查询", notes="mom_eam_profession-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<Profession>> queryPageList(Profession profession,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<Profession> queryWrapper = QueryGenerator.initQueryWrapper(profession, req.getParameterMap());
        Page<Profession> page = new Page<Profession>(pageNo, pageSize);
        IPage<Profession> pageList = professionService.page(page, queryWrapper);
        return Result.OK(pageList);
    }
	
    /**
     *   æ·»åŠ 
     *
     * @param profession
     * @return
     */
    @AutoLog(value = "mom_eam_profession-添加")
    @ApiOperation(value="mom_eam_profession-添加", notes="mom_eam_profession-添加")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_profession:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody Profession profession) {
        professionService.save(profession);
        return Result.OK("添加成功！");
    }
	
    /**
     *  ç¼–辑
     *
     * @param profession
     * @return
     */
    @AutoLog(value = "mom_eam_profession-编辑")
    @ApiOperation(value="mom_eam_profession-编辑", notes="mom_eam_profession-编辑")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_profession:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody Profession profession) {
        professionService.updateById(profession);
        return Result.OK("编辑成功!");
    }
	
    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "mom_eam_profession-通过id删除")
    @ApiOperation(value="mom_eam_profession-通过id删除", notes="mom_eam_profession-通过id删除")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_profession:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        professionService.removeById(id);
        return Result.OK("删除成功!");
    }
	
    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "mom_eam_profession-批量删除")
    @ApiOperation(value="mom_eam_profession-批量删除", notes="mom_eam_profession-批量删除")
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_profession:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.professionService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }
	
    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "mom_eam_profession-通过id查询")
    @ApiOperation(value="mom_eam_profession-通过id查询", notes="mom_eam_profession-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<Profession> queryById(@RequestParam(name="id",required=true) String id) {
        Profession profession = professionService.getById(id);
        if(profession==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(profession);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param profession
    */
    //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_profession:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, Profession profession) {
        return super.exportXls(request, profession, Profession.class, "mom_eam_profession");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("mom_eam_profession:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, Profession.class);
    }

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java

@@ -109,4 +109,14 @@
    @Excel(name = "属性字段5", width = 15)
    @ApiModelProperty(value = "属性字段5")
    private String uda5;

    /**工种*/
    @Excel(name = "工种", width = 15)
    @ApiModelProperty(value = "工种")
    private String profession;

    /**技能等级*/
    @Excel(name = "技能等级", width = 15)
    @ApiModelProperty(value = "技能等级")
    private String technicalLevel;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Profession.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,101 @@
package org.jeecg.modules.eam.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * @Description: mom_eam_profession
 * @Author: jeecg-boot
 * @Date:   2023-10-30
 * @Version: V1.0
 */
@Data
@TableName("mom_eam_profession")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_profession对象", description="mom_eam_profession")
public class Profession implements Serializable {
    private static final long serialVersionUID = 1L;

    /**id*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "id")
    private String id;
    /**num*/
    @Excel(name = "num", width = 15)
    @ApiModelProperty(value = "num")
    private String num;
    /**name*/
    @Excel(name = "name", width = 15)
    @ApiModelProperty(value = "name")
    private String name;
    /**remark*/
    @Excel(name = "remark", width = 15)
    @ApiModelProperty(value = "remark")
    private String remark;
    /**createBy*/
    @ApiModelProperty(value = "createBy")
    private String createBy;
    /**createTime*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "createTime")
    private Date createTime;
    /**updateBy*/
    @ApiModelProperty(value = "updateBy")
    private String updateBy;
    /**updateTime*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "updateTime")
    private Date updateTime;
    /**tenantId*/
    @Excel(name = "tenantId", width = 15)
    @ApiModelProperty(value = "tenantId")
    private String tenantId;
    /**delFlag*/
    @Excel(name = "delFlag", width = 15)
    @ApiModelProperty(value = "delFlag")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**status*/
    @Excel(name = "status", width = 15)
    @ApiModelProperty(value = "status")
    private String status;
    /**uda1*/
    @Excel(name = "uda1", width = 15)
    @ApiModelProperty(value = "uda1")
    private String uda1;
    /**uda2*/
    @Excel(name = "uda2", width = 15)
    @ApiModelProperty(value = "uda2")
    private String uda2;
    /**uda3*/
    @Excel(name = "uda3", width = 15)
    @ApiModelProperty(value = "uda3")
    private String uda3;
    /**uda4*/
    @Excel(name = "uda4", width = 15)
    @ApiModelProperty(value = "uda4")
    private String uda4;
    /**uda5*/
    @Excel(name = "uda5", width = 15)
    @ApiModelProperty(value = "uda5")
    private String uda5;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/ProfessionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.eam.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.Profession;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: mom_eam_profession
 * @Author: jeecg-boot
 * @Date:   2023-10-30
 * @Version: V1.0
 */
public interface ProfessionMapper extends BaseMapper<Profession> {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/ProfessionMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.ProfessionMapper">

</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IProfessionService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.eam.service;

import org.jeecg.modules.eam.entity.Profession;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @Description: mom_eam_profession
 * @Author: jeecg-boot
 * @Date:   2023-10-30
 * @Version: V1.0
 */
public interface IProfessionService extends IService<Profession> {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/ProfessionServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.eam.service.impl;

import org.jeecg.modules.eam.entity.Profession;
import org.jeecg.modules.eam.mapper.ProfessionMapper;
import org.jeecg.modules.eam.service.IProfessionService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

/**
 * @Description: mom_eam_profession
 * @Author: jeecg-boot
 * @Date:   2023-10-30
 * @Version: V1.0
 */
@Service
public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profession> implements IProfessionService {

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/OperationCertificateImportVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
package org.jeecg.modules.eam.vo;

import lombok.Data;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.math.BigDecimal;
import java.util.Date;


@Data
@Accessors(chain = true)
public class OperationCertificateImportVo {

    @Excel(name= "姓名")
    private String name;

    @Excel(name="性别")
    private String sex;

    @Excel(name = "工种")
    private String profession;

    @Excel(name = "技能等级")
    private String technicalLevel;

    @Excel(name = "工作证号")
    private String workNo;

    @Excel(name = "上岗证号")
    private String appointmentCardNum;

    @Excel(name = "统一编号")
    private String equipmentNum;

    @Excel(name = "设备名称")
    private String equipmentName;

    @Excel(name = "设备型号")
    private String equipmentModel;

    @Excel(name = "发证日期")
    private Date issueDate;

    @Excel(name = "备注")
    private String remark;

}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -197,4 +197,6 @@
    private String homePath;
    @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
    private String teamId;


}