目录增加生成证照目录Excel导入文件模板接口

certificate-manager/doc/api.md

@@ -691,6 +691,7 @@ data|object|数据对象
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
   deviceId|Long|打印设备Id
+  excelFile|String|批量导入模板文件地址
 dict|object|字典对象
 
 **响应消息样例:**
@@ -751,6 +752,7 @@ data|object|数据对象
  updateUserId|Long|更新用户
  updateTime|Date|更新时间
  deviceId|Long|打印设备Id
+ excelFile|String|批量导入模板文件地址
 dict|object|字典对象
 
 **响应消息样例:**
@@ -866,6 +868,7 @@ data|object|数据对象
   updateUserId|Long|更新用户
   updateTime|Date|更新时间
   deviceId|Long|打印设备Id
+  excelFile|String|批量导入模板文件地址
 
 **响应消息样例:**
 ```
@@ -913,6 +916,45 @@ msg|String|消息|-
 }
 
 ```
+### 生成证照目录Excel导入文件
+
+**请求URL:** certificate/catalog/generate/excel
+
+**请求方式:** GET
+
+**内容类型:** application/json;charset=utf-8
+
+**简要描述:** 生成证照目录Excel导入文件
+
+**请求参数:**
+
+参数名称|类型|必填|描述
+:---|:---|:---|:------
+id|Long|是|ID
+
+**请求样例:**
+```
+    http://localhost/certificate/catalog/generate/excel?id=549
+```
+**响应参数:**
+
+参数名称 |参数类型|描述
+:---|:---|:-------
+code|Integer|结果码（-1.失败，1.成功）
+msg|String|消息
+data|object|数据对象
+
+**响应消息样例:**
+```
+{
+    "msg":"生成证照目录Excel导入文件成功",
+    "code":1,
+    "data":{}
+    }
+}
+
+```
+
 ## 证照柜设备
 
 ### 查询证照柜设备列表

certificate-manager/src/main/java/com/mortals/xhx/common/utils/ExcelUtil.java

+package com.mortals.xhx.common.utils;
+
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.DataValidation;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.usermodel.DataValidationHelper;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddressList;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+
+public class ExcelUtil {
+
+    /**
+     * @Title: createExcelTemplate
+     * @Description: 生成Excel导入模板
+     * @param @param filePath  Excel文件路径
+     * @param @param handers   Excel列标题(数组)
+     * @param @param downData  下拉框数据(数组)
+     * @param @param downRows  下拉列的序号(数组,序号从0开始)
+     * @return void
+     * @throws
+     */
+    public static void createExcelTemplate(String filePath, String[] title, List<String[]> downData, String[] downRows){
+        HSSFWorkbook wb = new HSSFWorkbook();//创建工作薄
+        //表头样式
+        HSSFCellStyle style = wb.createCellStyle();
+        // 创建一个居中格式
+        // style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        //字体样式
+        HSSFFont fontStyle = wb.createFont();
+        fontStyle.setFontName("微软雅黑");
+        fontStyle.setFontHeightInPoints((short)12);
+        // fontStyle.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+        style.setFont(fontStyle);
+
+        // 新建sheet
+        HSSFSheet sheet1 = wb.createSheet("Sheet1");
+        HSSFSheet sheet2 = wb.createSheet("Sheet2");
+        HSSFSheet sheet3 = wb.createSheet("Sheet3");
+
+        // 生成sheet1内容
+        // 第一个sheet的第一行为标题
+        HSSFRow rowFirst = sheet1.createRow(0);
+        // 写标题
+        for(int i=0;i<title.length;i++){
+            // 获取第一行的每个单元格
+            HSSFCell cell = rowFirst.createCell(i);
+            // 设置每列的列宽
+            sheet1.setColumnWidth(i, 4000);
+            //加样式
+            cell.setCellStyle(style);
+            // 往单元格里写数据
+            cell.setCellValue(title[i]);
+        }
+
+        // 设置下拉框数据
+        String[] arr = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
+        int index = 0;
+        HSSFRow row = null;
+        for(int r=0;r<downRows.length;r++){
+            // 获取下拉对象
+            String[] dlData = downData.get(r);
+            int rownum = Integer.parseInt(downRows[r]);
+            // 255以内的下拉
+            if(dlData.length<5){
+                // 255以内的下拉,参数分别是：作用的sheet、下拉内容数组、起始行、终止行、起始列、终止列
+                sheet1.addValidationData(setDataValidation(sheet1, dlData, 1, 500, rownum ,rownum)); //超过255个报错
+            } else {
+                // 255以上的下拉，即下拉列表元素很多的情况
+                // 1、设置有效性
+                // Sheet2第A1到A5000作为下拉列表来源数据
+                // String strFormula = "Sheet2!$A$1:$A$5000" ;
+                // Sheet2第A1到A5000作为下拉列表来源数据
+                String strFormula = "Sheet2!$"+arr[index]+"$1:$"+arr[index]+"$5000";
+                // 设置每列的列宽
+                sheet2.setColumnWidth(r, 4000);
+                // 设置数据有效性加载在哪个单元格上,参数分别是：从sheet2获取A1到A5000作为一个下拉的数据、起始行、终止行、起始列、终止列
+                //下拉列表元素很多的情况
+                sheet1.addValidationData(SetDataValidation(strFormula, 1, 50000, rownum, rownum));
+
+                //2、生成sheet2内容
+                for(int j=0;j<dlData.length;j++){
+                    if(index==0){ //第1个下拉选项，直接创建行、列
+                        // 创建数据行
+                        row = sheet2.createRow(j);
+                        // 设置每列的列宽
+                        sheet2.setColumnWidth(j, 4000);
+                        // 设置对应单元格的值
+                        row.createCell(0).setCellValue(dlData[j]);
+
+                    } else { //非第1个下拉选项
+
+                        int rowCount = sheet2.getLastRowNum();
+                        //System.out.println("========== LastRowNum =========" + rowCount);
+                        // 前面创建过的行，直接获取行，创建列
+                        if(j<=rowCount){
+                            // 获取行，创建列
+                            // 设置对应单元格的值
+                            sheet2.getRow(j).createCell(index).setCellValue(dlData[j]);
+
+                        } else { //未创建过的行，直接创建行、创建列
+                            // 设置每列的列宽
+                            sheet2.setColumnWidth(j, 4000);
+                            // 创建行、创建列
+                            // 设置对应单元格的值
+                            sheet2.createRow(j).createCell(index).setCellValue(dlData[j]);
+                        }
+                    }
+                }
+                index++;
+            }
+        }
+
+        try {
+
+            File f = new File(filePath); //写文件
+
+            //不存在则新增
+            if(!f.getParentFile().exists()){
+                f.getParentFile().mkdirs();
+            }
+            if(!f.exists()){
+                f.createNewFile();
+            }
+
+            FileOutputStream out = new FileOutputStream(f);
+            out.flush();
+            wb.write(out);
+            out.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     *
+     * @Title: SetDataValidation
+     * @Description: 下拉列表元素很多的情况 (255以上的下拉)
+     * @param @param strFormula
+     * @param @param firstRow   起始行
+     * @param @param endRow     终止行
+     * @param @param firstCol   起始列
+     * @param @param endCol     终止列
+     * @param @return
+     * @return HSSFDataValidation
+     * @throws
+     */
+    private static HSSFDataValidation SetDataValidation(String strFormula, int firstRow, int endRow, int firstCol, int endCol) {
+        // 设置数据有效性加载在哪个单元格上。四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        DVConstraint constraint = DVConstraint.createFormulaListConstraint(strFormula);
+        HSSFDataValidation dataValidation = new HSSFDataValidation(regions,constraint);
+
+        dataValidation.createErrorBox("Error", "Error");
+        dataValidation.createPromptBox("", null);
+        return dataValidation;
+    }
+
+    /**
+     *
+     * @Title: setDataValidation
+     * @Description: 下拉列表元素不多的情况(255以内的下拉)
+     * @param @param sheet
+     * @param @param textList
+     * @param @param firstRow
+     * @param @param endRow
+     * @param @param firstCol
+     * @param @param endCol
+     * @param @return
+     * @return DataValidation
+     * @throws
+     */
+    private static DataValidation setDataValidation(Sheet sheet, String[] textList, int firstRow, int endRow, int firstCol, int endCol) {
+
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        //加载下拉列表内容
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(textList);
+        //DVConstraint constraint = new DVConstraint();
+        constraint.setExplicitListValues(textList);
+
+        //设置数据有效性加载在哪个单元格上。四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow,firstCol, endCol);
+        //数据有效性对象
+        DataValidation data_validation = helper.createValidation(constraint, regions);
+        //DataValidation data_validation = new DataValidation(regions, constraint);
+        return data_validation;
+    }
+
+    /**
+     * @Title: delFile
+     * @Description: 删除文件
+     * @param @param filePath  文件路径
+     * @return void
+     * @throws
+     */
+    public static void delFile(String filePath) {
+        java.io.File delFile = new java.io.File(filePath);
+        delFile.delete();
+    }
+
+}

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogEntity.java

@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.certificate.model.vo.CertificateCatalogVo;
 /**
-* 证照目录实体对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照目录实体对象
+ *
+ * @author zxfei
+ * @date 2022-11-08
+ */
 
 public class CertificateCatalogEntity extends CertificateCatalogVo {
     private static final long serialVersionUID = 1L;
@@ -84,6 +84,10 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
      * 打印设备Id
      */
     private Long deviceId;
+    /**
+     * 批量导入模板文件地址
+     */
+    private String excelFile;
 
 
 
@@ -326,6 +330,20 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
     public void setDeviceId(Long deviceId){
         this.deviceId = deviceId;
     }
+    /**
+     * 获取 批量导入模板文件地址
+     * @return String
+     */
+    public String getExcelFile(){
+        return excelFile;
+    }
+    /**
+     * 设置 批量导入模板文件地址
+     * @param excelFile
+     */
+    public void setExcelFile(String excelFile){
+        this.excelFile = excelFile;
+    }
 
 
 
@@ -365,6 +383,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         sb.append(",printerIp:").append(getPrinterIp());
         sb.append(",paperSource:").append(getPaperSource());
         sb.append(",deviceId:").append(getDeviceId());
+        sb.append(",excelFile:").append(getExcelFile());
         return sb.toString();
     }
 
@@ -403,5 +422,7 @@ public class CertificateCatalogEntity extends CertificateCatalogVo {
         this.paperSource = "";
 
         this.deviceId = null;
+
+        this.excelFile = "";
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/CertificateCatalogQuery.java

@@ -3,11 +3,11 @@ package com.mortals.xhx.module.certificate.model;
 import java.util.List;
 import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 /**
-* 证照目录查询对象
-*
-* @author zxfei
-* @date 2022-11-04
-*/
+ * 证照目录查询对象
+ *
+ * @author zxfei
+ * @date 2022-11-08
+ */
 public class CertificateCatalogQuery extends CertificateCatalogEntity {
     /** 开始 序号，主键，自增长 */
     private Long idStart;
@@ -180,6 +180,9 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
     /** 打印设备Id列表 */
     private List <Long> deviceIdList;
 
+    /** 批量导入模板文件地址 */
+    private List<String> excelFileList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CertificateCatalogQuery> orConditionList;
 
@@ -1091,6 +1094,21 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
         this.deviceIdList = deviceIdList;
     }
 
+    /**
+     * 获取 批量导入模板文件地址
+     * @return excelFileList
+     */
+    public List<String> getExcelFileList(){
+        return this.excelFileList;
+    }
+
+    /**
+     * 设置 批量导入模板文件地址
+     * @param excelFileList
+     */
+    public void setExcelFileList(List<String> excelFileList){
+        this.excelFileList = excelFileList;
+    }
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1759,6 +1777,25 @@ public class CertificateCatalogQuery extends CertificateCatalogEntity {
         return this;
     }
 
+
+    /**
+     * 设置 批量导入模板文件地址
+     * @param excelFile
+     */
+    public CertificateCatalogQuery excelFile(String excelFile){
+        setExcelFile(excelFile);
+        return this;
+    }
+
+    /**
+     * 设置 批量导入模板文件地址
+     * @param excelFileList
+     */
+    public CertificateCatalogQuery excelFileList(List<String> excelFileList){
+        this.excelFileList = excelFileList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/CertificateCatalogService.java

 package com.mortals.xhx.module.certificate.service;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 /**
@@ -11,4 +12,9 @@ import com.mortals.xhx.module.certificate.model.CertificateCatalogEntity;
 */
 public interface CertificateCatalogService extends ICRUDService<CertificateCatalogEntity,Long>{
 
+    /**
+     * 生成excel批量导入模板
+     * @param id
+     */
+    void generateExcel(Long id, Context context);
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateCatalogServiceImpl.java

@@ -14,6 +14,7 @@ import com.mortals.xhx.common.code.ComponentEnum;
 import com.mortals.xhx.common.code.StatusEnum;
 import com.mortals.xhx.common.formdesign.*;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
+import com.mortals.xhx.common.utils.ExcelUtil;
 import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
 import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
@@ -69,7 +70,8 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
         }
         entity.setStatus(StatusEnum.ENABLE.getValue());
         if(StringUtils.isNotEmpty(entity.getTemplateUrl())){
-            entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
+            //entity.setFormContent(parseDocxToJson(entity.getTemplateUrl()));
+            parseDocxToJson(entity,false);
         }
 
     }
@@ -106,9 +108,9 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
         }
     }
 
-    private String parseDocxToJson(String templatePath) {
+    private void parseDocxToJson(CertificateCatalogEntity entity,boolean onlyExcel) {
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
-        String filepath = rootPath + templatePath;
+        String filepath = rootPath + entity.getTemplateUrl();
         ConfigureBuilder builder = Configure.builder();
 
         builder.setValidErrorHandler(new Configure.DiscardHandler());
@@ -122,6 +124,16 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
         root.setConfig(config);
         List<ListItem> collect = new ArrayList<>();
         HashSet<String> hs = new HashSet<>(); //去除重复标签
+        List<String> excelList = new ArrayList<>();      //Excel模板
+        excelList.add("证照目录ID");
+        excelList.add("证照编号");
+        excelList.add("证照名称");
+        excelList.add("颁发时间");
+        excelList.add("取件人姓名");
+        excelList.add("取件人证件号码");
+        excelList.add("持有者名称");
+        excelList.add("持有者证件号码");
+        excelList.add("企业名称");
         for (MetaTemplate item : template.getElementTemplates()) {
             if(hs.contains(item.variable())){
                 continue;
@@ -130,6 +142,7 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
             }
             //识别简单输入
             String val = StrUtil.strip(item.variable(), "{{", "}}");
+            excelList.add(val);
             List<String> keys = StrSplitter.split(val, "_", true, true);
             //切分分隔符后动态 创建组件  i_1_姓名（第一个代表类型，第二个如果是多个累加，第三个显示label）
             if (keys.size() > 2) {
@@ -180,6 +193,33 @@ public class CertificateCatalogServiceImpl extends AbstractCRUDServiceImpl<Certi
             }
         }
         root.setList(collect);
-        return JSON.toJSONString(root);
+        String fileName = "file/uploadfile/excel/"+entity.getCatalogName()+"_批量导入模板.xls";
+        String excelFilePath = rootPath + fileName;
+        List<String[]> downData = new ArrayList();
+        String [] downRows = {};
+        ExcelUtil.createExcelTemplate(excelFilePath, excelList.toArray(new String[excelList.size()]), downData, downRows);
+        entity.setExcelFile(fileName);
+        if(!onlyExcel) {
+            entity.setFormContent(JSON.toJSONString(root));
+        }
+    }
+
+    public static void  main(String[] args){
+        String excelFilePath = "D:/mortals/app/data/cpm/" + "excel/test.xls";
+        List<String> excelList = new ArrayList<>();
+        excelList.add("i_1_姓名");
+        excelList.add("i_2_性别");
+        excelList.add("i_3_年龄");
+        excelList.add("i_4_证件编号");
+        excelList.add("i_5_证件名称");
+        List<String[]> downData = new ArrayList();
+        String [] downRows = {};
+        ExcelUtil.createExcelTemplate(excelFilePath, excelList.toArray(new String[excelList.size()]), downData, downRows);
+    }
+
+    @Override
+    public void generateExcel(Long id, Context context) {
+        CertificateCatalogEntity entity = dao.get(id);
+        parseDocxToJson(entity,true);
     }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/CertificateClassifyServiceImpl.java

@@ -54,7 +54,7 @@ public class CertificateClassifyServiceImpl extends AbstractCRUDServiceImpl<Cert
     @Override
     public void setShowFront(List<Long> ids, int showFront) throws AppException {
         if(CollectionUtils.isEmpty(ids)){
-            throw new AppException("分类主键List不能为空");
+            ids.add(-1L);
         }
         Map<String,Object> condition = new HashMap<>();
         condition.put("idList",ids);

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/web/CertificateCatalogController.java

 package com.mortals.xhx.module.certificate.web;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
@@ -52,5 +53,30 @@ public class CertificateCatalogController extends BaseCRUDJsonBodyMappingControl
         super.init(model, context);
     }
 
-
+    @RequestMapping(value = {"generate/excel"},method = {RequestMethod.POST, RequestMethod.GET})
+    @UnAuth
+    public String generateExcel(Long id) {
+        Map<String, Object> model = new HashMap();
+        if (id == null) {
+            return this.createFailJsonResp("请选择待处理" + this.getModuleDesc() + "信息");
+        } else {
+            JSONObject ret = new JSONObject();
+            String busiDesc = "生成Excel导入模板";
+            Context context = this.getContext();
+            try {
+                this.service.generateExcel(id, context);
+                model.put("message_info", busiDesc + "成功");
+                this.recordSysLog(this.request, busiDesc + " 【成功】");
+            } catch (Exception var8) {
+                this.doException(this.request, busiDesc, model, var8);
+                Object msg = model.get("message_info");
+                return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+            }
+            this.init(model, context);
+            ret.put("data", model);
+            ret.put("code", 1);
+            ret.put("msg", model.remove("message_info"));
+            return ret.toJSONString();
+        }
+    }
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/record/web/ApplyLogController.java

@@ -115,6 +115,7 @@ public class ApplyLogController extends BaseCRUDJsonBodyMappingController<ApplyL
             ret.setCode(VALUE_RESULT_SUCCESS);
             ret.setMsg("查询档案成功");
             ret.setData(list);
+            this.recordSysLog(this.request,  " 查询档案成功【成功】");
         } catch (Exception e) {
             log.error("查询档案异常", e);
             ret.setCode(VALUE_RESULT_FAILURE);

certificate-manager/src/main/resources/sqlmap/module/certificate/CertificateCatalogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.certificate.dao.ibatis.CertificateCatalogDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -27,6 +27,7 @@
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
         <result property="deviceId" column="deviceId" />
+        <result property="excelFile" column="excelFile" />
 
     </resultMap>
 
@@ -100,23 +101,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
                 a.deviceId,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('excelFile') or colPickMode == 1 and data.containsKey('excelFile')))">
+                a.excelFile,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CertificateCatalogEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_certificate_catalog
-        (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId)
+        (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile)
         VALUES
-        (#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{templateName},#{templateUrl},#{formContent},#{exampleUrl},#{status},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceId})
+        (#{catalogName},#{catalogCode},#{holderType},#{industryId},#{classifyId},#{transverse},#{portrait},#{inspect},#{templateName},#{templateUrl},#{formContent},#{exampleUrl},#{status},#{printerName},#{printerIp},#{paperSource},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceId},#{excelFile})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_certificate_catalog
-        (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId)
+        (catalogName,catalogCode,holderType,industryId,classifyId,transverse,portrait,inspect,templateName,templateUrl,formContent,exampleUrl,status,printerName,printerIp,paperSource,createUserId,createTime,updateUserId,updateTime,deviceId,excelFile)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.templateName},#{item.templateUrl},#{item.formContent},#{item.exampleUrl},#{item.status},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceId})
+            (#{item.catalogName},#{item.catalogCode},#{item.holderType},#{item.industryId},#{item.classifyId},#{item.transverse},#{item.portrait},#{item.inspect},#{item.templateName},#{item.templateUrl},#{item.formContent},#{item.exampleUrl},#{item.status},#{item.printerName},#{item.printerIp},#{item.paperSource},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceId},#{item.excelFile})
         </foreach>
     </insert>
 
@@ -219,6 +223,9 @@
             <if test="(colPickMode==0 and data.containsKey('deviceIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceIdIncrement'))">
                 a.deviceId=ifnull(a.deviceId,0) + #{data.deviceIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('excelFile')) or (colPickMode==1 and !data.containsKey('excelFile'))">
+                a.excelFile=#{data.excelFile},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -428,6 +435,13 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="excelFile=(case" suffix="ELSE excelFile end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('excelFile')) or (colPickMode==1 and !item.containsKey('excelFile'))">
+                        when a.id=#{item.id} then #{item.excelFile}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -925,6 +939,21 @@
             ${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
         </if>
 
+
+        <if test="conditionParamRef.containsKey('excelFile')">
+            <if test="conditionParamRef.excelFile != null and conditionParamRef.excelFile != ''">
+                ${_conditionType_} a.excelFile like #{${_conditionParam_}.excelFile}
+            </if>
+            <if test="conditionParamRef.excelFile == null">
+                ${_conditionType_} a.excelFile is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('excelFileList')">
+            ${_conditionType_} a.excelFile in
+            <foreach collection="conditionParamRef.excelFileList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1048,6 +1077,11 @@
                     <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('excelFile')">
+                    a.excelFile
+                    <if test='orderCol.excelFile != null and "DESC".equalsIgnoreCase(orderCol.excelFile)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>