-修改苯乙烯等

master/src/main/java/com/ruoyi/project/training/controller/TByxWorkcertificateController.java

@@ -0,0 +1,293 @@
+package com.ruoyi.project.training.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.service.ISysDeptService;
+import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.training.domain.TByxWorkcertificate;
+import com.ruoyi.project.training.mapper.TByxWorkcertificateMapper;
+import com.ruoyi.project.training.service.ITByxWorkcertificateService;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 作业证书一览Controller
+ *
+ * @author ruoyi
+ * @date 2020-12-01
+ */
+@RestController
+@RequestMapping("/training/byxWorkcertificate")
+public class TByxWorkcertificateController extends BaseController
+{
+    @Autowired
+    private ITByxWorkcertificateService tByxWorkcertificateService;
+
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
+    @Resource
+    private TByxWorkcertificateMapper tByxWorkcertificateMapper;
+    /**
+     * 查询作业证书一览列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TByxWorkcertificate tByxWorkcertificate)
+    {
+        startPage();
+        logger.info("tByxWorkcertificate:" + tByxWorkcertificate);
+        List<TByxWorkcertificate> list = tByxWorkcertificateService.selectTByxWorkcertificateList(tByxWorkcertificate);
+        return getDataTable(list);
+    }
+
+    //申请年份统计
+    @GetMapping("/cerData")
+    public List<DataEntity> cerData(Map<String, java.io.Serializable> param)
+    {
+        param.put("params" , new HashMap<>());
+        param.put("cert", 1);
+        DataEntity data1 = tByxWorkcertificateMapper.selectCerData(param);
+        data1.setDataName("锅炉证");
+        param.put("cert", 2);
+        DataEntity data2 = tByxWorkcertificateMapper.selectCerData(param);
+        data2.setDataName("加氢工艺");
+        param.put("cert", 3);
+        DataEntity data3 = tByxWorkcertificateMapper.selectCerData(param);
+        data3.setDataName("裂化工艺");
+        List<DataEntity> list = new ArrayList<>();
+        list.add(data1);
+        list.add(data2);
+        list.add(data3);
+        return list;
+    }
+
+    /**
+     * 导出作业证书一览列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:export')")
+    @Log(title = "作业证书一览", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TByxWorkcertificate tByxWorkcertificate)
+    {
+        List<TByxWorkcertificate> list = tByxWorkcertificateService.selectTByxWorkcertificateList(tByxWorkcertificate);
+        ExcelUtil<TByxWorkcertificate> util = new ExcelUtil<TByxWorkcertificate>(TByxWorkcertificate.class);
+        return util.exportExcel(list, "ByxWorkcertificate");
+    }
+
+
+    /**
+     * 获取作业证书一览详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tByxWorkcertificateService.selectTByxWorkcertificateById(id));
+    }
+
+    /**
+     * 新增作业证书一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:add')")
+    @Log(title = "作业证书一览", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TByxWorkcertificate tByxWorkcertificate)
+    {
+        tByxWorkcertificate.setCreaterCode(getUserId().toString());
+        return toAjax(tByxWorkcertificateService.insertTByxWorkcertificate(tByxWorkcertificate));
+    }
+
+    /**
+     * 修改作业证书一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:edit')")
+    @Log(title = "作业证书一览", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TByxWorkcertificate tByxWorkcertificate)
+    {
+        tByxWorkcertificate.setUpdaterCode(getUserId().toString());
+        tByxWorkcertificate.setUpdatedate(new Date());
+        return toAjax(tByxWorkcertificateService.updateTByxWorkcertificate(tByxWorkcertificate));
+    }
+
+    /**
+     * 删除作业证书一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:remove')")
+    @Log(title = "作业证书一览", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tByxWorkcertificateService.deleteTByxWorkcertificateByIds(ids));
+    }
+
+    /**
+     * 批量导入作业证书一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorkcertificate:add')")
+    @Log(title = "作业证书一览", businessType = BusinessType.INSERT)
+    @PostMapping("/importData")
+    public AjaxResult byxImportData(@RequestParam("file") MultipartFile file) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow =new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TByxWorkcertificate> list = new ArrayList<>();
+        //字典查询
+        List<SysDictData> plant = iSysDictTypeService.selectDictDataByType("PLANT_DIVIDE");
+        List<SysDictData> classes = iSysDictTypeService.selectDictDataByType("CLASSES");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getLastRowNum();
+        int failNumber = 0;
+        for (int i = 1; i <= rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                //   int cellNum = row.getPhysicalNumberOfCells();
+                if(row==null){
+                    sheet.removeRow(row);
+                    rowNum++;
+                    continue;
+                }
+                int cellNum = row.getLastCellNum();
+                TByxWorkcertificate entity = new TByxWorkcertificate();
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    if (cell == null) {
+                        continue;
+                    }
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        for (SysDictData p : plant) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setPlantCode(p.getDictValue());//装置名称
+                            }
+                        }
+                    } else if (j == 1) {
+                        entity.setName(cellValue);//姓名
+                    } else if (j == 2) {
+                        cellValue=supplementZero(Integer.parseInt(cellValue));
+                        entity.setEmployeeid(cellValue);//员工号
+                    } else if (j == 3) {
+                        for (SysDictData p : classes) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setClasses(p.getDictValue());//班型
+                            }
+                        }
+                    } else if (j == 4) {
+                        entity.setContainer(cellValue);//移动式压力容器充装
+                    } else if (j == 5) {
+                        entity.setFireFacilities(cellValue);//消防设施操作
+                    } else if (j == 6) {
+                        entity.setIdnum(cellValue);//身份证件号
+                    } else if (j == 7) {
+                        if (cellValue.length() > 3) {
+                            entity.setReviewdate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//复证日期
+                        }
+                    } else if (j == 8) {
+                        if (cellValue.length() > 3) {
+                            entity.setPipevalidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//有效期
+                        }
+                    } else if (j == 9) {
+                        entity.setGuardian(cellValue);//监护人专项培训
+                    } else if (j == 10) {
+                        if (cellValue.length() > 3) {
+                            entity.setBoilvalidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//有效期
+                        }
+                    } else if (j == 11) {
+                        if (cellValue.length() > 3) {
+                            entity.setForemantrain(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长最近培训日期
+                        }
+                    } else if (j == 12) {
+                        if (cellValue.length() > 3) {
+                            entity.setForemanreview(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长本次复审
+                        }
+                    } else if (j == 13) {
+                        if (cellValue.length() > 3) {
+                            entity.setForemannextreview(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长下次复审
+                        }
+                    } else if (j == 14) {
+                        for (SysDept d : dept) {
+                            if (d.getDeptName().equals(cellValue.trim())) {
+                                entity.setDeptId(d.getDeptId());//部门编号
+                            }
+                        }
+                    } else if (j == 15) {
+                        entity.setRemarks(cellValue);//备注
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(i+1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TByxWorkcertificate t : list
+        ) {
+            failNum++;
+            try {
+                TByxWorkcertificate ttt=    tByxWorkcertificateService.selectTByxWorkcertificateByEmployeeid(t.getEmployeeid());
+                if(StringUtils.isEmpty(ttt)){
+                    tByxWorkcertificateService.insertTByxWorkcertificate(t);
+                }else {
+                    tByxWorkcertificateService.updateTByxWorkcertificateByEmployeeid(t);
+                }
+
+                successNumber++;
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(failNum+1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        logger.info("failNumber:" +String.valueOf(failNumber));
+        logger.info("failRow:" +String.valueOf(failRow));
+        //     logger.info("update:"+String.valueOf());
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
+    }
+
+
+    //补全员工编号的前缀 0
+    public static String supplementZero(int randomNum){
+
+        String newString = String.format("%0" + 5+ "d", randomNum);
+
+        return newString;
+    }
+
+}

master/src/main/java/com/ruoyi/project/training/controller/TByxWorklicenseController.java

@@ -0,0 +1,331 @@
+package com.ruoyi.project.training.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.service.ISysDeptService;
+import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.project.training.domain.TByxWorklicense;
+import com.ruoyi.project.training.domain.TTrainingWorklicense;
+import com.ruoyi.project.training.mapper.TByxWorklicenseMapper;
+import com.ruoyi.project.training.service.ITByxWorklicenseService;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 上岗证一览Controller
+ *
+ * @author ruoyi
+ * @date 2020-12-02
+ */
+@RestController
+@RequestMapping("/training/byxWorklicense")
+public class TByxWorklicenseController extends BaseController
+{
+    @Autowired
+    private ITByxWorklicenseService tByxWorklicenseService;
+
+    @Autowired
+    private ISysDeptService iSysDeptService;
+
+    @Autowired
+    private ISysDictTypeService iSysDictTypeService;
+
+    @Resource
+    private TByxWorklicenseMapper tByxWorklicenseMapper;
+    /**
+     * 查询上岗证一览列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TByxWorklicense tByxWorklicense)
+    {
+        startPage();
+        Long e = new Date().getTime() + Long.parseLong("15724800000");
+        Date expiringDate = new Date();
+        expiringDate.setTime(e);
+        tByxWorklicense.setExpiringDate(expiringDate);
+        List<TByxWorklicense> list = tByxWorklicenseService.selectTByxWorklicenseList(tByxWorklicense);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询培训成绩列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:trainingrecords:list')")
+    @GetMapping("/listByxWorklicense")
+    public List<TTrainingWorklicense> listByxWorklicense(TByxWorklicense tByxWorklicense)
+    {
+        List<TByxWorklicense> list = tByxWorklicenseService.selectTByxWorklicenseList(tByxWorklicense);
+        List<TTrainingWorklicense> tTrainingWorklicenses = new ArrayList<TTrainingWorklicense>();
+        if ("1".equals(list.get(0).getBoiler())) {
+            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+            tTrainingWorklicense.setId(list.get(0).getId());
+            tTrainingWorklicense.setWorklicenseType("裂解");
+            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getBoilerIdnum());
+            tTrainingWorklicenses.add(tTrainingWorklicense);
+        }
+        if ("1".equals(list.get(0).getContainer())) {
+            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+            tTrainingWorklicense.setId(list.get(0).getId());
+            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+            tTrainingWorklicense.setWorklicenseType("压力容器");
+            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getContainerIdnum());
+            tTrainingWorklicenses.add(tTrainingWorklicense);
+        }
+        if ("1".equals(list.get(0).getPipe())) {
+            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+            tTrainingWorklicense.setId(list.get(0).getId());
+            tTrainingWorklicense.setWorklicenseType("压力管道");
+            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getPipeIdnum());
+            tTrainingWorklicenses.add(tTrainingWorklicense);
+        }
+        if ("1".equals(list.get(0).getAlkylation())) {
+            TTrainingWorklicense tTrainingWorklicense = new TTrainingWorklicense();
+            tTrainingWorklicense.setWorklicenseId(list.get(0).getId());
+            tTrainingWorklicense.setId(list.get(0).getId());
+            tTrainingWorklicense.setWorklicenseType("烷基化");
+            tTrainingWorklicense.setWorklicenseIdnum(list.get(0).getAlkylationIdnum());
+            tTrainingWorklicenses.add(tTrainingWorklicense);
+        }
+        return tTrainingWorklicenses;
+    }
+
+    //统计
+    @GetMapping("/licenseData")
+    public List<DataEntity> licenseData(Map param)
+    {
+        param.put("params" , new HashMap<>());
+        param.put("type", 1);
+        DataEntity data1 = tByxWorklicenseMapper.selectLicenseData(param);
+        data1.setDataName("裂解（裂化）");
+        param.put("type", 2);
+        DataEntity data2 = tByxWorklicenseMapper.selectLicenseData(param);
+        data2.setDataName("压力容器");
+        param.put("type", 3);
+        DataEntity data3 = tByxWorklicenseMapper.selectLicenseData(param);
+        data3.setDataName("压力管道");
+        param.put("type", 4);
+        DataEntity data4 = tByxWorklicenseMapper.selectLicenseData(param);
+        data4.setDataName("烷基化");
+        List<DataEntity> list = new ArrayList<>();
+        list.add(data1);
+        list.add(data2);
+        list.add(data3);
+        list.add(data4);
+        return list;
+    }
+
+    /**
+     * 导出上岗证一览列表
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:export')")
+    @Log(title = "上岗证一览", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TByxWorklicense tByxWorklicense)
+    {
+        List<TByxWorklicense> list = tByxWorklicenseService.selectTByxWorklicenseList(tByxWorklicense);
+        ExcelUtil<TByxWorklicense> util = new ExcelUtil<TByxWorklicense>(TByxWorklicense.class);
+        return util.exportExcel(list, "ByxWorklicense");
+    }
+
+    /**
+     * 获取上岗证一览详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tByxWorklicenseService.selectTByxWorklicenseById(id));
+    }
+
+    /**
+     * 新增上岗证一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:add')")
+    @Log(title = "上岗证一览", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TByxWorklicense tByxWorklicense)
+    {
+        tByxWorklicense.setCreaterCode(getUserId().toString());
+        return toAjax(tByxWorklicenseService.insertTByxWorklicense(tByxWorklicense));
+    }
+
+    /**
+     * 修改上岗证一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:edit')")
+    @Log(title = "上岗证一览", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TByxWorklicense tByxWorklicense)
+    {
+        tByxWorklicense.setUpdaterCode(getUserId().toString());
+        tByxWorklicense.setUpdatedate(new Date());
+        return toAjax(tByxWorklicenseService.updateTByxWorklicense(tByxWorklicense));
+    }
+
+    /**
+     * 删除上岗证一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:remove')")
+    @Log(title = "上岗证一览", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tByxWorklicenseService.deleteTByxWorklicenseByIds(ids));
+    }
+
+    /**
+     * 批量导入上岗证一览
+     */
+    @PreAuthorize("@ss.hasPermi('training:byxWorklicense:add')")
+    @Log(title = "上岗证一览", businessType = BusinessType.INSERT)
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow =new ArrayList<Integer>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TByxWorklicense> list = new ArrayList<TByxWorklicense>();
+        //字典查询
+        List<SysDictData> plant = iSysDictTypeService.selectDictDataByType("PLANT_DIVIDE");
+        List<SysDictData> classes = iSysDictTypeService.selectDictDataByType("CLASSES");
+        List<SysDictData> yesno = iSysDictTypeService.selectDictDataByType("YES_NO_EN");
+        //部门查询
+        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 1; i < rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getPhysicalNumberOfCells();
+                TByxWorklicense entity = new TByxWorklicense();
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    //  cell.setCellType(CellType.STRING);
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    if (j == 0) {
+                        for (SysDictData p : plant) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setPlantCode(p.getDictValue());//装置名称
+                            }
+                        }
+                    } else if (j == 1) {
+                        entity.setName(cellValue);//姓名
+                    } else if (j == 2) {
+                        entity.setEmployeeid(cellValue);//员工号
+                    } else if (j == 3) {
+                        for (SysDictData p : classes) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setClasses(p.getDictValue());//班组
+                            }
+                        }
+                    } else if (j == 4) {
+                        entity.setPost(cellValue);//职务
+                    } else if (j == 5) {
+                        entity.setIdtype(cellValue);//证件类型
+                    } else if (j == 6) {
+                        entity.setContainerIdnum(cellValue);//证件号
+                    } else if (j == 7) {
+                        for (SysDictData p : yesno) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setBoiler(p.getDictValue());//裂解
+                            }
+                        }
+                    } else if (j == 8) {
+                        for (SysDictData p : yesno) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setContainer(p.getDictValue());//压力容器
+                            }
+                        }
+                    } else if (j == 9) {
+                        for (SysDictData p : yesno) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setPipe(p.getDictValue());//压力管道
+                            }
+                        }
+                    } else if (j == 10) {
+                        for (SysDictData p : yesno) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setAlkylation(p.getDictValue());//烷基化
+                            }
+                        }
+                    } else if (j == 11) {
+                        for (SysDictData p : yesno) {
+                            if (p.getDictLabel().equals(cellValue.trim())) {
+                                entity.setAromatic(p.getDictValue());//AEU
+                            }
+                        }
+                    } else if (j == 12) {
+                        if (cellValue.length() > 3) {
+                            entity.setRecertificatedate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//取复证日期
+                        }
+                    } else if (j == 13) {
+                        if (cellValue.length() > 3) {
+                            entity.setValidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//证书有效期
+                        }
+                    } else if (j == 14) {
+                        for (SysDept d : dept) {
+                            if (d.getDeptName().equals(cellValue.trim())) {
+                                entity.setDeptId(d.getDeptId());//部门编号
+                            }
+                        }
+                    } else if (j == 15) {
+                        entity.setRemarks(cellValue);//备注
+                    }
+                }
+                entity.setCreaterCode(userId.toString());
+                logger.info("entity:" + entity);
+                list.add(entity);
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(i+1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TByxWorklicense t : list
+        ) {
+            failNum++;
+            try {
+                tByxWorklicenseService.insertTByxWorklicense(t);
+                successNumber++;
+            }catch (Exception e){
+                failNumber++;
+                failRow.add(failNum+1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" +String.valueOf(successNumber));
+        logger.info("failNumber:" +String.valueOf(failNumber));
+        logger.info("failRow:" +String.valueOf(failRow));
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
+    }
+}

master/src/main/java/com/ruoyi/project/training/controller/TWorkcertificateController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.project.training.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -15,7 +14,6 @@ import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
-import com.ruoyi.project.training.domain.TByxWorkcertificate;
 import com.ruoyi.project.training.domain.TWorkcertificate;
 import com.ruoyi.project.training.mapper.TWorkcertificateMapper;
 import com.ruoyi.project.training.service.ITWorkcertificateService;
@@ -101,20 +99,6 @@ public class TWorkcertificateController extends BaseController
         return util.exportExcel(list, "workcertificate");
     }
 
-    /**
-     * 导出作业证书一览列表
-     */
-    @PreAuthorize("@ss.hasPermi('training:workcertificate:export')")
-    @Log(title = "作业证书一览", businessType = BusinessType.EXPORT)
-    @GetMapping("/byxExport")
-    public AjaxResult byxExport(TWorkcertificate tWorkcertificate)
-    {
-        List<TWorkcertificate> tWorkcertificates = tWorkcertificateService.selectTWorkcertificateList(tWorkcertificate);
-        List<TByxWorkcertificate> list = JSONArray.parseArray(JSON.toJSONString(tWorkcertificates),TByxWorkcertificate.class);
-        ExcelUtil<TByxWorkcertificate> util = new ExcelUtil<>(TByxWorkcertificate.class);
-        return util.exportExcel(list, "byxworkcertificate");
-    }
-
     /**
      * 获取作业证书一览详细信息
      */
@@ -328,138 +312,6 @@ public class TWorkcertificateController extends BaseController
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
-    @PreAuthorize("@ss.hasPermi('training:workcertificate:add')")
-    @Log(title = "作业证书一览", businessType = BusinessType.INSERT)
-    @PostMapping("/byxImportData")
-    public AjaxResult byxImportData(@RequestParam("file") MultipartFile file) throws IOException
-    {
-        //获取操作人员ID
-        Long userId = getUserId();
-        //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
-        Workbook workbook = ExcelUtils.getWorkBook(file);
-        Sheet sheet = workbook.getSheetAt(0);
-        List<TWorkcertificate> list = new ArrayList<TWorkcertificate>();
-        //字典查询
-        List<SysDictData> plant = iSysDictTypeService.selectDictDataByType("PLANT_DIVIDE");
-        List<SysDictData> classes = iSysDictTypeService.selectDictDataByType("CLASSES");
-        //部门查询
-        List<SysDept> dept = iSysDeptService.selectDeptList(new SysDept());
-        int rowNum = sheet.getLastRowNum();
-        int failNumber = 0;
-        for (int i = 1; i <= rowNum; i++) {
-            try {
-                logger.info("读取行数：" + i);
-                Row row = sheet.getRow(i);
-                //   int cellNum = row.getPhysicalNumberOfCells();
-                if(row==null){
-                    sheet.removeRow(row);
-                    rowNum++;
-                    continue;
-                }
-                int cellNum = row.getLastCellNum();
-                TWorkcertificate entity = new TWorkcertificate();
-                for (int j = 0; j < cellNum; j++) {
-                    Cell cell = row.getCell(j);
-                    if (cell == null) {
-                        continue;
-                    }
-                    String cellValue = ExcelUtils.getCellValue(cell);
-                    logger.info("cellValue:" + cellValue);
-                    if (j == 0) {
-                        for (SysDictData p : plant) {
-                            if (p.getDictLabel().equals(cellValue.trim())) {
-                                entity.setPlantCode(p.getDictValue());//装置名称
-                            }
-                        }
-                    } else if (j == 1) {
-                        entity.setName(cellValue);//姓名
-                    } else if (j == 2) {
-                        cellValue=supplementZero(Integer.parseInt(cellValue));
-                        entity.setEmployeeid(cellValue);//员工号
-                    } else if (j == 3) {
-                        for (SysDictData p : classes) {
-                            if (p.getDictLabel().equals(cellValue.trim())) {
-                                entity.setClasses(p.getDictValue());//班型
-                            }
-                        }
-                    } else if (j == 4) {
-                        entity.setContainer(cellValue);//移动式压力容器充装
-                    } else if (j == 5) {
-                        entity.setPipe(cellValue);//消防设施操作
-                    } else if (j == 6) {
-                        entity.setIdnum(cellValue);//身份证件号
-                    } else if (j == 7) {
-                        if (cellValue.length() > 3) {
-                            entity.setReviewdate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//复证日期
-                        }
-                    } else if (j == 8) {
-                        if (cellValue.length() > 3) {
-                            entity.setPipevalidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//有效期
-                        }
-                    } else if (j == 9) {
-                        entity.setBoiler(cellValue);//监护人专项培训
-                    } else if (j == 10) {
-                        if (cellValue.length() > 3) {
-                            entity.setBoilvalidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//有效期
-                        }
-                    } else if (j == 11) {
-                        if (cellValue.length() > 3) {
-                            entity.setForemantrain(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长最近培训日期
-                        }
-                    } else if (j == 12) {
-                        if (cellValue.length() > 3) {
-                            entity.setForemanreview(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长本次复审
-                        }
-                    } else if (j == 13) {
-                        if (cellValue.length() > 3) {
-                            entity.setForemannextreview(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长下次复审
-                        }
-                    } else if (j == 14) {
-                        for (SysDept d : dept) {
-                            if (d.getDeptName().equals(cellValue.trim())) {
-                                entity.setDeptId(d.getDeptId());//部门编号
-                            }
-                        }
-                    } else if (j == 15) {
-                        entity.setRemarks(cellValue);//备注
-                    }
-                }
-                entity.setCreaterCode(userId.toString());
-                logger.info("entity:" + entity);
-                list.add(entity);
-            }catch (Exception e){
-                failNumber++;
-                failRow.add(i+1);
-            }
-        }
-        int successNumber = 0;
-        int failNum = 0;
-        for (TWorkcertificate t : list
-        ) {
-            failNum++;
-            try {
-                TWorkcertificate ttt=    tWorkcertificateService.selectTWorkcertificateByEmployeeid(t.getEmployeeid());
-                if(StringUtils.isEmpty(ttt)){
-                    tWorkcertificateService.insertTWorkcertificate(t);
-                }else {
-                    tWorkcertificateService.updateTWorkcertificateByEmployeeid(t);
-                }
-
-                successNumber++;
-            }catch (Exception e){
-                failNumber++;
-                failRow.add(failNum+1);
-            }
-        }
-        logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
-        //     logger.info("update:"+String.valueOf());
-        return AjaxResult.success(String.valueOf(successNumber), failRow);
-    }
-
     //补全员工编号的前缀 0
     public static String supplementZero(int randomNum){
 

master/src/main/java/com/ruoyi/project/training/domain/TByxWorkcertificate.java

@@ -40,10 +40,16 @@ public class TByxWorkcertificate extends BaseEntity
     /** 压力容器 */
     @Excel(name = "移动式压力容器充装")
     private String container;
+    private String containerIdnum;
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date containerDate;
 
     /** 压力管道 */
     @Excel(name = "消防设施操作")
-    private String pipe;
+    private String fireFacilities;
+    private String fireFacilitiesIdnum;
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date fireFacilitiesDate;
 
     /** 身份证件号 */
     @Excel(name = "身份证件号")
@@ -61,41 +67,14 @@ public class TByxWorkcertificate extends BaseEntity
 
     /** 锅炉证 */
     @Excel(name = "监护人专项培训")
-    private String boiler;
+    private String guardian;
+    private String guardianIdnum;
 
     /** 有效期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date boilvalidity;
 
-    /** 加氢工艺 */
-    //@Excel(name = "加氢工艺")
-    private String hydrogenation;
-
-    /** 有效期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-   // @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date hydvalidity;
-
-    /** 下次复审 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "下次复审", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date hydnextreview;
-
-    /** 裂化工艺 */
-    //@Excel(name = "裂化工艺")
-    private String cracking;
-
-    /** 有效期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-   // @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date crackingvalidity;
-
-    /** 复审 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-   // @Excel(name = "复审", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date crackingreview;
-
     /** 班组长最近培训日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "班组长最近培训日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -111,21 +90,6 @@ public class TByxWorkcertificate extends BaseEntity
     @Excel(name = "班组长下次复审", width = 30, dateFormat = "yyyy-MM-dd")
     private Date foremannextreview;
 
-    /** 锅炉水质培训日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "锅炉水质培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date waterdate;
-
-    /** 锅炉能效培训日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "锅炉能效培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date energydate;
-
-    /** 制冷作业培训日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "制冷作业培训日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date refrigerationdate;
-
     /** 删除状态 */
     private Long delFlag;
 
@@ -206,14 +170,14 @@ public class TByxWorkcertificate extends BaseEntity
     {
         return container;
     }
-    public void setPipe(String pipe)
+    public void setFireFacilities(String fireFacilities)
     {
-        this.pipe = pipe;
+        this.fireFacilities = fireFacilities;
     }
 
-    public String getPipe()
+    public String getFireFacilities()
     {
-        return pipe;
+        return fireFacilities;
     }
     public void setIdnum(String idnum)
     {
@@ -242,14 +206,14 @@ public class TByxWorkcertificate extends BaseEntity
     {
         return pipevalidity;
     }
-    public void setBoiler(String boiler)
+    public void setGuardian(String guardian)
     {
-        this.boiler = boiler;
+        this.guardian = guardian;
     }
 
-    public String getBoiler()
+    public String getGuardian()
     {
-        return boiler;
+        return guardian;
     }
     public void setBoilvalidity(Date boilvalidity)
     {
@@ -260,60 +224,6 @@ public class TByxWorkcertificate extends BaseEntity
     {
         return boilvalidity;
     }
-    public void setHydrogenation(String hydrogenation)
-    {
-        this.hydrogenation = hydrogenation;
-    }
-
-    public String getHydrogenation()
-    {
-        return hydrogenation;
-    }
-    public void setHydvalidity(Date hydvalidity)
-    {
-        this.hydvalidity = hydvalidity;
-    }
-
-    public Date getHydvalidity()
-    {
-        return hydvalidity;
-    }
-    public void setHydnextreview(Date hydnextreview)
-    {
-        this.hydnextreview = hydnextreview;
-    }
-
-    public Date getHydnextreview()
-    {
-        return hydnextreview;
-    }
-    public void setCracking(String cracking)
-    {
-        this.cracking = cracking;
-    }
-
-    public String getCracking()
-    {
-        return cracking;
-    }
-    public void setCrackingvalidity(Date crackingvalidity)
-    {
-        this.crackingvalidity = crackingvalidity;
-    }
-
-    public Date getCrackingvalidity()
-    {
-        return crackingvalidity;
-    }
-    public void setCrackingreview(Date crackingreview)
-    {
-        this.crackingreview = crackingreview;
-    }
-
-    public Date getCrackingreview()
-    {
-        return crackingreview;
-    }
     public void setForemantrain(Date foremantrain)
     {
         this.foremantrain = foremantrain;
@@ -341,33 +251,6 @@ public class TByxWorkcertificate extends BaseEntity
     {
         return foremannextreview;
     }
-    public void setWaterdate(Date waterdate)
-    {
-        this.waterdate = waterdate;
-    }
-
-    public Date getWaterdate()
-    {
-        return waterdate;
-    }
-    public void setEnergydate(Date energydate)
-    {
-        this.energydate = energydate;
-    }
-
-    public Date getEnergydate()
-    {
-        return energydate;
-    }
-    public void setRefrigerationdate(Date refrigerationdate)
-    {
-        this.refrigerationdate = refrigerationdate;
-    }
-
-    public Date getRefrigerationdate()
-    {
-        return refrigerationdate;
-    }
     public void setDelFlag(Long delFlag)
     {
         this.delFlag = delFlag;
@@ -441,6 +324,46 @@ public class TByxWorkcertificate extends BaseEntity
         return deptName;
     }
 
+    public String getContainerIdnum() {
+        return containerIdnum;
+    }
+
+    public void setContainerIdnum(String containerIdnum) {
+        this.containerIdnum = containerIdnum;
+    }
+
+    public Date getContainerDate() {
+        return containerDate;
+    }
+
+    public void setContainerDate(Date containerDate) {
+        this.containerDate = containerDate;
+    }
+
+    public String getFireFacilitiesIdnum() {
+        return fireFacilitiesIdnum;
+    }
+
+    public void setFireFacilitiesIdnum(String fireFacilitiesIdnum) {
+        this.fireFacilitiesIdnum = fireFacilitiesIdnum;
+    }
+
+    public Date getFireFacilitiesDate() {
+        return fireFacilitiesDate;
+    }
+
+    public void setFireFacilitiesDate(Date fireFacilitiesDate) {
+        this.fireFacilitiesDate = fireFacilitiesDate;
+    }
+
+    public String getGuardianIdnum() {
+        return guardianIdnum;
+    }
+
+    public void setGuardianIdnum(String guardianIdnum) {
+        this.guardianIdnum = guardianIdnum;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -450,24 +373,15 @@ public class TByxWorkcertificate extends BaseEntity
             .append("employeeid", getEmployeeid())
             .append("classes", getClasses())
             .append("container", getContainer())
-            .append("pipe", getPipe())
+            .append("fireFacilities", getFireFacilities())
             .append("idnum", getIdnum())
             .append("reviewdate", getReviewdate())
             .append("pipevalidity", getPipevalidity())
-            .append("boiler", getBoiler())
+            .append("guardian", getGuardian())
             .append("boilvalidity", getBoilvalidity())
-            .append("hydrogenation", getHydrogenation())
-            .append("hydvalidity", getHydvalidity())
-            .append("hydnextreview", getHydnextreview())
-            .append("cracking", getCracking())
-            .append("crackingvalidity", getCrackingvalidity())
-            .append("crackingreview", getCrackingreview())
             .append("foremantrain", getForemantrain())
             .append("foremanreview", getForemanreview())
             .append("foremannextreview", getForemannextreview())
-            .append("waterdate", getWaterdate())
-            .append("energydate", getEnergydate())
-            .append("refrigerationdate", getRefrigerationdate())
             .append("delFlag", getDelFlag())
             .append("createrCode", getCreaterCode())
             .append("createdate", getCreatedate())
@@ -478,4 +392,5 @@ public class TByxWorkcertificate extends BaseEntity
             .append("deptName", getDeptName())
             .toString();
     }
+
 }

master/src/main/java/com/ruoyi/project/training/domain/TByxWorklicense.java

@@ -47,39 +47,39 @@ public class TByxWorklicense extends BaseEntity
 
     /** 裂解证件号 */
    // @Excel(name = "裂解证件号")
-    private String crackingIdnum;
+    private String boilerIdnum;
 
     /** 分离证件号 */
    // @Excel(name = "分离证件号")
-    private String separationIdnum;
+    private String pipeIdnum;
 
     /** 压缩证件号 */
     //@Excel(name = "压缩证件号")
-    private String compressionIdnum;
+    private String containerIdnum;
 
     /** PGU/AEU证件号 */
     //@Excel(name = "PGU/AEU证件号")
-    private String pguaeuIdnum;
+    private String alkylationIdnum;
 
     /** 分离取证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     //@Excel(name = "分离取证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date separationDate;
+    private Date pipeDate;
 
     /** 压缩取证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     //@Excel(name = "压缩取证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date compressionDate;
+    private Date containerDate;
 
     /** PGU/AEU取证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     //@Excel(name = "PGU/AEU取证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date pguaeuDate;
+    private Date alkylationDate;
 
     /** 裂解取证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
    // @Excel(name = "裂解取证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date crackingDate;
+    private Date boilerDate;
 
     /** 裂解 */
     @Excel(name = "裂解（裂化）", dictType = "YES_NO_EN")
@@ -87,15 +87,15 @@ public class TByxWorklicense extends BaseEntity
 
     /** 压缩 */
     @Excel(name = "压力容器", dictType = "YES_NO_EN")
-    private String cracking;
+    private String container;
 
     /** 分离 */
     @Excel(name = "压力管道", dictType = "YES_NO_EN")
-    private String hotarea;
+    private String pipe;
 
     /** PGU */
     @Excel(name = "烷基化", dictType = "YES_NO_EN")
-    private String coldarea;
+    private String alkylation;
 
     /** AEU */
     @Excel(name = "AEU", dictType = "YES_NO_EN")
@@ -209,9 +209,7 @@ public class TByxWorklicense extends BaseEntity
     {
         return idtype;
     }
-    public void setCrackingIdnum(String crackingIdnum) { this.crackingIdnum = crackingIdnum; }
 
-    public String getCrackingIdnum() { return crackingIdnum; }
     public void setBoiler(String boiler)
     {
         this.boiler = boiler;
@@ -221,36 +219,33 @@ public class TByxWorklicense extends BaseEntity
     {
         return boiler;
     }
-    public void setCracking(String cracking)
+    public void setAromatic(String aromatic)
     {
-        this.cracking = cracking;
+        this.aromatic = aromatic;
     }
 
-    public String getCracking()
-    {
-        return cracking;
+    public String getContainer() {
+        return container;
     }
-    public void setHotarea(String hotarea)
-    {
-        this.hotarea = hotarea;
+
+    public void setContainer(String container) {
+        this.container = container;
     }
 
-    public String getHotarea()
-    {
-        return hotarea;
+    public String getPipe() {
+        return pipe;
     }
-    public void setColdarea(String coldarea)
-    {
-        this.coldarea = coldarea;
+
+    public void setPipe(String pipe) {
+        this.pipe = pipe;
     }
 
-    public String getColdarea()
-    {
-        return coldarea;
+    public String getAlkylation() {
+        return alkylation;
     }
-    public void setAromatic(String aromatic)
-    {
-        this.aromatic = aromatic;
+
+    public void setAlkylation(String alkylation) {
+        this.alkylation = alkylation;
     }
 
     public String getAromatic()
@@ -347,27 +342,71 @@ public class TByxWorklicense extends BaseEntity
     {
         return deptName;
     }
-    public void setSeparationIdnum(String separationIdnum) { this.separationIdnum = separationIdnum; }
 
-    public String getSeparationIdnum() { return separationIdnum; }
-    public void setCompressionIdnum(String compressionIdnum) { this.compressionIdnum = compressionIdnum; }
+    public String getBoilerIdnum() {
+        return boilerIdnum;
+    }
+
+    public void setBoilerIdnum(String boilerIdnum) {
+        this.boilerIdnum = boilerIdnum;
+    }
 
-    public String getCompressionIdnum() { return compressionIdnum; }
-    public void setPguaeuIdnum(String pguaeuIdnum) { this.pguaeuIdnum = pguaeuIdnum; }
+    public String getPipeIdnum() {
+        return pipeIdnum;
+    }
 
-    public String getPguaeuIdnum() { return pguaeuIdnum; }
-    public void setSeparationDate(Date separationDate) { this.separationDate = separationDate; }
+    public void setPipeIdnum(String pipeIdnum) {
+        this.pipeIdnum = pipeIdnum;
+    }
 
-    public Date getSeparationDate() { return separationDate; }
-    public void setCompressionDate(Date compressionDate) { this.compressionDate = compressionDate; }
+    public String getContainerIdnum() {
+        return containerIdnum;
+    }
 
-    public Date getCompressionDate() { return compressionDate; }
-    public void setPguaeuDate(Date pguaeuDate) { this.pguaeuDate = pguaeuDate; }
+    public void setContainerIdnum(String containerIdnum) {
+        this.containerIdnum = containerIdnum;
+    }
 
-    public Date getPguaeuDate() { return pguaeuDate; }
-    public void setCrackingDate(Date crackingDate) { this.crackingDate = crackingDate; }
+    public String getAlkylationIdnum() {
+        return alkylationIdnum;
+    }
+
+    public void setAlkylationIdnum(String alkylationIdnum) {
+        this.alkylationIdnum = alkylationIdnum;
+    }
+
+    public Date getPipeDate() {
+        return pipeDate;
+    }
+
+    public void setPipeDate(Date pipeDate) {
+        this.pipeDate = pipeDate;
+    }
+
+    public Date getContainerDate() {
+        return containerDate;
+    }
+
+    public void setContainerDate(Date containerDate) {
+        this.containerDate = containerDate;
+    }
+
+    public Date getAlkylationDate() {
+        return alkylationDate;
+    }
+
+    public void setAlkylationDate(Date alkylationDate) {
+        this.alkylationDate = alkylationDate;
+    }
+
+    public Date getBoilerDate() {
+        return boilerDate;
+    }
+
+    public void setBoilerDate(Date boilerDate) {
+        this.boilerDate = boilerDate;
+    }
 
-    public Date getCrackingDate() { return crackingDate; }
     public String getNotHave() { return notHave; }
 
     public void setNotHave(String notHave) { this.notHave = notHave; }
@@ -388,11 +427,7 @@ public class TByxWorklicense extends BaseEntity
                 .append("classes", getClasses())
                 .append("post", getPost())
                 .append("idtype", getIdtype())
-                .append("crackingIdnum", getCrackingIdnum())
                 .append("boiler", getBoiler())
-                .append("cracking", getCracking())
-                .append("hotarea", getHotarea())
-                .append("coldarea", getColdarea())
                 .append("aromatic", getAromatic())
                 .append("recertificatedate", getRecertificatedate())
                 .append("validity", getValidity())
@@ -403,13 +438,6 @@ public class TByxWorklicense extends BaseEntity
                 .append("updatedate", getUpdatedate())
                 .append("remarks", getRemarks())
                 .append("deptId", getDeptId())
-                .append("separationIdnum", getSeparationIdnum())
-                .append("compressionIdnum", getCompressionIdnum())
-                .append("pguaeuIdnum", getPguaeuIdnum())
-                .append("separationDate", getSeparationDate())
-                .append("compressionDate", getCompressionDate())
-                .append("pguaeuDate", getPguaeuDate())
-                .append("crackingDate", getCrackingDate())
                 .toString();
     }
 }

master/src/main/java/com/ruoyi/project/training/mapper/TByxWorkcertificateMapper.java

@@ -0,0 +1,86 @@
+package com.ruoyi.project.training.mapper;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.training.domain.TByxWorkcertificate;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 作业证书一览Mapper接口
+ *
+ * @author ruoyi
+ * @date 2020-12-01
+ */
+public interface TByxWorkcertificateMapper
+{
+    /**
+     * 查询作业证书一览
+     *
+     * @param id 作业证书一览ID
+     * @return 作业证书一览
+     */
+    public TByxWorkcertificate selectTByxWorkcertificateById(Long id);
+
+    public TByxWorkcertificate selectTByxWorkcertificateByEmployeeid(String employeeid);
+
+    /**
+     * 查询作业证书一览列表
+     *
+     * @param TByxWorkcertificate 作业证书一览
+     * @return 作业证书一览集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TByxWorkcertificate> selectTByxWorkcertificateList(TByxWorkcertificate TByxWorkcertificate);
+
+    /**
+     * 定时任务查询作业证书一览列表
+     *
+     * @param TByxWorkcertificate 作业证书一览
+     * @return 作业证书一览集合
+     */
+    public List<TByxWorkcertificate> selectList(TByxWorkcertificate TByxWorkcertificate);
+
+    /**
+     * 新增作业证书一览
+     *
+     * @param TByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    public int insertTByxWorkcertificate(TByxWorkcertificate TByxWorkcertificate);
+
+    /**
+     * 修改作业证书一览
+     *
+     * @param TByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    public int updateTByxWorkcertificate(TByxWorkcertificate TByxWorkcertificate);
+
+    /**
+     * 根据员工编号修改作业证书一览
+     *
+     * @param TByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    public int updateTByxWorkcertificateByEmployeeid(TByxWorkcertificate TByxWorkcertificate);
+
+    /**
+     * 删除作业证书一览
+     *
+     * @param id 作业证书一览ID
+     * @return 结果
+     */
+    public int deleteTByxWorkcertificateById(Long id);
+
+    /**
+     * 批量删除作业证书一览
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTByxWorkcertificateByIds(Long[] ids);
+
+    DataEntity selectCerData(Map param);
+}

master/src/main/java/com/ruoyi/project/training/mapper/TByxWorklicenseMapper.java

@@ -0,0 +1,84 @@
+package com.ruoyi.project.training.mapper;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.common.domain.DataEntity;
+import com.ruoyi.project.training.domain.TByxWorklicense;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 上岗证一览Mapper接口
+ *
+ * @author ruoyi
+ * @date 2020-12-02
+ */
+public interface TByxWorklicenseMapper
+{
+    /**
+     * 查询上岗证一览
+     *
+     * @param id 上岗证一览ID
+     * @return 上岗证一览
+     */
+    public TByxWorklicense selectTByxWorklicenseById(Long id);
+
+    /**
+     * 查询上岗证一览
+     *
+     * @param employeeid 人员员工号
+     * @return 上岗证一览
+     */
+    public TByxWorklicense selectTByxWorklicenseByEmployeeid(String employeeid);
+
+    /**
+     * 查询上岗证一览列表
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 上岗证一览集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TByxWorklicense> selectTByxWorklicenseList(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 定时任务查询上岗证一览列表
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 上岗证一览集合
+     */
+    public List<TByxWorklicense> selectList(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 新增上岗证一览
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 结果
+     */
+    public int insertTByxWorklicense(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 修改上岗证一览
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 结果
+     */
+    public int updateTByxWorklicense(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 删除上岗证一览
+     *
+     * @param id 上岗证一览ID
+     * @return 结果
+     */
+    public int deleteTByxWorklicenseById(Long id);
+
+    /**
+     * 批量删除上岗证一览
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTByxWorklicenseByIds(Long[] ids);
+
+    DataEntity selectLicenseData(Map param);
+}

master/src/main/java/com/ruoyi/project/training/service/ITByxWorkcertificateService.java

@@ -0,0 +1,86 @@
+package com.ruoyi.project.training.service;
+
+import com.ruoyi.project.training.domain.TByxWorkcertificate;
+
+import java.util.List;
+
+/**
+ * 作业证书一览Service接口
+ *
+ * @author ruoyi
+ * @date 2020-12-01
+ */
+public interface ITByxWorkcertificateService
+{
+    /**
+     * 查询作业证书一览
+     *
+     * @param id 作业证书一览ID
+     * @return 作业证书一览
+     */
+    public TByxWorkcertificate selectTByxWorkcertificateById(Long id);
+
+    /**
+     * 根据员工编号查询作业证书一览
+     *
+     * @param
+     * @return 作业证书一览
+     */
+    public TByxWorkcertificate selectTByxWorkcertificateByEmployeeid(String employeeid);
+
+    /**
+     * 查询作业证书一览列表
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 作业证书一览集合
+     */
+    public List<TByxWorkcertificate> selectTByxWorkcertificateList(TByxWorkcertificate tByxWorkcertificate);
+
+    /**
+     * 定时任务查询作业证书一览列表
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 作业证书一览集合
+     */
+    public List<TByxWorkcertificate> selectList(TByxWorkcertificate tByxWorkcertificate);
+
+    /**
+     * 新增作业证书一览
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    public int insertTByxWorkcertificate(TByxWorkcertificate tByxWorkcertificate);
+
+    /**
+     * 修改作业证书一览
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    public int updateTByxWorkcertificate(TByxWorkcertificate tByxWorkcertificate);
+
+    /**
+     * 根据员工编号修改作业证书一览
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    public int updateTByxWorkcertificateByEmployeeid(TByxWorkcertificate tByxWorkcertificate);
+
+    /**
+     * 批量删除作业证书一览
+     *
+     * @param ids 需要删除的作业证书一览ID
+     * @return 结果
+     */
+    public int deleteTByxWorkcertificateByIds(Long[] ids);
+
+    /**
+     * 删除作业证书一览信息
+     *
+     * @param id 作业证书一览ID
+     * @return 结果
+     */
+    public int deleteTByxWorkcertificateById(Long id);
+}

master/src/main/java/com/ruoyi/project/training/service/ITByxWorklicenseService.java

@@ -0,0 +1,78 @@
+package com.ruoyi.project.training.service;
+
+import com.ruoyi.project.training.domain.TByxWorklicense;
+
+import java.util.List;
+
+/**
+ * 上岗证一览Service接口
+ *
+ * @author ruoyi
+ * @date 2020-12-02
+ */
+public interface ITByxWorklicenseService
+{
+    /**
+     * 查询上岗证一览
+     *
+     * @param id 上岗证一览ID
+     * @return 上岗证一览
+     */
+    public TByxWorklicense selectTByxWorklicenseById(Long id);
+
+    /**
+     * 查询上岗证一览
+     *
+     * @param employeeid 人员员工号
+     * @return 上岗证一览
+     */
+    public TByxWorklicense selectTByxWorklicenseByEmployeeid(String employeeid);
+
+    /**
+     * 查询上岗证一览列表
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 上岗证一览集合
+     */
+    public List<TByxWorklicense> selectTByxWorklicenseList(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 定时任务查询上岗证一览列表
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 上岗证一览集合
+     */
+    public List<TByxWorklicense> selectList(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 新增上岗证一览
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 结果
+     */
+    public int insertTByxWorklicense(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 修改上岗证一览
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 结果
+     */
+    public int updateTByxWorklicense(TByxWorklicense tByxWorklicense);
+
+    /**
+     * 批量删除上岗证一览
+     *
+     * @param ids 需要删除的上岗证一览ID
+     * @return 结果
+     */
+    public int deleteTByxWorklicenseByIds(Long[] ids);
+
+    /**
+     * 删除上岗证一览信息
+     *
+     * @param id 上岗证一览ID
+     * @return 结果
+     */
+    public int deleteTByxWorklicenseById(Long id);
+}

master/src/main/java/com/ruoyi/project/training/service/impl/TByxWorkcertificateServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.project.training.service.impl;
+
+import com.ruoyi.project.training.domain.TByxWorkcertificate;
+import com.ruoyi.project.training.mapper.TByxWorkcertificateMapper;
+import com.ruoyi.project.training.service.ITByxWorkcertificateService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 作业证书一览Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2020-12-01
+ */
+@Service
+public class TByxWorkcertificateServiceImpl implements ITByxWorkcertificateService
+{
+    @Resource
+    private TByxWorkcertificateMapper tByxWorkcertificateMapper;
+
+    /**
+     * 查询作业证书一览
+     *
+     * @param id 作业证书一览ID
+     * @return 作业证书一览
+     */
+    @Override
+    public TByxWorkcertificate selectTByxWorkcertificateById(Long id)
+    {
+        return tByxWorkcertificateMapper.selectTByxWorkcertificateById(id);
+    }
+
+    @Override
+    public TByxWorkcertificate selectTByxWorkcertificateByEmployeeid(String employeeid)
+    {
+        return tByxWorkcertificateMapper.selectTByxWorkcertificateByEmployeeid(employeeid);
+    }
+
+    /**
+     * 查询作业证书一览列表
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 作业证书一览
+     */
+    @Override
+    public List<TByxWorkcertificate> selectTByxWorkcertificateList(TByxWorkcertificate tByxWorkcertificate)
+    {
+        return tByxWorkcertificateMapper.selectTByxWorkcertificateList(tByxWorkcertificate);
+    }
+
+    /**
+     * 定时任务查询作业证书一览列表
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 作业证书一览集合
+     */
+    @Override
+    public List<TByxWorkcertificate> selectList(TByxWorkcertificate tByxWorkcertificate) {
+        return tByxWorkcertificateMapper.selectList(tByxWorkcertificate);
+    }
+
+    /**
+     * 新增作业证书一览
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    @Override
+    public int insertTByxWorkcertificate(TByxWorkcertificate tByxWorkcertificate)
+    {
+        return tByxWorkcertificateMapper.insertTByxWorkcertificate(tByxWorkcertificate);
+    }
+
+    /**
+     * 修改作业证书一览
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    @Override
+    public int updateTByxWorkcertificate(TByxWorkcertificate tByxWorkcertificate)
+    {
+        return tByxWorkcertificateMapper.updateTByxWorkcertificate(tByxWorkcertificate);
+    }
+
+
+    /**
+     * 根据员工编号修改作业证书一览
+     *
+     * @param tByxWorkcertificate 作业证书一览
+     * @return 结果
+     */
+    @Override
+    public int updateTByxWorkcertificateByEmployeeid(TByxWorkcertificate tByxWorkcertificate)
+    {
+        return tByxWorkcertificateMapper.updateTByxWorkcertificateByEmployeeid(tByxWorkcertificate);
+    }
+
+
+
+    /**
+     * 批量删除作业证书一览
+     *
+     * @param ids 需要删除的作业证书一览ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTByxWorkcertificateByIds(Long[] ids)
+    {
+        return tByxWorkcertificateMapper.deleteTByxWorkcertificateByIds(ids);
+    }
+
+    /**
+     * 删除作业证书一览信息
+     *
+     * @param id 作业证书一览ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTByxWorkcertificateById(Long id)
+    {
+        return tByxWorkcertificateMapper.deleteTByxWorkcertificateById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/training/service/impl/TByxWorklicenseServiceImpl.java

@@ -0,0 +1,116 @@
+package com.ruoyi.project.training.service.impl;
+
+import com.ruoyi.project.training.domain.TByxWorklicense;
+import com.ruoyi.project.training.mapper.TByxWorklicenseMapper;
+import com.ruoyi.project.training.service.ITByxWorklicenseService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 上岗证一览Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2020-12-02
+ */
+@Service
+public class TByxWorklicenseServiceImpl implements ITByxWorklicenseService
+{
+    @Resource
+    private TByxWorklicenseMapper tByxWorklicenseMapper;
+
+    /**
+     * 查询上岗证一览
+     *
+     * @param id 上岗证一览ID
+     * @return 上岗证一览
+     */
+    @Override
+    public TByxWorklicense selectTByxWorklicenseById(Long id)
+    {
+        return tByxWorklicenseMapper.selectTByxWorklicenseById(id);
+    }
+
+    /**
+     * 查询上岗证一览
+     *
+     * @param employeeid 人员员工号
+     * @return 上岗证一览
+     */
+    public TByxWorklicense selectTByxWorklicenseByEmployeeid(String employeeid)
+    {
+        return tByxWorklicenseMapper.selectTByxWorklicenseByEmployeeid(employeeid);
+    }
+
+    /**
+     * 查询上岗证一览列表
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 上岗证一览
+     */
+    @Override
+    public List<TByxWorklicense> selectTByxWorklicenseList(TByxWorklicense tByxWorklicense)
+    {
+        return tByxWorklicenseMapper.selectTByxWorklicenseList(tByxWorklicense);
+    }
+
+    /**
+     * 定时任务查询上岗证一览列表
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 上岗证一览集合
+     */
+    @Override
+    public List<TByxWorklicense> selectList(TByxWorklicense tByxWorklicense) {
+        return tByxWorklicenseMapper.selectList(tByxWorklicense);
+    }
+
+    /**
+     * 新增上岗证一览
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 结果
+     */
+    @Override
+    public int insertTByxWorklicense(TByxWorklicense tByxWorklicense)
+    {
+        return tByxWorklicenseMapper.insertTByxWorklicense(tByxWorklicense);
+    }
+
+    /**
+     * 修改上岗证一览
+     *
+     * @param tByxWorklicense 上岗证一览
+     * @return 结果
+     */
+    @Override
+    public int updateTByxWorklicense(TByxWorklicense tByxWorklicense)
+    {
+        return tByxWorklicenseMapper.updateTByxWorklicense(tByxWorklicense);
+    }
+
+    /**
+     * 批量删除上岗证一览
+     *
+     * @param ids 需要删除的上岗证一览ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTByxWorklicenseByIds(Long[] ids)
+    {
+        return tByxWorklicenseMapper.deleteTByxWorklicenseByIds(ids);
+    }
+
+    /**
+     * 删除上岗证一览信息
+     *
+     * @param id 上岗证一览ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTByxWorklicenseById(Long id)
+    {
+        return tByxWorklicenseMapper.deleteTByxWorklicenseById(id);
+    }
+}

master/src/main/resources/mybatis/training/TByxWorkcertificateMapper.xml

@@ -0,0 +1,239 @@
+<?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="com.ruoyi.project.training.mapper.TByxWorkcertificateMapper">
+
+    <resultMap type="TByxWorkcertificate" id="TByxWorkcertificateResult">
+        <result property="id"    column="id"    />
+        <result property="plantCode"    column="plant_code"    />
+        <result property="name"    column="name"    />
+        <result property="employeeid"    column="employeeid"    />
+        <result property="classes"    column="classes"    />
+        <result property="container"    column="container"    />
+        <result property="fireFacilities"    column="fire_facilities"    />
+        <result property="idnum"    column="idnum"    />
+        <result property="reviewdate"    column="reviewdate"    />
+        <result property="pipevalidity"    column="pipevalidity"    />
+        <result property="guardian"    column="guardian"    />
+        <result property="boilvalidity"    column="boilvalidity"    />
+        <result property="foremantrain"    column="foremantrain"    />
+        <result property="foremanreview"    column="foremanreview"    />
+        <result property="foremannextreview"    column="foremannextreview"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName" column="dept_name" />
+        <result property="containerIdnum" column="container_idnum" />
+        <result property="containerDate" column="container_date" />
+        <result property="fireFacilitiesDate" column="fire_facilities_date" />
+        <result property="fireFacilitiesIdnum" column="fire_facilities_idnum" />
+        <result property="guardianIdnum" column="guardian_idnum" />
+    </resultMap>
+
+    <sql id="selectTByxWorkcertificateVo">
+        select d.id, d.plant_code, d.name, d.employeeid, d.classes, d.container, d.fire_facilities, d.idnum, d.reviewdate, d.pipevalidity, d.guardian, d.boilvalidity, d.foremantrain, d.foremanreview, d.foremannextreview, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id,d.container_idnum, d.container_date,
+               d.fire_facilities_idnum,
+               d.fire_facilities_date,
+               d.guardian_idnum
+,s.dept_name from t_byx_workcertificate d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTByxWorkcertificateList" parameterType="TByxWorkcertificate" resultMap="TByxWorkcertificateResult">
+        <include refid="selectTByxWorkcertificateVo"/>
+        <where>
+            <if test="classes != null  and classes != ''"> and classes = #{classes}</if>
+            <!-- 王子文 2022年8月15日 -->
+            <!-- 过滤掉锅炉证、加氢工艺、裂化工艺字段中值为（一个或多个）空格的数据 -->
+            <if test="guardian == 'true'">and LTRIM(guardian) is not null</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by d.id desc
+    </select>
+
+    <select id="selectList" parameterType="TByxWorkcertificate" resultMap="TByxWorkcertificateResult">
+        <include refid="selectTByxWorkcertificateVo"/>
+        <where>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by d.id desc
+    </select>
+
+    <select id="selectTByxWorkcertificateById" parameterType="Long" resultMap="TByxWorkcertificateResult">
+        <include refid="selectTByxWorkcertificateVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTByxWorkcertificateByEmployeeid" parameterType="String" resultMap="TByxWorkcertificateResult">
+        <include refid="selectTByxWorkcertificateVo"/>
+        where employeeid = #{employeeid}
+    </select>
+
+    <insert id="insertTByxWorkcertificate" parameterType="TByxWorkcertificate">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_byx_workcertificate.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_byx_workcertificate
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="plantCode != null and plantCode != ''">plant_code,</if>
+            <if test="name != null">name,</if>
+            <if test="employeeid != null">employeeid,</if>
+            <if test="classes != null">classes,</if>
+            <if test="container != null">container,</if>
+            <if test="fireFacilities != null">fire_facilities,</if>
+            <if test="idnum != null">idnum,</if>
+            <if test="reviewdate != null">reviewdate,</if>
+            <if test="pipevalidity != null">pipevalidity,</if>
+            <if test="guardian != null">guardian,</if>
+            <if test="boilvalidity != null">boilvalidity,</if>
+            <if test="foremantrain != null">foremantrain,</if>
+            <if test="foremanreview != null">foremanreview,</if>
+            <if test="foremannextreview != null">foremannextreview,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="containerIdnum!= null">container_idnum,</if>
+            <if test="containerDate != null">container_date,</if>
+            <if test="fireFacilitiesDate != null">fire_facilities_date,</if>
+            <if test="fireFacilitiesIdnum != null">fire_facilities_idnum,</if>
+            <if test="guardianIdnum != null">guardian_idnum,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
+            <if test="name != null">#{name},</if>
+            <if test="employeeid != null">#{employeeid},</if>
+            <if test="classes != null">#{classes},</if>
+            <if test="container != null">#{container},</if>
+            <if test="fireFacilities != null">#{fireFacilities},</if>
+            <if test="idnum != null">#{idnum},</if>
+            <if test="reviewdate != null">#{reviewdate},</if>
+            <if test="pipevalidity != null">#{pipevalidity},</if>
+            <if test="guardian != null">#{guardian},</if>
+            <if test="boilvalidity != null">#{boilvalidity},</if>
+            <if test="foremantrain != null">#{foremantrain},</if>
+            <if test="foremanreview != null">#{foremanreview},</if>
+            <if test="foremannextreview != null">#{foremannextreview},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="containerIdnum!= null">#{containerIdnum},</if>
+            <if test="containerDate != null">#{containerDate},</if>
+            <if test="fireFacilitiesDate != null">#{fireFacilitiesDate},</if>
+            <if test="fireFacilitiesIdnum != null">#{fireFacilitiesIdnum},</if>
+            <if test="guardianIdnum != null">#{guardianIdnum},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTByxWorkcertificate" parameterType="TByxWorkcertificate">
+        update t_byx_workcertificate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantCode != null and plantCode != ''">plant_code = #{plantCode},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="employeeid != null">employeeid = #{employeeid},</if>
+            <if test="classes != null">classes = #{classes},</if>
+            <if test="container != null">container = #{container},</if>
+            <if test="fireFacilities != null">fire_facilities = #{fireFacilities},</if>
+            <if test="idnum != null">idnum = #{idnum},</if>
+            <if test="reviewdate != null">reviewdate = #{reviewdate},</if>
+            <if test="pipevalidity != null">pipevalidity = #{pipevalidity},</if>
+            <if test="guardian != null">guardian = #{guardian},</if>
+            <if test="boilvalidity != null">boilvalidity = #{boilvalidity},</if>
+            <if test="foremantrain != null">foremantrain = #{foremantrain},</if>
+            <if test="foremanreview != null">foremanreview = #{foremanreview},</if>
+            <if test="foremannextreview != null">foremannextreview = #{foremannextreview},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="containerIdnum!= null">container_idnum = #{containerIdnum},</if>
+            <if test="containerDate != null">container_date = #{containerDate},</if>
+            <if test="fireFacilitiesDate != null">fire_facilities_date = #{fireFacilitiesDate},</if>
+            <if test="fireFacilitiesIdnum != null">fire_facilities_idnum = #{fireFacilitiesIdnum},</if>
+            <if test="guardianIdnum != null">guardian_idnum = #{guardianIdnum},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="updateTByxWorkcertificateByEmployeeid" parameterType="TByxWorkcertificate">
+        update t_byx_workcertificate
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantCode != null and plantCode != ''">plant_code = #{plantCode},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="employeeid != null">employeeid = #{employeeid},</if>
+            <if test="classes != null">classes = #{classes},</if>
+            <if test="container != null">container = #{container},</if>
+            <if test="fireFacilities != null">fire_facilities = #{fireFacilities},</if>
+            <if test="idnum != null">idnum = #{idnum},</if>
+            <if test="reviewdate != null">reviewdate = #{reviewdate},</if>
+            <if test="pipevalidity != null">pipevalidity = #{pipevalidity},</if>
+            <if test="guardian != null">guardian = #{guardian},</if>
+            <if test="boilvalidity != null">boilvalidity = #{boilvalidity},</if>
+            <if test="foremantrain != null">foremantrain = #{foremantrain},</if>
+            <if test="foremanreview != null">foremanreview = #{foremanreview},</if>
+            <if test="foremannextreview != null">foremannextreview = #{foremannextreview},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="containerIdnum!= null">container_idnum = #{containerIdnum},</if>
+            <if test="containerDate != null">container_date = #{containerDate},</if>
+            <if test="fireFacilitiesDate != null">fire_facilities_date = #{fireFacilitiesDate},</if>
+            <if test="fireFacilitiesIdnum != null">fire_facilities_idnum = #{fireFacilitiesIdnum},</if>
+            <if test="guardianIdnum != null">guardian_idnum = #{guardianIdnum},</if>
+        </trim>
+        where employeeid = #{employeeid}
+    </update>
+
+
+    <update id="deleteTByxWorkcertificateById" parameterType="Long">
+        update t_byx_workcertificate set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTByxWorkcertificateByIds" parameterType="String">
+        update t_byx_workcertificate set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="selectCerData" resultType="com.ruoyi.project.common.domain.DataEntity">
+       SELECT count(1) as dataNum from T_BYX_WORKCERTIFICATE
+       <where>
+           <if test="cert == 1">
+        and BOILER is not null and TRIM(BOILER) != ' '
+           </if>
+           <if test="cert == 2">
+               and HYDROGENATION is not null and TRIM(HYDROGENATION) != ' '
+           </if>
+           <if test="cert == 3">
+               and CRACKING is not null and TRIM(CRACKING) != ' '
+           </if>
+       </where>
+    </select>
+
+</mapper>

master/src/main/resources/mybatis/training/TByxWorklicenseMapper.xml

@@ -0,0 +1,243 @@
+<?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="com.ruoyi.project.training.mapper.TByxWorklicenseMapper">
+
+    <resultMap type="TByxWorklicense" id="TByxWorklicenseResult">
+        <result property="id"    column="id"    />
+        <result property="plantCode"    column="plant_code"    />
+        <result property="name"    column="name"    />
+        <result property="employeeid"    column="employeeid"    />
+        <result property="classes"    column="classes"    />
+        <result property="post"    column="post"    />
+        <result property="idtype"    column="idtype"    />
+        <result property="containerIdnum"    column="container_idnum"    />
+        <result property="boiler"    column="boiler"    />
+        <result property="container"    column="container"    />
+        <result property="pipe"    column="pipe"    />
+        <result property="alkylation"    column="alkylation"    />
+        <result property="aromatic"    column="aromatic"    />
+        <result property="recertificatedate"    column="recertificatedate"    />
+        <result property="validity"    column="validity"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="pipeIdnum"    column="pipe_idnum"    />
+        <result property="alkylationIdnum"    column="alkylation_idnum"    />
+        <result property="pipeDate"    column="pipe_date"    />
+        <result property="alkylationDate"    column="alkylation_date"    />
+        <result property="containerDate"    column="container_date"    />
+        <result property="boilerIdnum"    column="boiler_idnum"    />
+        <result property="boilerDate"    column="boiler_date"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTByxWorklicenseVo">
+        select d.id, d.plant_code, d.name, d.employeeid, d.classes, d.post, d.idtype, d.container_idnum, d.boiler, d.container, d.pipe, d.alkylation, d.aromatic, d.recertificatedate, d.validity, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.pipe_idnum, d.alkylation_idnum, d.pipe_date, d.alkylation_date, d.container_date, d.boiler_idnum, d.boiler_date ,s.dept_name from t_byx_worklicense d
+        left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTByxWorklicenseList" parameterType="TByxWorklicense" resultMap="TByxWorklicenseResult">
+        <include refid="selectTByxWorklicenseVo"/>
+        <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
+            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
+            <if test="employeeid != null  and employeeid != ''"> and employeeid = #{employeeid}</if>
+            <if test="classes != null  and classes != ''"> and classes = #{classes}</if>
+            <if test="post != null  and post != ''"> and post = #{post}</if>
+            <if test="idtype != null  and idtype != ''"> and idtype = #{idtype}</if>
+            <if test="containerIdnum != null  and containerIdnum != ''"> and container_idnum = #{containerIdnum}</if>
+            <if test="boiler != null  and boiler != ''"> and boiler = #{boiler}</if>
+            <if test="container != null  and container != ''"> and container = #{container}</if>
+            <if test="pipe != null  and pipe != ''"> and pipe = #{pipe}</if>
+            <if test="alkylation != null  and alkylation != ''"> and alkylation = #{alkylation}</if>
+            <if test="aromatic != null  and aromatic != ''"> and aromatic = #{aromatic}</if>
+            <if test="recertificatedate != null "> and recertificatedate = #{recertificatedate}</if>
+            <if test="validity != null "> and validity = #{validity}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="pipeIdnum != null  and pipeIdnum != ''"> and pipe_idnum = #{pipeIdnum}</if>
+            <if test="alkylationIdnum != null  and alkylationIdnum != ''"> and alkylation_idnum = #{alkylationIdnum}</if>
+            <if test="pipeDate != null "> and pipe_date = #{pipeDate}</if>
+            <if test="alkylationDate != null "> and alkylation_date = #{alkylationDate}</if>
+            <if test="containerDate != null "> and container_date = #{containerDate}</if>
+            <if test="boilerIdnum != null  and boilerIdnum != ''"> and boiler_idnum = #{boilerIdnum}</if>
+            <if test="boilerDate != null "> and boiler_date = #{boilerDate}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by d.id desc
+    </select>
+
+    <select id="selectList" parameterType="TByxWorklicense" resultMap="TByxWorklicenseResult">
+        <include refid="selectTByxWorklicenseVo"/>
+        <where>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by d.id desc
+    </select>
+
+    <select id="selectTByxWorklicenseById" parameterType="Long" resultMap="TByxWorklicenseResult">
+        <include refid="selectTByxWorklicenseVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTByxWorklicenseByEmployeeid" parameterType="String" resultMap="TByxWorklicenseResult">
+        <include refid="selectTByxWorklicenseVo"/>
+        where employeeid = #{employeeid}
+    </select>
+
+    <insert id="insertTByxWorklicense" parameterType="TByxWorklicense">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_byx_worklicense.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_byx_worklicense
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="plantCode != null and plantCode != ''">plant_code,</if>
+            <if test="name != null">name,</if>
+            <if test="employeeid != null">employeeid,</if>
+            <if test="classes != null">classes,</if>
+            <if test="post != null">post,</if>
+            <if test="idtype != null">idtype,</if>
+            <if test="containerIdnum != null">container_idnum,</if>
+            <if test="boiler == 'false'">boiler,</if>
+            <if test="container == 'false'">container,</if>
+            <if test="pipe == 'false'">pipe,</if>
+            <if test="alkylation == 'false'">alkylation,</if>
+            <if test="aromatic != null">aromatic,</if>
+            <if test="recertificatedate != null">recertificatedate,</if>
+            <if test="validity != null">validity,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="pipeIdnum != null">pipe_idnum,</if>
+            <if test="alkylationIdnum != null">alkylation_idnum,</if>
+            <if test="pipeDate != null">pipe_date,</if>
+            <if test="alkylationDate != null">alkylation_date,</if>
+            <if test="containerDate != null">container_date,</if>
+            <if test="boilerIdnum != null">boiler_idnum,</if>
+            <if test="boilerDate != null">boiler_date,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
+            <if test="name != null">#{name},</if>
+            <if test="employeeid != null">#{employeeid},</if>
+            <if test="classes != null">#{classes},</if>
+            <if test="post != null">#{post},</if>
+            <if test="idtype != null">#{idtype},</if>
+            <if test="containerIdnum != null">#{containerIdnum},</if>
+            <if test="boiler == 'false'">0,</if>
+            <if test="container == 'false'">0,</if>
+            <if test="pipe == 'false'">0,</if>
+            <if test="alkylation == 'false'">0,</if>
+            <if test="boiler == 'true'">1,</if>
+            <if test="container == 'true'">1,</if>
+            <if test="pipe == 'true'">1,</if>
+            <if test="alkylation == 'true'">1,</if>
+            <if test="recertificatedate != null">#{recertificatedate},</if>
+            <if test="validity != null">#{validity},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="pipeIdnum != null">#{pipeIdnum},</if>
+            <if test="alkylationIdnum != null">#{alkylationIdnum},</if>
+            <if test="pipeDate != null">#{pipeDate},</if>
+            <if test="alkylationDate != null">#{alkylationDate},</if>
+            <if test="containerDate != null">#{containerDate},</if>
+            <if test="boilerIdnum != null">#{boilerIdnum},</if>
+            <if test="boilerDate != null">#{boilerDate},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTByxWorklicense" parameterType="TByxWorklicense">
+        update t_byx_worklicense
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="plantCode != null and plantCode != ''">plant_code = #{plantCode},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="employeeid != null">employeeid = #{employeeid},</if>
+            <if test="classes != null">classes = #{classes},</if>
+            <if test="post != null">post = #{post},</if>
+            <if test="idtype != null">idtype = #{idtype},</if>
+            <if test="containerIdnum != null">container_idnum = #{containerIdnum},</if>
+            <if test="boiler == 'false'">boiler =0,</if>
+            <if test="container == 'false'">container =0,</if>
+            <if test="pipe == 'false'">pipe =0,</if>
+            <if test="alkylation == 'false'">alkylation =0,</if>
+            <if test="boiler == 'true'">boiler =1,</if>
+            <if test="container == 'true'">container =1,</if>
+            <if test="pipe == 'true'">pipe =1,</if>
+            <if test="alkylation == 'true'">alkylation =1,</if>
+            <if test="aromatic != null">aromatic = #{aromatic},</if>
+            <if test="recertificatedate != null">recertificatedate = #{recertificatedate},</if>
+            <if test="validity != null">validity = #{validity},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="pipeIdnum != null">pipe_idnum = #{pipeIdnum},</if>
+            <if test="alkylationIdnum != null">alkylation_idnum = #{alkylationIdnum},</if>
+            <if test="pipeDate != null">pipe_date = #{pipeDate},</if>
+            <if test="alkylationDate != null">alkylation_date = #{alkylationDate},</if>
+            <if test="containerDate != null">container_date = #{containerDate},</if>
+            <if test="boilerIdnum != null">boiler_idnum = #{boilerIdnum},</if>
+            <if test="boilerDate != null">boiler_date = #{boilerDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTByxWorklicenseById" parameterType="Long">
+        update t_byx_worklicense set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTByxWorklicenseByIds" parameterType="String">
+        update t_byx_Worklicense set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="selectLicenseData" resultType="com.ruoyi.project.common.domain.DataEntity">
+        SELECT count(1) as dataNum from t_byx_worklicense
+        <where>
+            <if test="type == 1">
+                and boiler = 1
+            </if>
+            <if test="type == 2">
+                and container = 1
+            </if>
+            <if test="type == 3">
+                and pipe = 1
+            </if>
+            <if test="type == 4">
+                and alkylation = 1
+            </if>
+        </where>
+    </select>
+
+
+</mapper>

ui/src/api/training/byxWorkcertificate.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询作业证书一览列表
+export function listByxWorkcertificate(query) {
+  return request({
+    url: '/training/byxWorkcertificate/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//作业数据
+export function cerData(query) {
+  return request({
+    url: '/training/byxWorkcertificate/cerData',
+    method: 'get',
+    params: query
+  })
+}
+// 查询作业证书一览详细
+export function getByxWorkcertificate(id) {
+  return request({
+    url: '/training/byxWorkcertificate/' + id,
+    method: 'get'
+  })
+}
+
+// 新增作业证书一览
+export function addByxWorkcertificate(data) {
+  return request({
+    url: '/training/byxWorkcertificate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改作业证书一览
+export function updateByxWorkcertificate(data) {
+  return request({
+    url: '/training/byxWorkcertificate',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除作业证书一览
+export function delByxWorkcertificate(id) {
+  return request({
+    url: '/training/byxWorkcertificate/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出作业证书一览
+export function exportByxWorkcertificate(query) {
+  return request({
+    url: '/training/byxWorkcertificate/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/training/byxWorklicense.js

@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 查询上岗证一览列表
+export function listByxWorklicense(query) {
+  return request({
+    url: '/training/byxWorklicense/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 培训成绩调用上岗证
+export function listTraining(query) {
+  return request({
+    url: '/training/byxWorklicense/listByxWorklicense',
+    method: 'get',
+    params: query
+  })
+}
+
+export function licenseData(query) {
+  return request({
+    url: '/training/byxWorklicense/licenseData',
+    method: 'get',
+    params: query
+  })
+}
+// 查询上岗证一览详细
+export function getByxWorklicense(id) {
+  return request({
+    url: '/training/byxWorklicense/' + id,
+    method: 'get'
+  })
+}
+
+// 新增上岗证一览
+export function addByxWorklicense(data) {
+  return request({
+    url: '/training/byxWorklicense',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改上岗证一览
+export function updateByxWorklicense(data) {
+  return request({
+    url: '/training/byxWorklicense',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除上岗证一览
+export function delByxWorklicense(id) {
+  return request({
+    url: '/training/byxWorklicense/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出上岗证一览
+export function exportByxWorklicense(query) {
+  return request({
+    url: '/training/byxWorklicense/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/training/byxWorkcertificate/index.vue

@@ -11,8 +11,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('监护人专项培训')" prop="boiler" label-width="50">
-        <el-checkbox v-model="queryParams.boiler" @change="handleQuery"   ></el-checkbox>
+      <el-form-item :label="$t('监护人专项培训')" prop="guardian" label-width="50">
+        <el-checkbox v-model="queryParams.guardian" @change="handleQuery"   ></el-checkbox>
       </el-form-item>
 <!--      <el-form-item :label="$t('加氢工艺')" prop="hydrogenation" label-width="50">
         <el-checkbox v-model="queryParams.hydrogenation" @change="handleQuery"   ></el-checkbox>
@@ -33,7 +33,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['training:workcertificate:add']"
+          v-hasPermi="['training:byxWorkcertificate:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -43,7 +43,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['training:workcertificate:edit']"
+          v-hasPermi="['training:byxWorkcertificate:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['training:workcertificate:remove']"
+          v-hasPermi="['training:byxWorkcertificate:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -62,7 +62,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['training:workcertificate:edit']"
+          v-hasPermi="['training:byxWorkcertificate:edit']"
         >{{ $t('导入') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -71,7 +71,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['training:workcertificate:export']"
+          v-hasPermi="['training:byxWorkcertificate:export']"
         >{{ $t('导出') }}</el-button>
       </el-col>
 <!--      <el-col :span="1.5">
@@ -91,7 +91,19 @@
       <el-table-column :label="$t('员工号')" align="center" prop="employeeid" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('班组')" align="center" prop="classes" :formatter="classesFormat" />
       <el-table-column :label="$t('移动式压力容器充装')" align="center" prop="container" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('消防设施操作')" align="center" prop="pipe" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件号')" align="center" prop="containerIdnum" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件有效期')" align="center" prop="containerDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.containerDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('消防设施操作')" align="center" prop="fireFacilities" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件号')" align="center" prop="fireFacilitiesIdnum" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件有效期')" align="center" prop="fireFacilitiesDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fireFacilitiesDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('身份证件号')" align="center" prop="idnum" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('复证日期')" align="center" prop="reviewdate" width="100">
         <template slot-scope="scope">
@@ -103,7 +115,8 @@
           <span>{{ parseTime(scope.row.pipevalidity, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('监护人专项培训')" align="center" prop="boiler" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('监护人专项培训')" align="center" prop="guardian" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件号')" align="center" prop="guardianIdnum" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('证书有效期')" align="center" prop="boilvalidity" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.boilvalidity, '{y}-{m}-{d}') }}</span>
@@ -169,14 +182,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['training:workcertificate:edit']"
+            v-hasPermi="['training:byxWorkcertificate:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['training:workcertificate:remove']"
+            v-hasPermi="['training:byxWorkcertificate:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>
@@ -191,8 +204,8 @@
     />
 
     <!-- 添加或修改作业证书一览对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item :label="$t('装置名称')" prop="plantCode">
           <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
             <el-option
@@ -222,8 +235,30 @@
         <el-form-item :label="$t('移动式压力容器充装')" prop="container">
           <el-input v-model="form.container" :placeholder="$t('请输入') + $t('移动式压力容器充装')" />
         </el-form-item>
-        <el-form-item :label="$t('消防设施操作')" prop="pipe">
-          <el-input v-model="form.pipe" :placeholder="$t('请输入') + $t('消防设施操作')" />
+        <el-form-item :label="$t('证件号')" prop="containerIdnum">
+          <el-input v-model="form.containerIdnum" :placeholder="$t('请输入') + $t('证件号')" />
+        </el-form-item>
+        <el-form-item :label="$t('证件有效期')" prop="containerDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.containerDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          :placeholder="$t('请选择') + $t('证件有效期')">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="$t('消防设施操作')" prop="fireFacilities">
+          <el-input v-model="form.fireFacilities" :placeholder="$t('请输入') + $t('消防设施操作')" />
+        </el-form-item>
+        <el-form-item :label="$t('证件号')" prop="fireFacilitiesIdnum">
+          <el-input v-model="form.fireFacilitiesIdnum" :placeholder="$t('请输入') + $t('证件号')" />
+        </el-form-item>
+        <el-form-item :label="$t('证件有效期')" prop="fireFacilitiesDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.fireFacilitiesDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          :placeholder="$t('请选择') + $t('证件有效期')">
+          </el-date-picker>
         </el-form-item>
         <el-form-item :label="$t('身份证件号')" prop="idnum">
           <el-input v-model="form.idnum" :placeholder="$t('请输入') + $t('员工姓名')" />
@@ -244,8 +279,11 @@
                           :placeholder="$t('请选择') + $t('证书有效期')">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('监护人专项培训')" prop="boiler">
-          <el-input v-model="form.boiler" :placeholder="$t('请输入') + $t('监护人专项培训')" />
+        <el-form-item :label="$t('监护人专项培训')" prop="guardian">
+          <el-input v-model="form.guardian" :placeholder="$t('请输入') + $t('监护人专项培训')" />
+        </el-form-item>
+        <el-form-item :label="$t('证件号')" prop="guardianIdnum">
+          <el-input v-model="form.guardianIdnum" :placeholder="$t('请输入') + $t('证件号')" />
         </el-form-item>
         <el-form-item :label="$t('证书有效期')" prop="boilvalidity">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -409,14 +447,13 @@
 
 <script>
 import {
-  listWorkcertificate,
-  getWorkcertificate,
-  delWorkcertificate,
-  addWorkcertificate,
-  updateWorkcertificate,
-  exportWorkcertificate,
-  exportByxWorkcertificate
-} from "@/api/training/workcertificate";
+  listByxWorkcertificate,
+  getByxWorkcertificate,
+  delByxWorkcertificate,
+  addByxWorkcertificate,
+  updateByxWorkcertificate,
+  exportByxWorkcertificate,
+} from "@/api/training/byxWorkcertificate";
   import { treeselect } from "@/api/system/dept";
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
@@ -424,7 +461,7 @@ import {
   import CertData from "./certData";
 
   export default {
-    name: "Workcertificate",
+    name: "byxWorkcertificate",
     components: {CertData, Treeselect },
     data() {
       return {
@@ -471,16 +508,14 @@ import {
           // 设置上传的请求头部
           headers: { Authorization: "Bearer " + getToken() },
           // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/training/workcertificate/byxImportData"
+          url: process.env.VUE_APP_BASE_API + "/training/byxWorkcertificate/importData"
         },
         // 查询参数
         queryParams: {
           pageNum: 1,
           pageSize: 20,
           classes: null,
-          boiler: null,
-          hydrogenation: null,
-          cracking: null,
+          guardian: null,
         },
         // 表单参数
         form: {},
@@ -519,7 +554,7 @@ import {
       /** 查询作业证书一览列表 */
       getList() {
         this.loading = true;
-        listWorkcertificate(this.queryParams).then(response => {
+        listByxWorkcertificate(this.queryParams).then(response => {
           this.workcertificateList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -553,11 +588,11 @@ import {
           employeeid: null,
           classes: null,
           container: null,
-          pipe: null,
+          fireFacilities: null,
           idnum: null,
           reviewdate: null,
           pipevalidity: null,
-          boiler: null,
+          guardian: null,
           boilvalidity: null,
           hydrogenation: null,
           hydvalidity: null,
@@ -607,7 +642,7 @@ import {
       handleUpdate(row) {
         this.reset();
         const id = row.id || this.ids
-        getWorkcertificate(id).then(response => {
+        getByxWorkcertificate(id).then(response => {
           this.form = response.data;
           this.open = true;
           this.title = this.$t('修改') + this.$t('作业证书一览');
@@ -618,13 +653,13 @@ import {
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {
-              updateWorkcertificate(this.form).then(response => {
+              updateByxWorkcertificate(this.form).then(response => {
                 this.msgSuccess(this.$t('修改成功'));
                 this.open = false;
                 this.getList();
               });
             } else {
-              addWorkcertificate(this.form).then(response => {
+              addByxWorkcertificate(this.form).then(response => {
                 this.msgSuccess(this.$t('新增成功'));
                 this.open = false;
                 this.getList();
@@ -641,7 +676,7 @@ import {
           cancelButtonText: this.$t('取消'),
           type: "warning"
         }).then(function() {
-          return delWorkcertificate(ids);
+          return delByxWorkcertificate(ids);
         }).then(() => {
           this.getList();
           this.msgSuccess(this.$t('删除成功'));

ui/src/views/training/byxWorklicense/index.vue

@@ -23,14 +23,14 @@
       <el-form-item :label="$t('裂解(裂化)')" prop="boiler" label-width="50">
         <el-checkbox v-model="queryParams.boiler" @change="handleQuery"   ></el-checkbox>
       </el-form-item>
-      <el-form-item :label="$t('压力容器')" prop="cracking" label-width="50">
-        <el-checkbox v-model="queryParams.cracking" @change="handleQuery"   ></el-checkbox>
+      <el-form-item :label="$t('压力容器')" prop="container" label-width="50">
+        <el-checkbox v-model="queryParams.container" @change="handleQuery"   ></el-checkbox>
       </el-form-item>
-      <el-form-item :label="$t('压力管道')" prop="hotarea" label-width="50">
-        <el-checkbox v-model="queryParams.hotarea" @change="handleQuery"   ></el-checkbox>
+      <el-form-item :label="$t('压力管道')" prop="pipe" label-width="50">
+        <el-checkbox v-model="queryParams.pipe" @change="handleQuery"   ></el-checkbox>
       </el-form-item>
-      <el-form-item label="烷基化" prop="coldarea" label-width="50">
-        <el-checkbox v-model="queryParams.coldarea" @change="handleQuery"   ></el-checkbox>
+      <el-form-item label="烷基化" prop="alkylation" label-width="50">
+        <el-checkbox v-model="queryParams.alkylation" @change="handleQuery"   ></el-checkbox>
       </el-form-item>
       <el-form-item :label="$t('无')+$t('空格')+$t('上岗证')" prop="notHave" label-width="50">
         <el-checkbox v-model="queryParams.notHave" @change="handleQuery"   ></el-checkbox>
@@ -51,7 +51,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['training:worklicense:add']"
+          v-hasPermi="['training:byxWorklicense:add']"
         >{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -61,7 +61,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['training:worklicense:edit']"
+          v-hasPermi="['training:byxWorklicense:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -71,7 +71,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['training:worklicense:remove']"
+          v-hasPermi="['training:byxWorklicense:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -80,7 +80,7 @@
 <!--                  icon="el-icon-upload2"-->
 <!--                  size="mini"-->
 <!--                  @click="handleImport"-->
-<!--                  v-hasPermi="['training:worklicense:edit']"-->
+<!--                  v-hasPermi="['training:byxWorklicense:edit']"-->
 <!--          >{{ $t('导入') }}</el-button>-->
 <!--      </el-col>-->
       <el-col :span="1.5">
@@ -89,7 +89,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['training:worklicense:export']"
+          v-hasPermi="['training:byxWorklicense:export']"
         >{{ $t('导出') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -110,26 +110,26 @@
       <el-table-column :label="$t('班组')" align="center" prop="classes" :formatter="classesFormat" />
       <el-table-column :label="$t('职务')" align="center" prop="post" width="150" :formatter="actualpostFormat"/>
       <el-table-column :label="$t('证件类型')" align="center" prop="idtype" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('证件号')" align="center" prop="crackingIdnum" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('证件号')" align="center" prop="containerIdnum" width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('裂解（裂化）')" align="center" prop="boiler" :formatter="boilerFormat">
         <template slot-scope="scope">
           <span> {{boilerFormat(scope.row)}}</span>
           <el-button v-if="boilerFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-boiler')"  circle></el-button>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('压力容器')" align="center" prop="cracking" :formatter="crackingFormat">
+      <el-table-column :label="$t('压力容器')" align="center" prop="container" :formatter="crackingFormat">
         <template slot-scope="scope">
           <span> {{crackingFormat(scope.row)}}</span>
           <el-button v-if="crackingFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-compression')"  circle></el-button>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('压力管道')" align="center" prop="hotarea" :formatter="hotareaFormat">
+      <el-table-column :label="$t('压力管道')" align="center" prop="pipe" :formatter="hotareaFormat">
         <template slot-scope="scope">
           <span> {{hotareaFormat(scope.row)}}</span>
           <el-button v-if="hotareaFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-separation')" circle></el-button>
         </template>
       </el-table-column>
-      <el-table-column label="烷基化" align="center" prop="coldarea" width="100" :formatter="coldareaFormat">
+      <el-table-column label="烷基化" align="center" prop="alkylation" width="100" :formatter="coldareaFormat">
         <template slot-scope="scope">
           <span> {{coldareaFormat(scope.row)}}</span>
           <el-button v-if="coldareaFormat(scope.row) == 'YES'" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'worklicense-pguaeu')"  circle></el-button>
@@ -153,14 +153,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['training:worklicense:edit']"
+            v-hasPermi="['training:byxWorklicense:edit']"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['training:worklicense:remove']"
+            v-hasPermi="['training:byxWorklicense:remove']"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>
@@ -216,8 +216,8 @@
         <el-form-item :label="$t('证件类型')" prop="idtype">
           <el-input v-model="form.idtype" :placeholder="$t('请输入') + $t('证件类型')" />
         </el-form-item>
-        <el-form-item :label="$t('证件号')" prop="crackingIdnum">
-          <el-input v-model="form.crackingIdnum" :placeholder="$t('请输入') +$t('证件号') " />
+        <el-form-item :label="$t('证件号')" prop="containerIdnum">
+          <el-input v-model="form.containerIdnum" :placeholder="$t('请输入') +$t('证件号') " />
         </el-form-item>
         <el-row>
           <el-col :span="6">
@@ -226,18 +226,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :label="$t('压力容器')" prop="cracking">
-              <el-checkbox v-model="form.cracking" @change="changeCracking()"></el-checkbox>
+            <el-form-item :label="$t('压力容器')" prop="container">
+              <el-checkbox v-model="form.container" @change="changeCracking()"></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :label="$t('压力管道')" prop="hotarea">
-              <el-checkbox v-model="form.hotarea" @change="changeHotarea()"></el-checkbox>
+            <el-form-item :label="$t('压力管道')" prop="pipe">
+              <el-checkbox v-model="form.pipe" @change="changeHotarea()"></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="烷基化" prop="coldarea">
-              <el-checkbox v-model="form.coldarea" @change="changeColdarea()"></el-checkbox>
+            <el-form-item label="烷基化" prop="alkylation">
+              <el-checkbox v-model="form.alkylation" @change="changeColdarea()"></el-checkbox>
             </el-form-item>
           </el-col>
         </el-row>
@@ -407,14 +407,13 @@
 
 <script>
 import {
-  listWorklicense,
-  getWorklicense,
-  delWorklicense,
-  addWorklicense,
-  updateWorklicense,
-  exportWorklicense,
-  exportByxWorklicense
-} from "@/api/training/worklicense";
+  listByxWorklicense,
+  getByxWorklicense,
+  delByxWorklicense,
+  addByxWorklicense,
+  updateByxWorklicense,
+  exportByxWorklicense,
+} from "@/api/training/byxWorklicense";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -423,7 +422,7 @@ import LicenseData from "./licenseData";
 import {addCommonfile, allFileList, delCommonfile, updateCommonfile} from "@/api/common/commonfile";
 
 export default {
-  name: "Worklicense",
+  name: "ByxWorklicense",
   components: {LicenseData, Treeselect},
   data() {
     return {
@@ -468,7 +467,7 @@ export default {
       upload: {
         downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
         //下载模板类型
-        type: "worklicense",
+        type: "byxWorklicense",
         // 是否显示弹出层（用户导入）
         open: false,
         // 弹出层标题（用户导入）
@@ -480,7 +479,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/training/worklicense/importData"
+        url: process.env.VUE_APP_BASE_API + "/training/ByxWorklicense/importData"
       },
       // 报告附件参数
       doc: {
@@ -524,9 +523,9 @@ export default {
         name: null,
         classes: null,
         boiler: null,
-        cracking: null,
-        hotarea: null,
-        coldarea: null,
+        container: null,
+        pipe: null,
+        alkylation: null,
         notHave: null,
         expiring: null
       },
@@ -587,7 +586,7 @@ export default {
     /** 查询上岗证一览列表 */
     getList() {
       this.loading = true;
-      listWorklicense(this.queryParams).then(response => {
+      listByxWorklicense(this.queryParams).then(response => {
         this.worklicenseList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -629,15 +628,15 @@ export default {
     },
     // 压缩字典翻译
     crackingFormat(row, column) {
-      return this.selectDictLabel(this.crackingOptions, row.cracking);
+      return this.selectDictLabel(this.crackingOptions, row.container);
     },
     // 分离字典翻译
     hotareaFormat(row, column) {
-      return this.selectDictLabel(this.hotareaOptions, row.hotarea);
+      return this.selectDictLabel(this.hotareaOptions, row.pipe);
     },
     // PGU/AEU字典翻译
     coldareaFormat(row, column) {
-      return this.selectDictLabel(this.coldareaOptions, row.coldarea);
+      return this.selectDictLabel(this.coldareaOptions, row.alkylation);
     },
     // 取消按钮
     cancel() {
@@ -654,11 +653,11 @@ export default {
         classes: null,
         post: null,
         idtype: null,
-        crackingIdnum: null,
+        containerIdnum: null,
         boiler: null,
-        cracking: null,
-        hotarea: null,
-        coldarea: null,
+        container: null,
+        pipe: null,
+        alkylation: null,
         aromatic: null,
         recertificatedate: null,
         validity: null,
@@ -705,16 +704,16 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getWorklicense(id).then(response => {
+      getByxWorklicense(id).then(response => {
         this.form = response.data;
         if (response.data.boiler == 1) { this.form.boiler = true; this.boilerDisplay = true }
         if (response.data.boiler == 0) { this.form.boiler = false; this.boilerDisplay = false }
-        if (response.data.cracking == 1) { this.form.cracking = true; this.compressionDisplay = true }
-        if (response.data.cracking == 0) { this.form.cracking = false; this.compressionDisplay = false }
-        if (response.data.hotarea == 1) { this.form.hotarea = true; this.separationDisplay = true }
-        if (response.data.hotarea == 0) { this.form.hotarea = false; this.separationDisplay = false }
-        if (response.data.coldarea == 1) { this.form.coldarea = true; this.pguaeuDisplay = true }
-        if (response.data.coldarea == 0) { this.form.coldarea = false; this.pguaeuDisplay = false }
+        if (response.data.container == 1) { this.form.container = true; this.compressionDisplay = true }
+        if (response.data.container == 0) { this.form.container = false; this.compressionDisplay = false }
+        if (response.data.pipe == 1) { this.form.pipe = true; this.separationDisplay = true }
+        if (response.data.pipe == 0) { this.form.pipe = false; this.separationDisplay = false }
+        if (response.data.alkylation == 1) { this.form.alkylation = true; this.pguaeuDisplay = true }
+        if (response.data.alkylation == 0) { this.form.alkylation = false; this.pguaeuDisplay = false }
         this.open = true;
         this.title = this.$t('修改')  + this.$t('上岗证一览表');
       });
@@ -724,13 +723,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateWorklicense(this.form).then(response => {
+            updateByxWorklicense(this.form).then(response => {
               this.msgSuccess(this.$t('修改成功'));
               this.open = false;
               this.getList();
             });
           } else {
-            addWorklicense(this.form).then(response => {
+            addByxWorklicense(this.form).then(response => {
               this.msgSuccess(this.$t('新增成功'));
               this.open = false;
               this.getList();
@@ -747,7 +746,7 @@ export default {
           cancelButtonText: this.$t('取消'),
           type: "warning"
         }).then(function() {
-          return delWorklicense(ids);
+          return delByxWorklicense(ids);
         }).then(() => {
           this.getList();
           this.msgSuccess(this.$t('删除成功'));
@@ -809,7 +808,7 @@ export default {
     },
     //压缩修改
     changeCracking() {
-      if (this.form.cracking === true) {
+      if (this.form.container === true) {
         this.compressionDisplay = true
       }else {
         this.compressionDisplay = false
@@ -817,7 +816,7 @@ export default {
     },
     //分离修改
     changeHotarea() {
-      if (this.form.hotarea === true) {
+      if (this.form.pipe === true) {
         this.separationDisplay = true
       }else {
         this.separationDisplay = false
@@ -825,7 +824,7 @@ export default {
     },
     //PGU/AEU修改
     changeColdarea() {
-      if (this.form.coldarea === true) {
+      if (this.form.alkylation === true) {
         this.pguaeuDisplay = true
       }else {
         this.pguaeuDisplay = false
@@ -835,13 +834,13 @@ export default {
     handleDoc(row , fileType) {
       var workType = "";
       if (fileType === "worklicense-boiler"){
-        workType = this.$t('裂解');
+        workType = this.$t('裂解(裂化)');
       }else if (fileType === "worklicense-compression"){
-        workType = this.$t('压缩');
+        workType = this.$t('压力容器');
       }else if (fileType === "worklicense-separation"){
-        workType = this.$t('分离');
+        workType = this.$t('压力管道');
       }else if (fileType === "worklicense-pguaeu"){
-        workType = "PGU/AEU";
+        workType = this.$t('烷基化');
       }
       this.doc.pType = fileType
       this.doc.queryParams.pType = fileType

ui/src/views/training/byxWorklicense/licenseData.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import {licensebyxData, licenseData} from "@/api/training/worklicense";
+import {licenseData} from "@/api/training/byxWorklicense";
 
   export default {
     props: {
@@ -81,7 +81,7 @@ import {licensebyxData, licenseData} from "@/api/training/worklicense";
     },
     mounted() {
       this.$nextTick(() => {
-        licensebyxData(this.queryParams).then(response => {
+        licenseData(this.queryParams).then(response => {
           this.chartData = response
           for(let i = 0 ; i <this.chartData.length ; i++){
             if(this.chartData[i].dataName!= null && this.chartData[i].dataName!= ''){