提交本地工具-标准拆分相关接口

adc-da-slrs/src/main/java/com/adc/da/common/ConvertHtml2Excel.java

@@ -0,0 +1,282 @@
+package com.adc.da.common;
+
+import com.adc.da.util.utils.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/2/26 10:10
+ */
+public class ConvertHtml2Excel {
+    /**
+     * html表格转excel
+     */
+    public static HSSFWorkbook table2Excel(String tableHtml, HSSFWorkbook wb, String sheetName) throws Exception {
+//        HSSFWorkbook wb = new HSSFWorkbook();
+        HSSFSheet sheet = wb.createSheet(sheetName);
+        List<Integer> moneyCols =new ArrayList<>();
+        moneyCols.add(1);
+        int headEndRow = 1;
+        List<CrossRangeCellMeta> crossRowEleMetaLs = new ArrayList<CrossRangeCellMeta>();
+        int rowIndex = 0;
+        try {
+            Document data = DocumentHelper.parseText(tableHtml);
+            HSSFCellStyle contentStyle = getContentStyle(wb);
+            // 生成表头
+            Element thead = data.getRootElement().element("thead");
+            HSSFCellStyle titleStyle = getTitleStyle(wb);
+            int ls = 0;//列数
+            if (thead != null) {
+                List<Element> trLs = thead.elements("tr");
+                for (Element trEle : trLs) {
+                    HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle;
+                    style.setWrapText(true);
+                    HSSFRow row = sheet.createRow(rowIndex);
+                    List<Element> thLs = trEle.elements("th");
+                    if(ls<thLs.size())
+                        ls = thLs.size();
+                    int cellIndex = makeRowCell(thLs, rowIndex, row, 0, style, crossRowEleMetaLs, true,moneyCols);
+                    List<Element> tdLs = trEle.elements("td");
+                    if(ls<ls+tdLs.size())
+                        ls = ls + tdLs.size();
+                    makeRowCell(tdLs, rowIndex, row, cellIndex, style, crossRowEleMetaLs, true,moneyCols);
+                    rowIndex++;
+                }
+            }
+
+            // 生成表体
+            Element tbody = data.getRootElement().element("tbody");
+            if (tbody != null) {
+                List<Element> trBody = tbody.elements("tr");
+                for (Element trEle : trBody) {
+                    HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle;
+                    style.setWrapText(true);
+                    HSSFRow row = sheet.createRow(rowIndex);
+                    List<Element> thLs = trEle.elements("th");
+                    if(ls<thLs.size())
+                        ls = thLs.size();
+                    int cellIndex = makeRowCell(thLs, rowIndex, row, 0, style, crossRowEleMetaLs, false,moneyCols);
+                    List<Element> tdLs = trEle.elements("td");
+                    if(ls<ls+tdLs.size())
+                        ls = ls + tdLs.size();
+                    makeRowCell(tdLs, rowIndex, row, cellIndex, style, crossRowEleMetaLs, false,moneyCols);
+                    rowIndex++;
+                }
+            }
+            // 生成表体
+            Element tfoot = data.getRootElement().element("tfoot");
+            if (tfoot != null) {
+                List<Element> trFoot = tfoot.elements("tr");
+                for (Element trEle : trFoot) {
+                    HSSFCellStyle style = rowIndex<=headEndRow?titleStyle:contentStyle;
+                    style.setWrapText(true);
+                    HSSFRow row = sheet.createRow(rowIndex);
+                    List<Element> thLs = trEle.elements("th");
+                    if(ls<thLs.size())
+                        ls = thLs.size();
+                    int cellIndex = makeRowCell(thLs, rowIndex, row, 0, style, crossRowEleMetaLs, false,moneyCols);
+                    List<Element> tdLs = trEle.elements("td");
+                    if(ls<ls+tdLs.size())
+                        ls = ls + tdLs.size();
+                    makeRowCell(tdLs, rowIndex, row, cellIndex, style, crossRowEleMetaLs, false,moneyCols);
+                    rowIndex++;
+                }
+            }
+            // 合并表头
+            for (CrossRangeCellMeta crcm : crossRowEleMetaLs) {
+                sheet.addMergedRegion(new CellRangeAddress(crcm.getFirstRow(), crcm.getLastRow(), crcm.getFirstCol(), crcm.getLastCol()));
+                HSSFCellStyle mergeStyle;
+                if (crcm.isInHead()) {
+                    mergeStyle = titleStyle;
+                } else {
+                    mergeStyle = contentStyle;
+                }
+                mergeStyle.setWrapText(true);
+                setRegionStyle(sheet, new CellRangeAddress(crcm.getFirstRow(), crcm.getLastRow(), crcm.getFirstCol(), crcm.getLastCol()), mergeStyle);
+            }
+            for (int i = 0; i < ls; i++) {
+                sheet.autoSizeColumn(i, true);//设置列宽
+                sheet.setColumnWidth(i,30*256);
+//                sheet.setColumnWidth(i,sheet.getColumnWidth(i)*15/10);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return wb;
+    }
+
+    /**
+     * 生产行内容
+     *
+     * @return 最后一列的cell index
+     */
+    /**
+     * @param tdLs              th或者td集合
+     * @param rowIndex          行号
+     * @param row               POI行对象
+     * @param startCellIndex
+     * @param cellStyle         样式
+     * @param crossRowEleMetaLs 跨行元数据集合
+     * @return
+     */
+    private static int makeRowCell(List<Element> tdLs, int rowIndex, HSSFRow row, int startCellIndex, HSSFCellStyle cellStyle,
+                                   List<CrossRangeCellMeta> crossRowEleMetaLs, boolean inHead, List<Integer> moneyCols) {
+        int i = startCellIndex;
+        for (int eleIndex = 0; eleIndex < tdLs.size(); i++, eleIndex++) {
+            int captureCellSize = getCaptureCellSize(rowIndex, i, crossRowEleMetaLs);
+            while (captureCellSize > 0) {
+                for (int j = 0; j < captureCellSize; j++) {// 当前行跨列处理（补单元格）
+                    row.createCell(i);
+                    i++;
+                }
+                captureCellSize = getCaptureCellSize(rowIndex, i, crossRowEleMetaLs);
+            }
+            Element thEle = tdLs.get(eleIndex);
+            String val = thEle.getText();
+            if (StringUtils.isEmpty(val)) {
+                Element e = thEle.element("a");
+                if (e != null) {
+                    val = e.getText();
+                }
+            }
+            HSSFCell c = row.createCell(i);
+            if (NumberUtils.isNumber(val)) {
+                if (moneyCols != null && moneyCols.contains(i)) {
+                    c.setCellType(CellType.STRING);
+                    c.setCellValue(val);
+                } else {
+                    c.setCellValue(Double.parseDouble(val));
+                    c.setCellType(CellType.STRING);
+                }
+
+            } else {
+                c.setCellType(CellType.STRING);
+                c.setCellValue(new HSSFRichTextString(val));
+            }
+            int rowSpan = NumberUtils.toInt(thEle.attributeValue("rowspan"), 1);
+            int colSpan = NumberUtils.toInt(thEle.attributeValue("colspan"), 1);
+            c.setCellStyle(cellStyle);
+            if (rowSpan > 1 || colSpan > 1) { // 存在跨行或跨列
+                crossRowEleMetaLs.add(new CrossRangeCellMeta(rowIndex, i, rowSpan, colSpan, inHead));
+            }
+            if (colSpan > 1) {// 当前行跨列处理（补单元格）
+                for (int j = 1; j < colSpan; j++) {
+                    i++;
+                    row.createCell(i);
+                }
+            }
+        }
+        return i;
+    }
+
+    /**
+     * 设置合并单元格的边框样式
+     *
+     * @param sheet
+     * @param region
+     * @param cs
+     */
+    public static void setRegionStyle(HSSFSheet sheet, CellRangeAddress region, HSSFCellStyle cs) {
+        for (int i = region.getFirstRow(); i <= region.getLastRow(); i++) {
+            HSSFRow row = sheet.getRow(i);
+            for (int j = region.getFirstColumn(); j <= region.getLastColumn(); j++) {
+                HSSFCell cell = row.getCell(j);
+                cell.setCellStyle(cs);
+            }
+        }
+    }
+
+    /**
+     * 获得因rowSpan占据的单元格
+     *
+     * @param rowIndex          行号
+     * @param colIndex          列号
+     * @param crossRowEleMetaLs 跨行列元数据
+     * @return 当前行在某列需要占据单元格
+     */
+    private static int getCaptureCellSize(int rowIndex, int colIndex, List<CrossRangeCellMeta> crossRowEleMetaLs) {
+        int captureCellSize = 0;
+        for (CrossRangeCellMeta crossRangeCellMeta : crossRowEleMetaLs) {
+            if (crossRangeCellMeta.getFirstRow() < rowIndex && crossRangeCellMeta.getLastRow() >= rowIndex) {
+                if (crossRangeCellMeta.getFirstCol() <= colIndex && crossRangeCellMeta.getLastCol() >= colIndex) {
+                    captureCellSize = crossRangeCellMeta.getLastCol() - colIndex + 1;
+                }
+            }
+        }
+        return captureCellSize;
+    }
+
+    /**
+     * 获得标题样式
+     *
+     * @param workbook
+     * @return
+     */
+    private static HSSFCellStyle getTitleStyle(HSSFWorkbook workbook) {
+        short titlebackgroundcolor = HSSFColor.HSSFColorPredefined.WHITE.getIndex();
+        short fontSize = 11;
+        String fontName = "宋体";
+        HSSFCellStyle style = workbook.createCellStyle();
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setBorderBottom(BorderStyle.THIN); //下边框
+        style.setBorderLeft(BorderStyle.THIN);//左边框
+        style.setBorderTop(BorderStyle.THIN);//上边框
+        style.setBorderRight(BorderStyle.THIN);//右边框
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        style.setFillForegroundColor(titlebackgroundcolor);// 背景色
+        style.setWrapText(true);
+        HSSFFont font = workbook.createFont();
+//        font.setFontName(fontName);
+        font.setFontHeightInPoints(fontSize);
+//        font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+        style.setFont(font);
+        return style;
+    }
+
+    /**
+     * 获得内容样式
+     *
+     * @param wb
+     * @return
+     */
+    private static HSSFCellStyle getContentStyle(HSSFWorkbook wb) {
+        short fontSize = 11;
+//        String fontName = "宋体";
+        HSSFCellStyle style = wb.createCellStyle();
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        HSSFFont font = wb.createFont();
+//        font.setFontName(fontName);
+        font.setFontHeightInPoints(fontSize);
+        style.setFont(font);
+        style.setAlignment(HorizontalAlignment.CENTER);//水平居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);//垂直居中
+        style.setWrapText(true);
+        return style;
+    }
+
+    public static void main(String[] args) throws Exception {
+        String cnt = "\n";
+        List<Integer> c =new ArrayList<>();
+        c.add(1);
+        String tableHtml = "<table><tbody><tr><td colspan='2'>11111111</td><td rowspan='3'>3333333333</td><td>444444444</td></tr><tr><td>5555555</td><td>66666</td><td></td></tr><tr><td></td><td>324234</td><td></td></tr></tbody></table>";
+        tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
+//        HSSFWorkbook hssfWorkbook = ConvertHtml2Excel.table2Excel(tableHtml,c,1);
+//        hssfWorkbook.write(FileUtils.openOutputStream(new File("D:\\test\\test1.xls")));
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/common/CrossRangeCellMeta.java

@@ -0,0 +1,53 @@
+package com.adc.da.common;
+
+/**
+ * @Description: table转excel 跨行元素元数据
+ * @Author: yangxuenan
+ * date: 2020/2/26 10:14
+ */
+public class CrossRangeCellMeta {
+
+    public CrossRangeCellMeta(int firstRowIndex, int firstColIndex, int rowSpan, int colSpan, boolean inHead) {
+        super();
+        this.firstRowIndex = firstRowIndex;
+        this.firstColIndex = firstColIndex;
+        this.rowSpan = rowSpan;
+        this.colSpan = colSpan;
+        this.inHead = inHead;
+    }
+
+    private int firstRowIndex;
+    private int firstColIndex;
+    private int rowSpan;// 跨越行数
+    private int colSpan;// 跨越列数
+    private boolean inHead;
+
+    public boolean isInHead() {
+        return inHead;
+    }
+
+    public CrossRangeCellMeta setInHead(boolean inHead) {
+        this.inHead = inHead;
+        return this;
+    }
+
+    public int getFirstRow() {
+        return firstRowIndex;
+    }
+
+    public int getLastRow() {
+        return firstRowIndex + rowSpan - 1;
+    }
+
+    public int getFirstCol() {
+        return firstColIndex;
+    }
+
+    public int getLastCol() {
+        return firstColIndex + colSpan - 1;
+    }
+
+    public int getColSpan() {
+        return colSpan;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardsInfoEO.java

@@ -14,6 +14,8 @@ public class SarStandardsInfoEO {
     @ApiModelProperty(value = "标准编号")
     private String standNumber;
 
+    private String standType;
+
     @ApiModelProperty(value = "标准名称")
     private String standName;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java

@@ -97,8 +97,8 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
     }
 
     @ApiOperation(value = "|SarFileSplitInfoEO|文件拆分相关信息存储")
-    @GetMapping("/fileSplit")
-    public ResponseMessage<SarFileSplitInfoEO> fileSplit(SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception {
+    @PostMapping("/fileSplit")
+    public ResponseMessage<SarFileSplitInfoEO> fileSplit(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception {
        if (sarFileSplitInfoEO.getStopNumber()<=0){
            sarFileSplitInfoEO.setStopNumber(200);
        }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java

@@ -0,0 +1,569 @@
+package com.adc.da.slrs.standardSplit.controller;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.core.util.ZipUtil;
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.service.IAttFileEOService;
+import com.adc.da.base.web.BaseController;
+import com.adc.da.common.ConvertHtml2Excel;
+import com.adc.da.common.FileUnZip;
+import com.adc.da.common.SplitTableInfo;
+import com.adc.da.http.PageInfo;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
+import com.adc.da.slrs.standardSplit.dto.*;
+import com.adc.da.slrs.standardSplit.entity.*;
+import com.adc.da.slrs.standardSplit.service.*;
+import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import com.adc.da.util.utils.IOUtils;
+import com.adc.da.utils.util.POIReadExcelToHtml;
+import com.adc.da.common.ReadExcel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.common.usermodel.HyperlinkType;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.*;
+
+import static com.adc.da.utils.util.ExcelUtil.checkObjAllFieldsIsNull;
+import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
+
+@RestController
+@RequestMapping("/${restPath}/lawss/sarFileSplitItems")
+@Api(description = "|SarFileSplitItemsEO|")
+public class SarFileSplitItemsEOController extends BaseController<SarFileSplitItemsEO> {
+
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOController.class);
+
+    @Autowired
+    private SarFileSplitItemsEOService sarFileSplitItemsEOService;
+    @Autowired
+    private SarFileSplitItemsValEOService sarFileSplitItemsValEOService;
+    @Autowired
+    private SarFileSplitItemsTableEOService sarFileSplitItemsTableEOService;
+    @Autowired
+    private SarFileSplitItemsParamsEOService sarFileSplitItemsParamsEOService;
+    @Autowired
+    private SarFileSplitMenuEOService sarFileSplitMenuEOService;
+    @Autowired
+    private IAttFileEOService attFileEOService;
+    @Autowired
+    private SarFileSplitInfoEOService sarFileSplitInfoEOService;
+    @Autowired
+    private SarStandardsInfoEOService sarStandardsInfoEOService;
+
+    @Value("${file.path}")
+    private String filePath;
+
+    @Value("${file.path}")
+    private String uploadFilePath;
+
+	@ApiOperation(value = "|SarFileSplitItemsEO|分页查询")
+    @GetMapping("/getSplitItemsByPage")
+//    @RequiresPermissions("lawss:sarFileSplitItems:page")
+    public ResponseMessage<PageInfo<SarFileSplitItemsEO>> page(SarFileSplitItemsEOPage page) throws Exception {
+	    //6-18 端哥已做修改
+        Map<String,Object> map = sarFileSplitItemsEOService.getByPage(page);
+        page.getPager().setRowCount((Integer) map.get("count"));
+        return Result.success(getPageInfo(page.getPager(), (List<SarFileSplitItemsEO>) map.get("list")));
+    }
+
+	@ApiOperation(value = "|SarFileSplitItemsEO|查询")
+    @GetMapping("")
+//    @RequiresPermissions("lawss:sarFileSplitItems:list")
+    public ResponseMessage<List<SarFileSplitItemsEO>> list(SarFileSplitItemsEOPage page) throws Exception {
+        return Result.success(sarFileSplitItemsEOService.queryByList(page));
+	}
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|详情")
+    @GetMapping("/{id}")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarFileSplitItems:get")
+    public ResponseMessage<SarFileSplitItemsEO> find(@PathVariable String id) throws Exception {
+        return Result.success(sarFileSplitItemsEOService.selectByPrimaryKey(id));
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|新增")
+    @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+//    @RequiresPermissions("lawss:sarFileSplitItems:save")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+    public ResponseMessage<SarFileSplitItemsEO> create(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception {
+        sarFileSplitItemsEOService.insertSelective(sarFileSplitItemsEO);
+        return Result.success(sarFileSplitItemsEO);
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|修改")
+    @PutMapping("/updateSplitItems")
+    public ResponseMessage<SarFileSplitItemsEO> update(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception {
+	    int resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO);
+	    if (resultCount > 0) {
+            return Result.success("0","修改成功",sarFileSplitItemsEO);
+        } else {
+            return Result.error("修改失败");
+        }
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|删除")
+    @DeleteMapping("/{id}")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarFileSplitItems:delete")
+    public ResponseMessage delete(@PathVariable String id) throws Exception {
+        sarFileSplitItemsEOService.deleteByPrimaryKey(id);
+        logger.info("delete from SAR_FILE_SPLIT_ITEMS where id = {}", id);
+        return Result.success();
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|批量删除")
+    @PostMapping("/batchDeleteItems")
+    public ResponseMessage batchDeleteItems(String ids) throws Exception {
+        if (StringUtils.isNotEmpty(ids)) {
+            int result = sarFileSplitItemsEOService.batchDeleteItems(ids);
+            if (result > 0) {
+                return Result.success("0","删除成功",null);
+            } else {
+                return Result.error("删除失败");
+            }
+
+        } else {
+            return Result.error("请选择要删除的数据");
+        }
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|根据id查询")
+    @GetMapping("/getInfoById")
+//    @RequiresPermissions("lawss:sarFileSplitItems:get")
+    public ResponseMessage<SarFileSplitItemsEO> getInfoById(String id) throws Exception {
+        SarFileSplitItemsEO sarFileSplitItemsEO = sarFileSplitItemsEOService.selectByPrimaryKey(id);
+        if (sarFileSplitItemsEO != null) {
+            SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage();
+            paramPage.setItemId(id);
+            List<SarFileSplitItemsParamsEO> paramList = sarFileSplitItemsParamsEOService.queryByList(paramPage);
+            sarFileSplitItemsEO.setParamsList(paramList);
+        }
+        // 查询特殊参数要求信息
+        return Result.success(sarFileSplitItemsEO);
+    }
+
+    @ApiOperation(value = "判断包含子节点")
+    @GetMapping("/judgeContaintChilds")
+    /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/
+    public ResponseMessage<Boolean> judgeContaintChilds(String ids) throws Exception {
+        boolean result = sarFileSplitItemsEOService.judgeContaintChilds(ids);
+        return Result.success(result);
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|导出zip")
+    @GetMapping(value = "/exportSplitInfoZip")
+    public void exportSplitInfoZip(String idList, String infoId, String exportName, HttpServletResponse response, HttpServletRequest request) throws Exception {
+        OutputStream os = null;
+        OutputStream excelOS = null;
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        String fileOriName = "拆分条款信息";
+        if (StringUtils.isNotEmpty(exportName)) {
+            fileOriName = exportName;
+        }
+        try{
+            //创建临时文件夹
+            String fileNowPath = uploadFilePath + "/tempZip/" + UUIDUtils.randomUUID20() + "/" + fileOriName;
+            File nowFile = new File(fileNowPath);
+            if (nowFile.exists()){
+                nowFile.delete();
+            }
+            nowFile.mkdirs();
+            String fileName = fileOriName + ".xls";
+            HSSFSheet sheetItems = workbook.createSheet("条款内容");
+            String[] headers = {"条款号","条款名称","内容简介","责任部门","FO","责任工程师","SVPPS","适用车辆类型","要求类型","企标覆盖关系"};
+            HSSFCellStyle cellStyle =workbook.createCellStyle();
+            cellStyle.setWrapText(true);
+//            cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+            cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+            HSSFCellStyle cellStyle1 =workbook.createCellStyle();
+            cellStyle1.setAlignment(HorizontalAlignment.CENTER);
+            HSSFCellStyle cellStyleLink =workbook.createCellStyle();
+            HSSFFont font = workbook.createFont();
+            font.setColor(IndexedColors.LIGHT_BLUE.index);
+            cellStyleLink.setFont(font);
+            cellStyleLink.setWrapText(true);
+            List<String> itemIdList = new ArrayList<>();
+            SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage();
+            if (StringUtils.isNotEmpty(idList)) {
+                String[] idArr = idList.split(",");
+                itemIdList = Arrays.asList(idArr);
+                page.setIdList(itemIdList);
+            }
+            //查询全部条款
+            page.setInfoId(infoId);
+            page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc");
+            List<FileSplitItemsExportDto> allItemsList = sarFileSplitItemsEOService.queryByOrdersForExport(page);
+            List<FileSpiltValTableExportDto> allTableList = new ArrayList<>();
+            List<FileSplitValImgExportDto> allImgList = new ArrayList<>();
+            List<AttFileEO> allRelevFileList = new ArrayList<>();
+            int countMaxFile = 1;
+            if (allItemsList != null && !allItemsList.isEmpty()) {
+                for (FileSplitItemsExportDto itemsExportDto : allItemsList) {
+                    SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage();
+                    valEOPage.setItemId(itemsExportDto.getId());
+                    valEOPage.setOrderBy("DISPLAY_SEQ,ID");
+                    List<SarFileSplitItemsValEO> getValList = sarFileSplitItemsValEOService.queryByList(valEOPage);
+                    List<FileSplitValExportDto> valContentList = sarFileSplitItemsEOService.combineItemValInfo(getValList,allTableList,allImgList,page);
+                    itemsExportDto.setItemValContent(valContentList);
+                }
+            }
+            // 在excel表中添加表头
+            HSSFRow row = sheetItems.createRow(0);
+            sheetItems.setColumnWidth(0,10*256);
+            sheetItems.setColumnWidth(1,20*256);
+            sheetItems.setColumnWidth(2,100*256);
+            sheetItems.setColumnWidth(3,20*256);
+            sheetItems.setColumnWidth(4,20*256);
+            sheetItems.setColumnWidth(5,20*256);
+            sheetItems.setColumnWidth(6,20*256);
+            sheetItems.setColumnWidth(7,20*256);
+            sheetItems.setColumnWidth(8,20*256);
+            sheetItems.setColumnWidth(9,20*256);
+
+            for (int i = 0; i < headers.length; i++) {
+                HSSFCell cell = row.createCell(i);
+                HSSFRichTextString text = new HSSFRichTextString(headers[i]);
+                cell.setCellValue(text);
+                cell.setCellStyle(cellStyle1);
+            }
+            //放文字内容
+            int allRow = 0;
+            for(int rowNum = 0;rowNum < allItemsList.size(); rowNum++){
+                FileSplitItemsExportDto exportDto = allItemsList.get(rowNum);
+                List<FileSplitValExportDto> valList = exportDto.getItemValContent();
+                int countFile = 0;
+                if(valList != null && !valList.isEmpty()){
+                    int startRow = allRow + 1;
+                    for (int valRow=0;valRow<valList.size();valRow++) {
+                        allRow++;
+                        HSSFRow row1 = sheetItems.createRow(allRow);
+                        row1.createCell(0).setCellValue(exportDto.getItemsNum());
+                        row1.getCell(0).setCellStyle(cellStyle);
+                        row1.createCell(1).setCellValue(exportDto.getItemsName());
+                        row1.getCell(1).setCellStyle(cellStyle);
+                        HSSFCell cell2 = row1.createCell(2);
+                        row1.getCell(2).setCellStyle(cellStyle);
+                        String content = valList.get(valRow).getValContent();
+                        if (StringUtils.isNotEmpty(content)) {
+                            content = content.replaceAll("null","");
+                            if (content.lastIndexOf("\n") > -1) {
+                                content = content.substring(0,content.lastIndexOf("\n"));
+                            }
+                        }
+                        if("TABLE".equals(valList.get(valRow).getValType())){
+                            /* 连接跳转*/
+                            CreationHelper createHelper = workbook.getCreationHelper();
+                            Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT);
+                            String tableName = "#\'"+ content + "\'!A1";
+                            hyperlink1.setAddress(tableName);
+                            cell2.setHyperlink(hyperlink1);// 链接
+                            row1.getCell(2).setCellStyle(cellStyleLink);
+                        } else if ("IMG".equals(valList.get(valRow).getValType())) {
+                            /* 连接跳转*/
+                            CreationHelper createHelper = workbook.getCreationHelper();
+                            Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
+                            String imgName = content;
+                            hyperlink1.setAddress(imgName);
+                            cell2.setHyperlink(hyperlink1);// 链接
+                            row1.getCell(2).setCellStyle(cellStyleLink);
+                        }
+                        cell2.setCellValue(content);
+
+
+                        row1.createCell(3).setCellValue(exportDto.getResponsibleUnitShow());
+                        row1.getCell(3).setCellStyle(cellStyle);
+                        row1.createCell(4).setCellValue(exportDto.getFoShow());
+                        row1.getCell(4).setCellStyle(cellStyle);
+                        row1.createCell(5).setCellValue(exportDto.getDutyEngineerShow());
+                        row1.getCell(5).setCellStyle(cellStyle);
+                        row1.createCell(6).setCellValue(exportDto.getSvpps());
+                        row1.getCell(6).setCellStyle(cellStyle);
+                        row1.createCell(7).setCellValue(exportDto.getApplyArctic());
+                        row1.getCell(7).setCellStyle(cellStyle);
+                        row1.createCell(8).setCellValue(exportDto.getClaimTypeShow());
+                        row1.getCell(8).setCellStyle(cellStyle);
+                        row1.createCell(9).setCellValue(exportDto.getBusStandCover());
+                        row1.getCell(9).setCellStyle(cellStyle);
+
+                    }
+                    if (allRow > startRow) {
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,0,0));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,1,1));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,3,3));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,4,4));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,5,5));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,6,6));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,7,7));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,8,8));
+                        sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,9,9));
+                    }
+                } else {
+                    allRow++;
+                    HSSFRow row1 = sheetItems.createRow(allRow);
+                    row1.createCell(0).setCellValue(exportDto.getItemsNum());
+                    row1.getCell(0).setCellStyle(cellStyle);
+                    row1.createCell(1).setCellValue(exportDto.getItemsName());
+                    row1.getCell(1).setCellStyle(cellStyle);
+                    row1.createCell(2).setCellValue("");
+                    row1.getCell(2).setCellStyle(cellStyle);
+                    row1.createCell(3).setCellValue(exportDto.getResponsibleUnitShow());
+                    row1.getCell(3).setCellStyle(cellStyle);
+                    row1.createCell(4).setCellValue(exportDto.getFoShow());
+                    row1.getCell(4).setCellStyle(cellStyle);
+                    row1.createCell(5).setCellValue(exportDto.getDutyEngineerShow());
+                    row1.getCell(5).setCellStyle(cellStyle);
+                    row1.createCell(6).setCellValue(exportDto.getSvpps());
+                    row1.getCell(6).setCellStyle(cellStyle);
+                    row1.createCell(7).setCellValue(exportDto.getApplyArctic());
+                    row1.getCell(7).setCellStyle(cellStyle);
+                    row1.createCell(8).setCellValue(exportDto.getClaimTypeShow());
+                    row1.getCell(8).setCellStyle(cellStyle);
+                    row1.createCell(9).setCellValue(exportDto.getBusStandCover());
+                    row1.getCell(9).setCellStyle(cellStyle);
+                }
+            }
+            if (countMaxFile > 1) {
+                for (int i=1;i<countMaxFile;i++) {
+                    sheetItems.setColumnWidth(9+i,40*256);
+                }
+                sheetItems.addMergedRegion(new CellRangeAddress(0,0,9,9+countMaxFile-1));
+            }
+            // 放表格内容
+            if(allTableList!= null && !allTableList.isEmpty()){
+                for(FileSpiltValTableExportDto tableExportDto : allTableList){
+//                    List<List<SarFileSplitItemsTableEO>> rowtableList = tableExportDto.getTableEOList();
+//                    HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName());
+                    String tableName = tableExportDto.getTableName();
+                    String tableHtml = tableExportDto.getTableHtCon();
+                    if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
+                        if (tableHtml.indexOf("<thead>") < 0) {
+                            tableHtml = tableHtml.replaceFirst("<tr>","<tbody><tr>");
+                            tableHtml = tableHtml.replaceFirst("</table>","</tbody></table>");
+                        } else {
+                            tableHtml = tableHtml.replaceFirst("</thead>","</thead><tbody>");
+                            tableHtml = tableHtml.replaceFirst("</table>","</tbody></table>");
+                        }
+                    }
+                    String cnt = "\n";
+                    tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
+                    workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName);
+//                    for (int r=0;r<rowtableList.size();r++) {
+//                        List<SarFileSplitItemsTableEO> colTableList = rowtableList.get(r);
+//                        HSSFRow tRow = sheetTable.createRow(colTableList.get(0).getRowNum()-1);
+//                        for(int c=0;c<colTableList.size();c++){
+//                            SarFileSplitItemsTableEO tableEO = colTableList.get(c);
+//                            tRow.createCell(tableEO.getColNum()-1).setCellValue(tableEO.getContent());
+//                            tRow.getCell(tableEO.getColNum()-1).setCellStyle(cellStyle);
+//                        }
+//                    }
+                }
+            }
+            //下载图片内容
+            if (allImgList != null && !allImgList.isEmpty()) {
+                sarFileSplitItemsEOService.downLoadImgList(allImgList,fileNowPath);
+            }
+            //下载关联文件内容
+            if (allRelevFileList != null && !allRelevFileList.isEmpty()) {
+                sarFileSplitItemsEOService.downLoadFileList(allRelevFileList,fileNowPath);
+            }
+            String repFileName = fileName.replaceAll("/","_");
+            excelOS = new FileOutputStream(fileNowPath + "/" + repFileName);
+            response.setHeader("Content-Disposition",
+                    "attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
+            response.setContentType("application/force-download");
+            response.flushBuffer();
+            os = response.getOutputStream();
+            workbook.write(excelOS);
+            excelOS.flush();
+            excelOS.close();
+            ZipUtil.zip(fileNowPath,fileNowPath+".zip");
+            FileInputStream fis = new FileInputStream(fileNowPath+".zip");
+            int len = 0;
+            while ((len = fis.read()) != -1) {
+                os.write(len);
+            }
+            os.flush();
+            os.close(); // 后开先关
+            fis.close(); // 先开后关
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            throw new AdcDaBaseException("下载文件失败，请重试");
+        } finally {
+            IOUtils.closeQuietly(os);
+            IOUtils.closeQuietly(excelOS);
+        }
+    }
+
+    @ApiOperation(value = "|SarFileSplitItemsEO|导入")
+    @PostMapping(value = "/importSplitItemsZip")
+    public ResponseMessage<SarFileSplitItemsEO> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file,
+                                                                    SarFileSplitInfoEO sarFileSplitInfoEO) throws Exception {
+        //验证文件名是否合格
+        /* 截取后缀名 */
+        sarFileSplitInfoEO.setFileName(file.getOriginalFilename());
+        int pos = file.getOriginalFilename().lastIndexOf(".");
+        String str = file.getOriginalFilename().substring(pos+1).toLowerCase();
+        String filenameorg = file.getOriginalFilename().substring(0,pos);
+        //判断上传文件必须是zip
+        if (!str.equals("zip")) {
+            return Result.error("fail", "请上传zip文件");
+        }
+        String path = filePath + "/modal/"+filenameorg;
+        File saveDirectory = new File(path);
+        if(!saveDirectory.isDirectory()){
+            saveDirectory.mkdir();
+        }
+        FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +"/"+ file.getOriginalFilename()));
+        try{
+            //解压缩
+            String zipEntryName = FileUnZip.unZipFiles(path +"/"+ file.getOriginalFilename(),path);
+            // 数据相关处理,
+            // 1.获取其中的Excel,
+            List<File> excelfilelist = FileUnZip.readExcelFile(zipEntryName);
+            if(excelfilelist.size()<1){
+                //删除原上传文件
+                FileUnZip.deleteDir(saveDirectory);
+                return Result.error("fail", "压缩包内没有上传Excel数据");
+            } else if (excelfilelist.size()>1) {
+                //删除原上传文件
+                FileUnZip.deleteDir(saveDirectory);
+                return Result.error("fail", "压缩包内有多个Excel数据源");
+            }
+            File excelfile = excelfilelist.get(0);
+            // 导入参数设置，默认即可
+            ImportParams params = new ImportParams();
+            try {
+                String fields[] = {"条款号", "条款名称","内容简介","责任部门",
+                        "FO","责任工程师","SVPPS","适用车辆类型","要求类型","企标覆盖关系"};
+                params.setImportFields(fields);
+                List<SarFileSplitItemsImportDto> result = new ArrayList<>();
+                // 解析excel，并返回校验信息
+                result = ExcelImportUtil.importExcel(excelfile, SarFileSplitItemsImportDto.class, params);
+                Long getExcelInfo = System.currentTimeMillis();
+                //excel读取到的数据
+                List<SarFileSplitItemsImportDto> datas = result;
+                if(datas!=null &&!datas.isEmpty()){
+                    try {
+                        //获取全部sheet页中表格
+                        Workbook workbook = WorkbookFactory.create(new FileInputStream(excelfile));
+                        //XSSFWorkbook workbook=new XSSFWorkbook(new FileInputStream(excelfile));
+                        Sheet sheet=null;
+                        List<SplitTableInfo> getSheetTableList = new ArrayList();
+                        for (int i = 1; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表
+                            sheet = workbook.getSheetAt(i);
+                            SplitTableInfo splitTableInfo = new SplitTableInfo();
+                            splitTableInfo.setTableName(sheet.getSheetName());
+                            String tableHtml = POIReadExcelToHtml.readExcelToHtml(workbook,i,false);
+                            splitTableInfo.setTableHtml(tableHtml);
+                            getSheetTableList.add(splitTableInfo);
+                        }
+                        int i = 0 ;
+                        List<SarFileSplitItemsImportDto> datasUpdate = new ArrayList<>();
+                        //2019.05.14 当读取exceL出现空行过多时，空行数为20以上时中断读取，将数据清洗为新的list
+                        for(SarFileSplitItemsImportDto sarStandImportDto :datas){
+                            if(i>20){
+                                break;
+                            }
+                            //判断此行数据是否全部为空
+                            if(checkObjAllFieldsIsNull(sarStandImportDto)){
+                                i++;
+                                //是则不读取
+                                continue;
+                            }
+                            i = 0;
+                            datasUpdate.add(sarStandImportDto);
+                        }
+                        String unzipfilepath  = zipEntryName;
+                        ResponseMessage<SarFileSplitItemsEO> message = sarFileSplitItemsEOService.importSplitItems
+                                (datasUpdate,unzipfilepath,sarFileSplitInfoEO,getSheetTableList);
+                        workbook.close();
+                        //删除原上传文件
+                        FileUnZip.deleteDir(saveDirectory);
+                        return message;
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        //删除原上传文件
+                        FileUnZip.deleteDir(saveDirectory);
+                        return Result.error("fail", e.getMessage());
+                    }
+                }else{
+
+                    //删除原上传文件
+                    FileUnZip.deleteDir(saveDirectory);
+                    return Result.error("fail", "没有可导入的数据,请检查!");
+                }
+            } catch (NoSuchElementException e){
+                FileUnZip.deleteDir(saveDirectory);
+                return Result.error("fail", "没有可导入的数据,请检查!");
+            } catch (Exception e) {
+                //删除原上传文件
+                FileUnZip.deleteDir(saveDirectory);
+                return Result.error("fail", "读取失败，请严格按照模板文件导入数据");
+            }
+        } catch (Exception e) {
+            //删除原上传文件
+            FileUnZip.deleteDir(saveDirectory);
+            return Result.error("fail", "读取失败，请严格按照模板文件导入数据");
+        }
+
+    }
+
+    @ApiOperation(value = "合并条款")
+    @PostMapping("/combineItems")
+    public ResponseMessage combineItems(String ids) throws Exception {
+        if (StringUtils.isNotBlank(ids)) {
+            sarFileSplitItemsEOService.combineItems(ids);
+            return Result.success("0","合并条款成功",ids);
+        } else {
+            return Result.error("传入id不能为空");
+        }
+
+    }
+
+    /**
+     * 获取对应条款信息
+     * @param standNum
+     * @param fileType
+     * @return
+     */
+    @ApiOperation(value = "|SarFileSplitInfoEO|获取所有对应的条款")
+    @GetMapping("getClauseBySplitId")
+    public ResponseMessage getClauseBySplitId(String standNum, String fileType, SarFileSplitItemsEOPage page) throws Exception{
+        //根据标准号查询标准是否存在
+        if (standNum == null) {
+            return Result.error("标准号不能为空");
+        }
+        List<SarStandardsInfoEO> getList = sarStandardsInfoEOService.selectStandardsByStandnumber(standNum,null);
+        if (getList.size()>0){
+            //查询拆分中所有条款信息
+            String getSplitItemsList = sarFileSplitInfoEOService.getClauseBySplitId(standNum,fileType);
+            page.setInfoId(getSplitItemsList);
+            Map<String,Object> map = sarFileSplitItemsEOService.getByPage(page);
+            page.getPager().setRowCount((Integer) map.get("count"));
+            return Result.success(getPageInfo(page.getPager(), (List<SarFileSplitItemsEO>) map.get("list")));
+        }
+        return Result.error("0", "该条数据标准号在标准库中不存在");
+    }
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitMenuEOController.java

@@ -0,0 +1,150 @@
+package com.adc.da.slrs.standardSplit.controller;
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.http.PageInfo;
+import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEOPage;
+import com.adc.da.slrs.standardSplit.entity.DrageMenuEO;
+
+@RestController
+@RequestMapping("/${restPath}/lawss/sarFileSplitMenu")
+@Api(description = "|SarFileSplitMenuEO|")
+public class SarFileSplitMenuEOController extends BaseController<SarFileSplitMenuEO> {
+
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOController.class);
+
+    @Autowired
+    private SarFileSplitMenuEOService sarFileSplitMenuEOService;
+
+    @Autowired
+    private SarFileSplitItemsEODao sarFileSplitItemsEODao;
+
+	@ApiOperation(value = "|SarFileSplitMenuEO|分页查询")
+    @GetMapping("/page")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarFileSplitMenu:page")
+    public ResponseMessage<PageInfo<SarFileSplitMenuEO>> page(SarFileSplitMenuEOPage page) throws Exception {
+        page.setOrderBy("modify_time desc");
+        List<SarFileSplitMenuEO> rows = sarFileSplitMenuEOService.queryByPage(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
+	@ApiOperation(value = "|SarFileSplitMenuEO|查询")
+    @GetMapping("getSplitMenusByInfoId")
+    //@RequiresPermissions("lawss:sarFileSplitMenu:list")
+    public ResponseMessage<List<SarFileSplitMenuEO>> list(SarFileSplitMenuEOPage page) throws Exception {
+        page.setValidFlag("0");
+        // page.setOrderBy("regexp_replace(replace('.'||NAME, '.', '.00000000'), '0+([^\\.]{8})', '\\1')");
+        page.setOrderBy("display_seq asc");
+        List<SarFileSplitMenuEO> getList = sarFileSplitMenuEOService.queryByList(page);
+        return Result.success(getList);
+	}
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|详情")
+    @GetMapping("/{id}")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarFileSplitMenu:get")
+    public ResponseMessage<SarFileSplitMenuEO> find(@PathVariable String id) throws Exception {
+        return Result.success(sarFileSplitMenuEOService.selectByPrimaryKey(id));
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|新增")
+    @PostMapping("/addMenu")
+//    @RequiresPermissions("lawss:sarFileSplitMenu:save")
+    public ResponseMessage<SarFileSplitMenuEO> create(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception {
+        sarFileSplitMenuEOService.addMenu(sarFileSplitMenuEO);
+        return Result.success("0","新增成功",sarFileSplitMenuEO);
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|修改")
+    @PutMapping("/updateMenu")
+//    @RequiresPermissions("lawss:sarFileSplitMenu:update")
+    public ResponseMessage<SarFileSplitMenuEO> update(SarFileSplitMenuEO sarFileSplitMenuEO) throws Exception {
+        sarFileSplitMenuEOService.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+        return Result.success("0","修改成功",sarFileSplitMenuEO);
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|删除")
+    @DeleteMapping("/deleteMenu")
+//    @RequiresPermissions("lawss:sarFileSplitMenu:delete")
+    public ResponseMessage delete(String id) throws Exception {
+        sarFileSplitMenuEOService.deleteMenu(id);
+        return Result.success("0","删除成功",null);
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|拖拽节点")
+    @PostMapping("/dragMenu")
+    public ResponseMessage dragMenu(@RequestBody DrageMenuEO drageMenuEO) throws Exception {
+	    sarFileSplitMenuEOService.dragMenu(drageMenuEO);
+        return Result.success("0","修改成功",drageMenuEO);
+    }
+
+    @ApiOperation(value = "查询子节点")
+    @PostMapping("/judgequeryMenuByPid")
+    /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/
+    public ResponseMessage<Boolean> judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception {
+        return Result.success(sarFileSplitMenuEOService.judgequeryMenuByPid(sarMenuEO));
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|复制节点包括子节点")
+    @PostMapping("/copyMenu")
+    public ResponseMessage copyMenu(@RequestBody SarFileSplitMenuEO sarMenuEO) throws Exception {
+        int result = sarFileSplitMenuEOService.copyMenu(sarMenuEO);
+        return Result.success("0","复制成功",sarMenuEO);
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|复制节点不包括子节点")
+    @PostMapping("/copyMenuNotChildren")
+    public ResponseMessage copyMenuNotChildren(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception {
+        int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO);
+        return Result.success("0","复制成功",sarFileSplitItemsEO);
+    }
+
+    @ApiOperation(value = "|SarFileSplitMenuEO|批量复制节点不包括子节点")
+    @PostMapping("/copyMenuNotChildrenall")
+    public ResponseMessage<List<SarFileSplitItemsEO>> copyMenuNotChildrenall(String ids, String menuids, String infoIds) throws Exception {
+
+        /*int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO);
+        return Result.success("0","复制成功",sarFileSplitItemsEO);*/
+        String idsl[] = ids.split(",");
+        List<String> idlist =new ArrayList<>();
+        idlist = Arrays.asList(idsl);
+
+        String menuidss[] = menuids.split(",");
+        List<String> menuidslist =new ArrayList<>();
+        menuidslist = Arrays.asList(menuidss);
+
+
+        String infoIdss[] = infoIds.split(",");
+        List<String> infoIdslist =new ArrayList<>();
+        infoIdslist = Arrays.asList(infoIdss);
+        List<SarFileSplitItemsEO> sarFileSplitItemsEOS = new ArrayList<>();
+        for(int i=0;i<idlist.size();i++){
+            SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO();
+            sarFileSplitItemsEO.setId(idlist.get(i));
+            sarFileSplitItemsEO.setMenuId(menuidslist.get(i));
+            sarFileSplitItemsEO.setInfoId(infoIdslist.get(i));
+            int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO);
+            sarFileSplitItemsEO = sarFileSplitItemsEODao.selectByPrimaryKey(sarFileSplitItemsEO.getId());
+            sarFileSplitItemsEOS.add(sarFileSplitItemsEO);
+        }
+
+        return Result.success("0","复制成功",sarFileSplitItemsEOS);
+    }
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java

@@ -1,6 +1,5 @@
 package com.adc.da.slrs.standardSplit.controller;
 
-import com.adc.da.att.entity.AttFileEO;
 import com.adc.da.att.service.IAttFileEOService;
 import com.adc.da.base.web.BaseController;
 import com.adc.da.http.PageInfo;
@@ -19,7 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
-import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
+import com.adc.da.att.entity.AttFileEO;
 
 @RestController
 @RequestMapping("/${restPath}/lawss/sarStandFile")
@@ -34,100 +33,102 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
     private IAttFileEOService attFileEOService;
     @Autowired
     private SarStandAttrDetailsEOService sarStandAttrDetailsEOService;
+    public static final String APPLICATION_JSON_UTF8_VALUE = "application/json;charset=UTF-8";
 
-//	@ApiOperation(value = "|SarStandFileEO|分页查询")
-//    @GetMapping("/page")
+
+	@ApiOperation(value = "|SarStandFileEO|分页查询")
+    @GetMapping("/page")
+    // 401问题2021-03-31暂时注释掉 liuhuiwen
+    // @RequiresPermissions("lawss:sarStandFile:page")
+    public ResponseMessage<PageInfo<SarStandFileEO>> page(SarStandFileEOPage page) throws Exception {
+        List<SarStandFileEO> rows = sarStandFileEOService.queryByPage(page);
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
+
+	@ApiOperation(value = "|SarStandFileEO|查询")
+    @GetMapping("")
     //401问题2021-03-31暂时注释掉 liuhuiwen
-//    @RequiresPermissions("lawss:sarStandFile:page")
-//    public ResponseMessage<PageInfo<SarStandFileEO>> page(SarStandFileEOPage page) throws Exception {
-//        List<SarStandFileEO> rows = sarStandFileEOService.queryByPage(page);
-//        return Result.success(getPageInfo(page.getPager(), rows));
-//    }
-//
-//	@ApiOperation(value = "|SarStandFileEO|查询")
-//    @GetMapping("")
-//    //401问题2021-03-31暂时注释掉 liuhuiwen
-////    @RequiresPermissions("lawss:sarStandFile:list")
-//    public ResponseMessage<List<SarStandFileEO>> list(SarStandFileEOPage page) throws Exception {
-//        return Result.success(sarStandFileEOService.queryByList(page));
-//	}
-//
-//    @ApiOperation(value = "|SarStandFileEO|详情")
-//    @GetMapping("/{id}")
-//    //401问题2021-03-31暂时注释掉 liuhuiwen
-////    @RequiresPermissions("lawss:sarStandFile:get")
-//    public ResponseMessage<SarStandFileEO> find(@PathVariable String id) throws Exception {
-//        return Result.success(sarStandFileEOService.selectByPrimaryKey(id));
-//    }
-//
-//    @ApiOperation(value = "|SarStandFileEO|新增")
-//    @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
-//    //401问题2021-03-31暂时注释掉 liuhuiwen
-////    @RequiresPermissions("lawss:sarStandFile:save")
-//    public ResponseMessage<SarStandFileEO> create(@RequestBody SarStandFileEO sarStandFileEO) throws Exception {
-//        sarStandFileEOService.insertSelective(sarStandFileEO);
-//        return Result.success(sarStandFileEO);
-//    }
-//
-//    @ApiOperation(value = "|SarStandFileEO|修改")
-//    @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
-//    //401问题2021-03-31暂时注释掉 liuhuiwen
-////    @RequiresPermissions("lawss:sarStandFile:update")
-//    public ResponseMessage<SarStandFileEO> update(@RequestBody SarStandFileEO sarStandFileEO) throws Exception {
-//        sarStandFileEOService.updateByPrimaryKeySelective(sarStandFileEO);
-//        return Result.success(sarStandFileEO);
-//    }
-//
-//    @ApiOperation(value = "|SarStandFileEO|删除")
-//    @DeleteMapping("/{id}")
-//    //401问题2021-03-31暂时注释掉 liuhuiwen
-////    @RequiresPermissions("lawss:sarStandFile:delete")
-//    public ResponseMessage delete(@PathVariable String id) throws Exception {
-//        sarStandFileEOService.deleteByPrimaryKey(id);
-//        logger.info("delete from SAR_STAND_FILE where id = {}", id);
-//        return Result.success();
-//    }
-//
-//    @ApiOperation(value = "|SarStandFileEO|查询转换后的文档详情")
-//    @GetMapping("/queryConvertAtt")
-//    /*@RequiresPermissions("lawss:sarLawsFile:list")*/
-//    public ResponseMessage<SarStandFileEO> queryConvertAtt(String attId) throws Exception {
-//        List<SarStandFileEO> getList = sarStandFileEOService.selectFileByAttId(attId);
-//        SarStandFileEO sarBussStandFileEO = new SarStandFileEO();
-//        if(getList != null && !getList.isEmpty()){
-//            sarBussStandFileEO = getList.get(0);
-//            AttFileEO attFileEO = attFileEOService.getFileInfo(attId);
-//            if(attFileEO != null){
-//                sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName());
-//            }
-////            readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO);
-//            return Result.success(sarBussStandFileEO);
-//        } else {
-//            return Result.success(null);
-//        }
-//
-//    }
-//
-//    @ApiOperation(value = "|SarStandFileEO|分页查询")
-//    @GetMapping("/getStandFileListByPage")
-////    @RequiresPermissions("lawss:sarStandRes:page")
-//    public ResponseMessage<PageInfo<SarStandFileEO>> getStandFileListByPage(SarStandFileEOPage page) throws Exception {
-//        String suffix = page.getFileSuffix();
-//        if (StringUtils.isNotBlank(suffix)) {
-//            page.setFileSuffixList(suffix.split(","));
-//        }
-//        List<SarStandFileEO> rows = sarStandFileEOService.getStandFileListByPage(page);
-//        if (rows != null && !rows.isEmpty()) {
-//            for (SarStandFileEO sarStandFileEO : rows) {
-//                List<SelectionResult> getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify());
-//                if (getField != null && !getField.isEmpty()) {
-//                    sarStandFileEO.setStandFileClassifyShow(getField.get(0).getLabel());
-//                } else {
-//                    sarStandFileEO.setStandFileClassifyShow(null);
-//                }
-//            }
-//        }
-//        return Result.success(getPageInfo(page.getPager(), rows));
-//    }
+//    @RequiresPermissions("lawss:sarStandFile:list")
+    public ResponseMessage<List<SarStandFileEO>> list(SarStandFileEOPage page) throws Exception {
+        return Result.success(sarStandFileEOService.queryByList(page));
+	}
+
+    @ApiOperation(value = "|SarStandFileEO|详情")
+    @GetMapping("/{id}")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarStandFile:get")
+    public ResponseMessage<SarStandFileEO> find(@PathVariable String id) throws Exception {
+        return Result.success(sarStandFileEOService.selectByPrimaryKey(id));
+    }
+
+    @ApiOperation(value = "|SarStandFileEO|新增")
+    @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarStandFile:save")
+    public ResponseMessage<SarStandFileEO> create(@RequestBody SarStandFileEO sarStandFileEO) throws Exception {
+        sarStandFileEOService.insertSelective(sarStandFileEO);
+        return Result.success(sarStandFileEO);
+    }
+
+    @ApiOperation(value = "|SarStandFileEO|修改")
+    @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarStandFile:update")
+    public ResponseMessage<SarStandFileEO> update(@RequestBody SarStandFileEO sarStandFileEO) throws Exception {
+        sarStandFileEOService.updateByPrimaryKeySelective(sarStandFileEO);
+        return Result.success(sarStandFileEO);
+    }
+
+    @ApiOperation(value = "|SarStandFileEO|删除")
+    @DeleteMapping("/{id}")
+    //401问题2021-03-31暂时注释掉 liuhuiwen
+//    @RequiresPermissions("lawss:sarStandFile:delete")
+    public ResponseMessage delete(@PathVariable String id) throws Exception {
+        sarStandFileEOService.deleteByPrimaryKey(id);
+        logger.info("delete from SAR_STAND_FILE where id = {}", id);
+        return Result.success();
+    }
+
+    @ApiOperation(value = "|SarStandFileEO|查询转换后的文档详情")
+    @GetMapping("/queryConvertAtt")
+    /*@RequiresPermissions("lawss:sarLawsFile:list")*/
+    public ResponseMessage<SarStandFileEO> queryConvertAtt(String attId) throws Exception {
+        List<SarStandFileEO> getList = sarStandFileEOService.selectFileByAttId(attId);
+        SarStandFileEO sarBussStandFileEO = new SarStandFileEO();
+        if(getList != null && !getList.isEmpty()){
+            sarBussStandFileEO = getList.get(0);
+            AttFileEO attFileEO = attFileEOService.getFileInfo(attId);
+            if(attFileEO != null){
+                sarBussStandFileEO.setFileOldName(attFileEO.getOldFileName());
+            }
+//            readStandOrLawsLogService.sendReadSOLLog("STAND",sarBussStandFileEO);
+            return Result.success(sarBussStandFileEO);
+        } else {
+            return Result.success(null);
+        }
+
+    }
+
+    @ApiOperation(value = "|SarStandFileEO|分页查询")
+    @GetMapping("/getStandFileListByPage")
+//    @RequiresPermissions("lawss:sarStandRes:page")
+    public ResponseMessage<PageInfo<SarStandFileEO>> getStandFileListByPage(SarStandFileEOPage page) throws Exception {
+        String suffix = page.getFileSuffix();
+        if (StringUtils.isNotBlank(suffix)) {
+            page.setFileSuffixList(suffix.split(","));
+        }
+        List<SarStandFileEO> rows = sarStandFileEOService.getStandFileListByPage(page);
+        if (rows != null && !rows.isEmpty()) {
+            for (SarStandFileEO sarStandFileEO : rows) {
+                List<SelectionResult> getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify());
+                if (getField != null && !getField.isEmpty()) {
+                    sarStandFileEO.setStandFileClassifyShow(getField.get(0).getLabel());
+                } else {
+                    sarStandFileEO.setStandFileClassifyShow(null);
+                }
+            }
+        }
+        return Result.success(getPageInfo(page.getPager(), rows));
+    }
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java

@@ -36,4 +36,19 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
    List<FileSplitItemsExportDto> queryByOrdersForExport(SarFileSplitItemsEOPage page);
 
    List<SarFileSplitItemsEO> queryByList2(SarFileSplitItemsEOPage page);
+
+   List<SarFileSplitItemsEO> queryByList(SarFileSplitItemsEOPage page);
+
+   SarFileSplitItemsEO selectByPrimaryKey(String id);
+
+   int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO);
+
+   int queryByCount(SarFileSplitItemsEOPage page);
+
+   List<SarFileSplitItemsEO> queryByPage(SarFileSplitItemsEOPage page);
+
+   int updateByPrimaryKeySelective(SarFileSplitItemsEO page);
+
+   int deleteByPrimaryKey(String id);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsParamsEODao.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.standardSplit.dao;
 
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,6 @@ public interface SarFileSplitItemsParamsEODao extends BaseMapper<SarFileSplitIte
 
     List<SarFileSplitItemsParamsEO> queryItemsParamsByMenuId(@Param("idList") List<String> idList);
 
+    List<SarFileSplitItemsParamsEO> queryByList(SarFileSplitItemsParamsEOPage paramPage);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.standardSplit.dao;
 
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -33,4 +34,6 @@ public interface SarFileSplitItemsValEODao extends BaseMapper<SarFileSplitItemsV
 
     List<SarFileSplitItemsValEO> queryItemsValByMenuId(@Param("idList") List<String> idList);
 
+    List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitMenuEODao.java

@@ -1,6 +1,8 @@
 package com.adc.da.slrs.standardSplit.dao;
 
+import com.adc.da.base.page.BasePage;
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEOPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +49,15 @@ public interface SarFileSplitMenuEODao extends BaseMapper<SarFileSplitMenuEO> {
     List<SarFileSplitMenuEO> queryAllChildrenByid(SarFileSplitMenuEO sarFileSplitMenuEO);
 
     int deleteByIdList(@Param("idList") List<String> idList);
+
+    int insertSelective(SarFileSplitMenuEO sarFileSplitMenuEO);
+
+    List<SarFileSplitMenuEO> queryByList(SarFileSplitMenuEOPage page);
+
+    int updateByPrimaryKeySelective(SarFileSplitMenuEO menu);
+
+    SarFileSplitMenuEO selectByPrimaryKey(String id);
+
+    List<SarFileSplitMenuEO> queryByPage(BasePage page);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandAttrDetailsEODao.java

@@ -0,0 +1,35 @@
+package com.adc.da.slrs.standardSplit.dao;
+
+import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEOPage;
+import com.adc.da.sys.common.SelectionResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ *
+ * <br>
+ * <b>功能：</b>SAR_STAND_ATTR_DETAILS SarStandAttrDetailsEODao<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-08-17 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+@Mapper
+public interface SarStandAttrDetailsEODao extends BaseMapper<SarStandAttrDetailsEO> {
+
+    int deleteByIds(@Param("idList") List<String> idList);
+
+    String selectAllFieldToStr(SarStandAttrDetailsEOPage page);
+
+    SarStandAttrDetailsEO selectFieldByName(@Param("attrName") String attrName, @Param("sarType") String sarType);
+
+    String selectNameByField(@Param("attrField") String attrField, @Param("sarType") String sarType);
+
+    List<SelectionResult> selectFileFieldForSel(@Param("attrField") String attrField);
+
+    List<SelectionResult> selectFileFieldForSel1(@Param("attrField") String attrField);
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java

@@ -0,0 +1,49 @@
+package com.adc.da.slrs.standardSplit.dao;
+
+import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
+/**
+ *
+ * <br>
+ * <b>功能：</b>SAR_STAND_FILE SarStandFileEODao<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2018-09-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+@Mapper
+public interface SarStandFileEODao extends BaseMapper<SarStandFileEO> {
+    List<SarStandFileEO> selectFileByStandId(String lawsId);
+
+    List<SarStandFileEO> selectFileByAttId(String attId);
+
+    List<SarStandFileEO> selectFileByResId(SarStandFileEO sarStandFileEO);
+
+    List<SarStandFileEO> selectFileByStandIdAndId(SarStandFileEO sarStandFileEO);
+
+    List<SarStandFileEO> selectFileMsgByAttId(String attId);
+
+    int deleteByStandId(String standId);
+
+    int insertForeach(List<SarStandFileEO> list); //批量新增
+
+    List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand);
+
+    int queryStandFileListByCount(SarStandFileEOPage stand);
+
+    List<SarStandFileEO> queryByPage(SarStandFileEOPage page);
+
+    List<SarStandFileEO> queryByList(SarStandFileEOPage page);
+
+    SarStandFileEO selectByPrimaryKey(String id);
+
+    int insertSelective(SarStandFileEO sarStandFileEO);
+
+    int updateByPrimaryKeySelective(SarStandFileEO sarStandFileEO);
+
+    int deleteByPrimaryKey(String id);
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandardsInfoEODao.java

@@ -0,0 +1,66 @@
+package com.adc.da.slrs.standardSplit.dao;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
+import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ *
+ * <br>
+ * <b>功能：</b>SAR_STANDARDS_INFO SarStandardsInfoEODao<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-08-19 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+@Mapper
+public interface SarStandardsInfoEODao extends BaseMapper<SarStandardsInfoEO> {
+
+    List<SarStandardsInfoEO> getSarStandardsInfoPage(SarStandardsInfoEOPage page);
+
+    int getSarStandardsInfoCount(SarStandardsInfoEOPage page);
+
+    SarStandardsInfoEO selectByPrimaryKeyAndModifyTime(SarStandardsInfoEO page);
+
+    List<SarStandardsInfoEO> selectStandardsByStandnumber(SarStandardsInfoEO sarStandardsInfoEO);
+
+    Integer selectStandColumn(@Param("columnName") String columnName);
+
+    Integer selectCounterStandardsCount(SarStandardsInfoEO sarStandardsInfoEO);
+
+    int deleteByPrimaryKeyFlag(String id);
+
+    int updateByStandNum(SarStandardsInfoEO standardsInfoEO);
+
+    List<SarStandardsInfoEO> selectStandardsInfoByIdAndRole(SarStandardsInfoEOPage standEO);
+
+    int updateReplacedNumById(SarStandardsInfoEO sarStandardsInfoEO);
+
+    int updateCitedStandById(SarStandardsInfoEO sarStandardsInfoEO);
+
+    List<SarStandardsInfoEO> getSarStandardsExportInfo(SarStandardsInfoEOPage page);
+
+    List<SarStandardsInfoEO> selectStandardsInfoByKey(String id);
+
+    List<RecommendVO> selectRecommendStand(SarStandardsInfoEOPage pagenew);
+
+    List<String> countReplaceMsg(@Param("standNum") String standNum);
+
+    List<SarStandardsInfoEO> selectStandToUpState(@Param("stateName") String stateName);
+
+    List<SarStandardsInfoEO> selectStandToUpRepState();
+
+    List<SarStandardsInfoEO> selectStandToUpRepAndTime();
+
+    int updateStateById(@Param("state") String state, @Param("list") List<String> list);
+
+    int selectIsExit(@Param("id") String id);
+
+    //添加一个查询标准，但是不判断标准是否删除
+    List<SarStandardsInfoEO> selectStandardsInfoByIdAndRoleAll(SarStandardsInfoEOPage standEO);
+
+    List<SarStandardsInfoEO> selectStandardsInfoBynumber(SarStandardsInfoEOPage page);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSpiltValTableExportDto.java

@@ -0,0 +1,43 @@
+package com.adc.da.slrs.standardSplit.dto;
+
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsTableEO;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/2/14 10:06
+ */
+public class FileSpiltValTableExportDto {
+
+    private String tableName;
+
+    private List<List<SarFileSplitItemsTableEO>> tableEOList;
+
+    private String tableHtCon;
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public List<List<SarFileSplitItemsTableEO>> getTableEOList() {
+        return tableEOList;
+    }
+
+    public void setTableEOList(List<List<SarFileSplitItemsTableEO>> tableEOList) {
+        this.tableEOList = tableEOList;
+    }
+
+    public String getTableHtCon() {
+        return tableHtCon;
+    }
+
+    public void setTableHtCon(String tableHtCon) {
+        this.tableHtCon = tableHtCon;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/FileSplitValImgExportDto.java

@@ -0,0 +1,29 @@
+package com.adc.da.slrs.standardSplit.dto;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/2/14 15:58
+ */
+public class FileSplitValImgExportDto {
+
+    private String imgName;
+
+    private String imgPath;
+
+    public String getImgName() {
+        return imgName;
+    }
+
+    public void setImgName(String imgName) {
+        this.imgName = imgName;
+    }
+
+    public String getImgPath() {
+        return imgPath;
+    }
+
+    public void setImgPath(String imgPath) {
+        this.imgPath = imgPath;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dto/SarFileSplitItemsImportDto.java

@@ -0,0 +1,148 @@
+package com.adc.da.slrs.standardSplit.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+
+/**
+ * @Description:
+ * @Author: yangxuenan
+ * date: 2020/5/9 14:40
+ */
+public class SarFileSplitItemsImportDto {
+    @Excel(name = "条款号", orderNum = "1")
+    private String itemsNum;
+
+    @Excel(name = "条款名称", orderNum = "1")
+    private String itemsName;
+
+    @Excel(name = "内容简介", orderNum = "1")
+    private String itermsConditions;
+
+    @Excel(name = "责任部门", orderNum = "1")
+    private String responsibleUnit;
+
+//    @Excel(name = "责任部门", orderNum = "1")
+    private String newcarPutTime;
+
+    @Excel(name = "FO", orderNum = "1")
+    private String fo;
+
+    @Excel(name = "责任工程师", orderNum = "1")
+    private String dutyEngineer;
+
+    @Excel(name = "SVPPS", orderNum = "1")
+    private String svpps;
+
+    @Excel(name = "适用车辆类型", orderNum = "1")
+    private String applyArctic;
+
+    @Excel(name = "要求类型", orderNum = "1")
+    private String claimType;
+
+    @Excel(name = "企标覆盖关系", orderNum = "1")
+    private String busStandCover;
+
+
+
+//    @Excel(name = "在产车实施日期", orderNum = "1")
+//    private Date productPutTime;
+//
+//    @Excel(name = "引用标准", orderNum = "1")
+//    private String referenceStand;
+//
+//    @Excel(name = "备注", orderNum = "1")
+//    private String remarks;
+//
+//    @Excel(name = "关联文件", orderNum = "1")
+//    private String relevanceFile;
+//
+//    private String relevanceFileName;
+
+
+    public String getItemsNum() {
+        return itemsNum;
+    }
+
+    public void setItemsNum(String itemsNum) {
+        this.itemsNum = itemsNum;
+    }
+
+    public String getItemsName() {
+        return itemsName;
+    }
+
+    public void setItemsName(String itemsName) {
+        this.itemsName = itemsName;
+    }
+
+    public String getItermsConditions() {
+        return itermsConditions;
+    }
+
+    public void setItermsConditions(String itermsConditions) {
+        this.itermsConditions = itermsConditions;
+    }
+
+    public String getResponsibleUnit() {
+        return responsibleUnit;
+    }
+
+    public void setResponsibleUnit(String responsibleUnit) {
+        this.responsibleUnit = responsibleUnit;
+    }
+
+    public String getNewcarPutTime() {
+        return newcarPutTime;
+    }
+
+    public void setNewcarPutTime(String newcarPutTime) {
+        this.newcarPutTime = newcarPutTime;
+    }
+
+    public String getFo() {
+        return fo;
+    }
+
+    public void setFo(String fo) {
+        this.fo = fo;
+    }
+
+    public String getDutyEngineer() {
+        return dutyEngineer;
+    }
+
+    public void setDutyEngineer(String dutyEngineer) {
+        this.dutyEngineer = dutyEngineer;
+    }
+
+    public String getSvpps() {
+        return svpps;
+    }
+
+    public void setSvpps(String svpps) {
+        this.svpps = svpps;
+    }
+
+    public String getApplyArctic() {
+        return applyArctic;
+    }
+
+    public void setApplyArctic(String applyArctic) {
+        this.applyArctic = applyArctic;
+    }
+
+    public String getClaimType() {
+        return claimType;
+    }
+
+    public void setClaimType(String claimType) {
+        this.claimType = claimType;
+    }
+
+    public String getBusStandCover() {
+        return busStandCover;
+    }
+
+    public void setBusStandCover(String busStandCover) {
+        this.busStandCover = busStandCover;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/DrageMenuEO.java

@@ -0,0 +1,87 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+
+/**
+ * <b>功能：</b>MSG_BROWSE_INFO MsgBrowseInfoEOEntity<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2018-09-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class DrageMenuEO extends BaseEntity {
+
+    private String menuId;
+    private String menuParentId;
+    private Long menuDisplay;
+    private String targetMenuId;
+    private String targetParentId;
+    private Long targetMenuDisplay;
+    private String infoId;
+    private String moveType;
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public String getMenuParentId() {
+        return menuParentId;
+    }
+
+    public void setMenuParentId(String menuParentId) {
+        this.menuParentId = menuParentId;
+    }
+
+
+
+    public String getTargetMenuId() {
+        return targetMenuId;
+    }
+
+    public void setTargetMenuId(String targetMenuId) {
+        this.targetMenuId = targetMenuId;
+    }
+
+    public String getTargetParentId() {
+        return targetParentId;
+    }
+
+    public void setTargetParentId(String targetParentId) {
+        this.targetParentId = targetParentId;
+    }
+
+    public Long getMenuDisplay() {
+        return menuDisplay;
+    }
+
+    public void setMenuDisplay(Long menuDisplay) {
+        this.menuDisplay = menuDisplay;
+    }
+
+    public Long getTargetMenuDisplay() {
+        return targetMenuDisplay;
+    }
+
+    public void setTargetMenuDisplay(Long targetMenuDisplay) {
+        this.targetMenuDisplay = targetMenuDisplay;
+    }
+
+    public String getInfoId() {
+        return infoId;
+    }
+
+    public void setInfoId(String infoId) {
+        this.infoId = infoId;
+    }
+
+    public String getMoveType() {
+        return moveType;
+    }
+
+    public void setMoveType(String moveType) {
+        this.moveType = moveType;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarCompStatusInfoEO.java

@@ -0,0 +1,423 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * <b>功能：</b>SAR_COMP_STATUS_INFO SarCompStatusInfoEOEntity<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2021-02-04 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarCompStatusInfoEO extends BaseEntity {
+
+    private String id;
+    private String sarType;
+    private String sarId;
+    private String sarItemId;
+    private String sarState;
+    private String sarItemState;
+    private String prcNum;
+    private String color;
+    private String prcState;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date creationTime;
+    private String nonConfomity;
+    private String current;//我司现状
+    private String changeScheme;//更改方案
+    private String estimatedChangeCycle;
+    private String estimatedCost;
+    private String riskPoint;
+    private String verificationScheme;
+    private String justified;
+    private String compPerson;
+    private String compPersonName;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date compTime;
+    private String state;
+    private String sarNumber;
+    private String sarItemNumber;
+    private String standId;
+    private String standType;
+    private String standCode;
+    private String standName;
+    private String createType;
+
+    /**
+     * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>id -> id</li>
+     * <li>sarType -> sar_type</li>
+     * <li>sarId -> sar_id</li>
+     * <li>sarItemId -> sar_item_id</li>
+     * <li>sarState -> sar_state</li>
+     * <li>sarItemState -> sar_item_state</li>
+     * <li>prcNum -> prc_num</li>
+     * <li>color -> color</li>
+     * <li>prcState -> prc_state</li>
+     * <li>creationTime -> creation_time</li>
+     * <li>nonConfomity -> non_confomity</li>
+     * <li>current -> current</li>
+     * <li>changeScheme -> change_scheme</li>
+     * <li>estimatedChangeCycle -> estimated_change_cycle</li>
+     * <li>estimatedCost -> estimated_cost</li>
+     * <li>riskPoint -> risk_point</li>
+     * <li>verificationScheme -> verification_scheme</li>
+     * <li>justified -> justified</li>
+     * <li>compPerson -> comp_person</li>
+     * <li>compTime -> comp_time</li>
+     */
+    public static String fieldToColumn(String fieldName) {
+        if (fieldName == null) return null;
+        switch (fieldName) {
+            case "id": return "id";
+            case "sarType": return "sar_type";
+            case "sarId": return "sar_id";
+            case "sarItemId": return "sar_item_id";
+            case "sarState": return "sar_state";
+            case "sarItemState": return "sar_item_state";
+            case "prcNum": return "prc_num";
+            case "color": return "color";
+            case "prcState": return "prc_state";
+            case "creationTime": return "creation_time";
+            case "nonConfomity": return "non_confomity";
+            case "current": return "current";
+            case "changeScheme": return "change_scheme";
+            case "estimatedChangeCycle": return "estimated_change_cycle";
+            case "estimatedCost": return "estimated_cost";
+            case "riskPoint": return "risk_point";
+            case "verificationScheme": return "verification_scheme";
+            case "justified": return "justified";
+            case "compPerson": return "comp_person";
+            case "compTime": return "comp_time";
+            default: return null;
+        }
+    }
+
+    /**
+     * 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>id -> id</li>
+     * <li>sar_type -> sarType</li>
+     * <li>sar_id -> sarId</li>
+     * <li>sar_item_id -> sarItemId</li>
+     * <li>sar_state -> sarState</li>
+     * <li>sar_item_state -> sarItemState</li>
+     * <li>prc_num -> prcNum</li>
+     * <li>color -> color</li>
+     * <li>prc_state -> prcState</li>
+     * <li>creation_time -> creationTime</li>
+     * <li>non_confomity -> nonConfomity</li>
+     * <li>current -> current</li>
+     * <li>change_scheme -> changeScheme</li>
+     * <li>estimated_change_cycle -> estimatedChangeCycle</li>
+     * <li>estimated_cost -> estimatedCost</li>
+     * <li>risk_point -> riskPoint</li>
+     * <li>verification_scheme -> verificationScheme</li>
+     * <li>justified -> justified</li>
+     * <li>comp_person -> compPerson</li>
+     * <li>comp_time -> compTime</li>
+     */
+    public static String columnToField(String columnName) {
+        if (columnName == null) return null;
+        switch (columnName) {
+            case "id": return "id";
+            case "sar_type": return "sarType";
+            case "sar_id": return "sarId";
+            case "sar_item_id": return "sarItemId";
+            case "sar_state": return "sarState";
+            case "sar_item_state": return "sarItemState";
+            case "prc_num": return "prcNum";
+            case "color": return "color";
+            case "prc_state": return "prcState";
+            case "creation_time": return "creationTime";
+            case "non_confomity": return "nonConfomity";
+            case "current": return "current";
+            case "change_scheme": return "changeScheme";
+            case "estimated_change_cycle": return "estimatedChangeCycle";
+            case "estimated_cost": return "estimatedCost";
+            case "risk_point": return "riskPoint";
+            case "verification_scheme": return "verificationScheme";
+            case "justified": return "justified";
+            case "comp_person": return "compPerson";
+            case "comp_time": return "compTime";
+            default: return null;
+        }
+    }
+
+    /**  **/
+    public String getId() {
+        return this.id;
+    }
+
+    /**  **/
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**  **/
+    public String getSarType() {
+        return this.sarType;
+    }
+
+    /**  **/
+    public void setSarType(String sarType) {
+        this.sarType = sarType;
+    }
+
+    /**  **/
+    public String getSarId() {
+        return this.sarId;
+    }
+
+    /**  **/
+    public void setSarId(String sarId) {
+        this.sarId = sarId;
+    }
+
+    /**  **/
+    public String getSarItemId() {
+        return this.sarItemId;
+    }
+
+    /**  **/
+    public void setSarItemId(String sarItemId) {
+        this.sarItemId = sarItemId;
+    }
+
+    /**  **/
+    public String getSarState() {
+        return this.sarState;
+    }
+
+    /**  **/
+    public void setSarState(String sarState) {
+        this.sarState = sarState;
+    }
+
+    /**  **/
+    public String getSarItemState() {
+        return this.sarItemState;
+    }
+
+    /**  **/
+    public void setSarItemState(String sarItemState) {
+        this.sarItemState = sarItemState;
+    }
+
+    /**  **/
+    public String getPrcNum() {
+        return this.prcNum;
+    }
+
+    /**  **/
+    public void setPrcNum(String prcNum) {
+        this.prcNum = prcNum;
+    }
+
+    /**  **/
+    public String getColor() {
+        return this.color;
+    }
+
+    /**  **/
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    /**  **/
+    public String getPrcState() {
+        return this.prcState;
+    }
+
+    /**  **/
+    public void setPrcState(String prcState) {
+        this.prcState = prcState;
+    }
+
+    /**  **/
+    public Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**  **/
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**  **/
+    public String getNonConfomity() {
+        return this.nonConfomity;
+    }
+
+    /**  **/
+    public void setNonConfomity(String nonConfomity) {
+        this.nonConfomity = nonConfomity;
+    }
+
+    /**  **/
+    public String getCurrent() {
+        return this.current;
+    }
+
+    /**  **/
+    public void setCurrent(String current) {
+        this.current = current;
+    }
+
+    /**  **/
+    public String getChangeScheme() {
+        return this.changeScheme;
+    }
+
+    /**  **/
+    public void setChangeScheme(String changeScheme) {
+        this.changeScheme = changeScheme;
+    }
+
+    /**  **/
+    public String getEstimatedChangeCycle() {
+        return this.estimatedChangeCycle;
+    }
+
+    /**  **/
+    public void setEstimatedChangeCycle(String estimatedChangeCycle) {
+        this.estimatedChangeCycle = estimatedChangeCycle;
+    }
+
+    /**  **/
+    public String getEstimatedCost() {
+        return this.estimatedCost;
+    }
+
+    /**  **/
+    public void setEstimatedCost(String estimatedCost) {
+        this.estimatedCost = estimatedCost;
+    }
+
+    /**  **/
+    public String getRiskPoint() {
+        return this.riskPoint;
+    }
+
+    /**  **/
+    public void setRiskPoint(String riskPoint) {
+        this.riskPoint = riskPoint;
+    }
+
+    /**  **/
+    public String getVerificationScheme() {
+        return this.verificationScheme;
+    }
+
+    /**  **/
+    public void setVerificationScheme(String verificationScheme) {
+        this.verificationScheme = verificationScheme;
+    }
+
+    /**  **/
+    public String getJustified() {
+        return this.justified;
+    }
+
+    /**  **/
+    public void setJustified(String justified) {
+        this.justified = justified;
+    }
+
+    /**  **/
+    public String getCompPerson() {
+        return this.compPerson;
+    }
+
+    /**  **/
+    public void setCompPerson(String compPerson) {
+        this.compPerson = compPerson;
+    }
+
+    /**  **/
+    public Date getCompTime() {
+        return this.compTime;
+    }
+
+    /**  **/
+    public void setCompTime(Date compTime) {
+        this.compTime = compTime;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getSarNumber() {
+        return sarNumber;
+    }
+
+    public void setSarNumber(String sarNumber) {
+        this.sarNumber = sarNumber;
+    }
+
+    public String getSarItemNumber() {
+        return sarItemNumber;
+    }
+
+    public void setSarItemNumber(String sarItemNumber) {
+        this.sarItemNumber = sarItemNumber;
+    }
+
+    public String getStandId() {
+        return standId;
+    }
+
+    public void setStandId(String standId) {
+        this.standId = standId;
+    }
+
+    public String getStandType() {
+        return standType;
+    }
+
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
+
+    public String getStandCode() {
+        return standCode;
+    }
+
+    public void setStandCode(String standCode) {
+        this.standCode = standCode;
+    }
+
+    public String getStandName() {
+        return standName;
+    }
+
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    public String getCompPersonName() {
+        return compPersonName;
+    }
+
+    public void setCompPersonName(String compPersonName) {
+        this.compPersonName = compPersonName;
+    }
+
+    public String getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(String createType) {
+        this.createType = createType;
+    }
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsParamsEOPage.java

@@ -0,0 +1,194 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+
+/**
+ * <b>功能：</b>SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-02-04 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarFileSplitItemsParamsEOPage extends BasePage {
+
+    private String id;
+    private String idOperator = "=";
+    private String itemId;
+    private String itemIdOperator = "=";
+    private String description;
+    private String descriptionOperator = "=";
+    private String figure;
+    private String figureOperator = "=";
+    private String validFlag;
+    private String validFlagOperator = "=";
+    private String creationTime;
+    private String creationTime1;
+    private String creationTime2;
+    private String creationTimeOperator = "=";
+    private String modifyTime;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private String infoId;
+    private String infoIdOperator = "=";
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdOperator() {
+        return this.idOperator;
+    }
+
+    public void setIdOperator(String idOperator) {
+        this.idOperator = idOperator;
+    }
+
+    public String getItemId() {
+        return this.itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getItemIdOperator() {
+        return this.itemIdOperator;
+    }
+
+    public void setItemIdOperator(String itemIdOperator) {
+        this.itemIdOperator = itemIdOperator;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescriptionOperator() {
+        return this.descriptionOperator;
+    }
+
+    public void setDescriptionOperator(String descriptionOperator) {
+        this.descriptionOperator = descriptionOperator;
+    }
+
+    public String getFigure() {
+        return this.figure;
+    }
+
+    public void setFigure(String figure) {
+        this.figure = figure;
+    }
+
+    public String getFigureOperator() {
+        return this.figureOperator;
+    }
+
+    public void setFigureOperator(String figureOperator) {
+        this.figureOperator = figureOperator;
+    }
+
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getValidFlagOperator() {
+        return this.validFlagOperator;
+    }
+
+    public void setValidFlagOperator(String validFlagOperator) {
+        this.validFlagOperator = validFlagOperator;
+    }
+
+    public String getCreationTime() {
+        return this.creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCreationTime1() {
+        return this.creationTime1;
+    }
+
+    public void setCreationTime1(String creationTime1) {
+        this.creationTime1 = creationTime1;
+    }
+
+    public String getCreationTime2() {
+        return this.creationTime2;
+    }
+
+    public void setCreationTime2(String creationTime2) {
+        this.creationTime2 = creationTime2;
+    }
+
+    public String getCreationTimeOperator() {
+        return this.creationTimeOperator;
+    }
+
+    public void setCreationTimeOperator(String creationTimeOperator) {
+        this.creationTimeOperator = creationTimeOperator;
+    }
+
+    public String getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(String modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getModifyTime1() {
+        return this.modifyTime1;
+    }
+
+    public void setModifyTime1(String modifyTime1) {
+        this.modifyTime1 = modifyTime1;
+    }
+
+    public String getModifyTime2() {
+        return this.modifyTime2;
+    }
+
+    public void setModifyTime2(String modifyTime2) {
+        this.modifyTime2 = modifyTime2;
+    }
+
+    public String getModifyTimeOperator() {
+        return this.modifyTimeOperator;
+    }
+
+    public void setModifyTimeOperator(String modifyTimeOperator) {
+        this.modifyTimeOperator = modifyTimeOperator;
+    }
+
+    public String getInfoId() {
+        return this.infoId;
+    }
+
+    public void setInfoId(String infoId) {
+        this.infoId = infoId;
+    }
+
+    public String getInfoIdOperator() {
+        return this.infoIdOperator;
+    }
+
+    public void setInfoIdOperator(String infoIdOperator) {
+        this.infoIdOperator = infoIdOperator;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEOPage.java

@@ -0,0 +1,230 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+
+/**
+ * <b>功能：</b>SAR_FILE_SPLIT_ITEMS_VAL SarFileSplitItemsValEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-01-07 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarFileSplitItemsValEOPage extends BasePage {
+
+    private String id;
+    private String idOperator = "=";
+    private String type;
+    private String typeOperator = "=";
+    private String itemId;
+    private String itemIdOperator = "=";
+    private String itemContent;
+    private String itemContentOperator = "=";
+    private String validFlag;
+    private String validFlagOperator = "=";
+    private String creationUser;
+    private String creationUserOperator = "=";
+    private String creationTime;
+    private String creationTime1;
+    private String creationTime2;
+    private String creationTimeOperator = "=";
+    private String modifyTime;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private String modifyUser;
+    private String modifyUserOperator = "=";
+    private String displaySeq;
+    private String displaySeqOperator = "=";
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdOperator() {
+        return this.idOperator;
+    }
+
+    public void setIdOperator(String idOperator) {
+        this.idOperator = idOperator;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTypeOperator() {
+        return this.typeOperator;
+    }
+
+    public void setTypeOperator(String typeOperator) {
+        this.typeOperator = typeOperator;
+    }
+
+    public String getItemId() {
+        return this.itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getItemIdOperator() {
+        return this.itemIdOperator;
+    }
+
+    public void setItemIdOperator(String itemIdOperator) {
+        this.itemIdOperator = itemIdOperator;
+    }
+
+    public String getItemContent() {
+        return this.itemContent;
+    }
+
+    public void setItemContent(String itemContent) {
+        this.itemContent = itemContent;
+    }
+
+    public String getItemContentOperator() {
+        return this.itemContentOperator;
+    }
+
+    public void setItemContentOperator(String itemContentOperator) {
+        this.itemContentOperator = itemContentOperator;
+    }
+
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getValidFlagOperator() {
+        return this.validFlagOperator;
+    }
+
+    public void setValidFlagOperator(String validFlagOperator) {
+        this.validFlagOperator = validFlagOperator;
+    }
+
+    public String getCreationUser() {
+        return this.creationUser;
+    }
+
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    public String getCreationUserOperator() {
+        return this.creationUserOperator;
+    }
+
+    public void setCreationUserOperator(String creationUserOperator) {
+        this.creationUserOperator = creationUserOperator;
+    }
+
+    public String getCreationTime() {
+        return this.creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCreationTime1() {
+        return this.creationTime1;
+    }
+
+    public void setCreationTime1(String creationTime1) {
+        this.creationTime1 = creationTime1;
+    }
+
+    public String getCreationTime2() {
+        return this.creationTime2;
+    }
+
+    public void setCreationTime2(String creationTime2) {
+        this.creationTime2 = creationTime2;
+    }
+
+    public String getCreationTimeOperator() {
+        return this.creationTimeOperator;
+    }
+
+    public void setCreationTimeOperator(String creationTimeOperator) {
+        this.creationTimeOperator = creationTimeOperator;
+    }
+
+    public String getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(String modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getModifyTime1() {
+        return this.modifyTime1;
+    }
+
+    public void setModifyTime1(String modifyTime1) {
+        this.modifyTime1 = modifyTime1;
+    }
+
+    public String getModifyTime2() {
+        return this.modifyTime2;
+    }
+
+    public void setModifyTime2(String modifyTime2) {
+        this.modifyTime2 = modifyTime2;
+    }
+
+    public String getModifyTimeOperator() {
+        return this.modifyTimeOperator;
+    }
+
+    public void setModifyTimeOperator(String modifyTimeOperator) {
+        this.modifyTimeOperator = modifyTimeOperator;
+    }
+
+    public String getModifyUser() {
+        return this.modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+    public String getModifyUserOperator() {
+        return this.modifyUserOperator;
+    }
+
+    public void setModifyUserOperator(String modifyUserOperator) {
+        this.modifyUserOperator = modifyUserOperator;
+    }
+
+    public String getDisplaySeq() {
+        return this.displaySeq;
+    }
+
+    public void setDisplaySeq(String displaySeq) {
+        this.displaySeq = displaySeq;
+    }
+
+    public String getDisplaySeqOperator() {
+        return this.displaySeqOperator;
+    }
+
+    public void setDisplaySeqOperator(String displaySeqOperator) {
+        this.displaySeqOperator = displaySeqOperator;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitMenuEOPage.java

@@ -0,0 +1,248 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+
+/**
+ * <b>功能：</b>SAR_FILE_SPLIT_MENU SarFileSplitMenuEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-01-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarFileSplitMenuEOPage extends BasePage {
+
+    private String id;
+    private String idOperator = "=";
+    private String infoId;
+    private String infoIdOperator = "=";
+    private String name;
+    private String nameOperator = "=";
+    private String pId;
+    private String pIdOperator = "=";
+    private String displaySeq;
+    private String displaySeqOperator = "=";
+    private String validFlag;
+    private String validFlagOperator = "=";
+    private String creationTime;
+    private String creationTime1;
+    private String creationTime2;
+    private String creationTimeOperator = "=";
+    private String modifyTime;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private String remarks;
+    private String remarksOperator = "=";
+    private String creationUser;
+    private String creationUserOperator = "=";
+    private String modifyUser;
+    private String modifyUserOperator = "=";
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdOperator() {
+        return this.idOperator;
+    }
+
+    public void setIdOperator(String idOperator) {
+        this.idOperator = idOperator;
+    }
+
+    public String getInfoId() {
+        return this.infoId;
+    }
+
+    public void setInfoId(String infoId) {
+        this.infoId = infoId;
+    }
+
+    public String getInfoIdOperator() {
+        return this.infoIdOperator;
+    }
+
+    public void setInfoIdOperator(String infoIdOperator) {
+        this.infoIdOperator = infoIdOperator;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNameOperator() {
+        return this.nameOperator;
+    }
+
+    public void setNameOperator(String nameOperator) {
+        this.nameOperator = nameOperator;
+    }
+
+    public String getPId() {
+        return this.pId;
+    }
+
+    public void setPId(String pId) {
+        this.pId = pId;
+    }
+
+    public String getPIdOperator() {
+        return this.pIdOperator;
+    }
+
+    public void setPIdOperator(String pIdOperator) {
+        this.pIdOperator = pIdOperator;
+    }
+
+    public String getDisplaySeq() {
+        return this.displaySeq;
+    }
+
+    public void setDisplaySeq(String displaySeq) {
+        this.displaySeq = displaySeq;
+    }
+
+    public String getDisplaySeqOperator() {
+        return this.displaySeqOperator;
+    }
+
+    public void setDisplaySeqOperator(String displaySeqOperator) {
+        this.displaySeqOperator = displaySeqOperator;
+    }
+
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getValidFlagOperator() {
+        return this.validFlagOperator;
+    }
+
+    public void setValidFlagOperator(String validFlagOperator) {
+        this.validFlagOperator = validFlagOperator;
+    }
+
+    public String getCreationTime() {
+        return this.creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCreationTime1() {
+        return this.creationTime1;
+    }
+
+    public void setCreationTime1(String creationTime1) {
+        this.creationTime1 = creationTime1;
+    }
+
+    public String getCreationTime2() {
+        return this.creationTime2;
+    }
+
+    public void setCreationTime2(String creationTime2) {
+        this.creationTime2 = creationTime2;
+    }
+
+    public String getCreationTimeOperator() {
+        return this.creationTimeOperator;
+    }
+
+    public void setCreationTimeOperator(String creationTimeOperator) {
+        this.creationTimeOperator = creationTimeOperator;
+    }
+
+    public String getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(String modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getModifyTime1() {
+        return this.modifyTime1;
+    }
+
+    public void setModifyTime1(String modifyTime1) {
+        this.modifyTime1 = modifyTime1;
+    }
+
+    public String getModifyTime2() {
+        return this.modifyTime2;
+    }
+
+    public void setModifyTime2(String modifyTime2) {
+        this.modifyTime2 = modifyTime2;
+    }
+
+    public String getModifyTimeOperator() {
+        return this.modifyTimeOperator;
+    }
+
+    public void setModifyTimeOperator(String modifyTimeOperator) {
+        this.modifyTimeOperator = modifyTimeOperator;
+    }
+
+    public String getRemarks() {
+        return this.remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getRemarksOperator() {
+        return this.remarksOperator;
+    }
+
+    public void setRemarksOperator(String remarksOperator) {
+        this.remarksOperator = remarksOperator;
+    }
+
+    public String getCreationUser() {
+        return this.creationUser;
+    }
+
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    public String getCreationUserOperator() {
+        return this.creationUserOperator;
+    }
+
+    public void setCreationUserOperator(String creationUserOperator) {
+        this.creationUserOperator = creationUserOperator;
+    }
+
+    public String getModifyUser() {
+        return this.modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
+    public String getModifyUserOperator() {
+        return this.modifyUserOperator;
+    }
+
+    public void setModifyUserOperator(String modifyUserOperator) {
+        this.modifyUserOperator = modifyUserOperator;
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandAttrDetailsEOPage.java

@@ -0,0 +1,301 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+
+/**
+ * <b>功能：</b>SAR_STAND_ATTR_DETAILS SarStandAttrDetailsEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-08-17 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarStandAttrDetailsEOPage extends BasePage {
+
+    private String id;
+    private String idOperator = "=";
+    private String attrField;
+    private String attrFieldOperator = "=";
+    private String attrName;
+    private String attrNameOperator = "=";
+    private String attrType;
+    private String attrTypeOperator = "=";
+    private String orderNum;
+    private String orderNumOperator = "=";
+    private String isEdit;
+    private String isEditOperator = "=";
+    private String creationUser;
+    private String creationUserOperator = "=";
+    private String validFlag;
+    private String validFlagOperator = "=";
+    private String creationTime;
+    private String creationTime1;
+    private String creationTime2;
+    private String creationTimeOperator = "=";
+    private String modifyTime;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private String attrLen;
+    private String attrLenOperator = "=";
+    private String[] idList;
+    private String notId;
+    private String sarType;
+    private String isSearch;
+    private String isWarn;
+    private String isShow;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdOperator() {
+        return this.idOperator;
+    }
+
+    public void setIdOperator(String idOperator) {
+        this.idOperator = idOperator;
+    }
+
+    public String getAttrField() {
+        return this.attrField;
+    }
+
+    public void setAttrField(String attrField) {
+        this.attrField = attrField;
+    }
+
+    public String getAttrFieldOperator() {
+        return this.attrFieldOperator;
+    }
+
+    public void setAttrFieldOperator(String attrFieldOperator) {
+        this.attrFieldOperator = attrFieldOperator;
+    }
+
+    public String getAttrName() {
+        return this.attrName;
+    }
+
+    public void setAttrName(String attrName) {
+        this.attrName = attrName;
+    }
+
+    public String getAttrNameOperator() {
+        return this.attrNameOperator;
+    }
+
+    public void setAttrNameOperator(String attrNameOperator) {
+        this.attrNameOperator = attrNameOperator;
+    }
+
+    public String getAttrType() {
+        return this.attrType;
+    }
+
+    public void setAttrType(String attrType) {
+        this.attrType = attrType;
+    }
+
+    public String getAttrTypeOperator() {
+        return this.attrTypeOperator;
+    }
+
+    public void setAttrTypeOperator(String attrTypeOperator) {
+        this.attrTypeOperator = attrTypeOperator;
+    }
+
+    public String getOrderNum() {
+        return this.orderNum;
+    }
+
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    public String getOrderNumOperator() {
+        return this.orderNumOperator;
+    }
+
+    public void setOrderNumOperator(String orderNumOperator) {
+        this.orderNumOperator = orderNumOperator;
+    }
+
+    public String getIsEdit() {
+        return this.isEdit;
+    }
+
+    public void setIsEdit(String isEdit) {
+        this.isEdit = isEdit;
+    }
+
+    public String getIsEditOperator() {
+        return this.isEditOperator;
+    }
+
+    public void setIsEditOperator(String isEditOperator) {
+        this.isEditOperator = isEditOperator;
+    }
+
+    public String getCreationUser() {
+        return this.creationUser;
+    }
+
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    public String getCreationUserOperator() {
+        return this.creationUserOperator;
+    }
+
+    public void setCreationUserOperator(String creationUserOperator) {
+        this.creationUserOperator = creationUserOperator;
+    }
+
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getValidFlagOperator() {
+        return this.validFlagOperator;
+    }
+
+    public void setValidFlagOperator(String validFlagOperator) {
+        this.validFlagOperator = validFlagOperator;
+    }
+
+    public String getCreationTime() {
+        return this.creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCreationTime1() {
+        return this.creationTime1;
+    }
+
+    public void setCreationTime1(String creationTime1) {
+        this.creationTime1 = creationTime1;
+    }
+
+    public String getCreationTime2() {
+        return this.creationTime2;
+    }
+
+    public void setCreationTime2(String creationTime2) {
+        this.creationTime2 = creationTime2;
+    }
+
+    public String getCreationTimeOperator() {
+        return this.creationTimeOperator;
+    }
+
+    public void setCreationTimeOperator(String creationTimeOperator) {
+        this.creationTimeOperator = creationTimeOperator;
+    }
+
+    public String getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(String modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getModifyTime1() {
+        return this.modifyTime1;
+    }
+
+    public void setModifyTime1(String modifyTime1) {
+        this.modifyTime1 = modifyTime1;
+    }
+
+    public String getModifyTime2() {
+        return this.modifyTime2;
+    }
+
+    public void setModifyTime2(String modifyTime2) {
+        this.modifyTime2 = modifyTime2;
+    }
+
+    public String getModifyTimeOperator() {
+        return this.modifyTimeOperator;
+    }
+
+    public void setModifyTimeOperator(String modifyTimeOperator) {
+        this.modifyTimeOperator = modifyTimeOperator;
+    }
+
+    public String getAttrLen() {
+        return this.attrLen;
+    }
+
+    public void setAttrLen(String attrLen) {
+        this.attrLen = attrLen;
+    }
+
+    public String getAttrLenOperator() {
+        return this.attrLenOperator;
+    }
+
+    public void setAttrLenOperator(String attrLenOperator) {
+        this.attrLenOperator = attrLenOperator;
+    }
+
+    public String[] getIdList() {
+        return idList;
+    }
+
+    public void setIdList(String[] idList) {
+        this.idList = idList;
+    }
+
+    public String getNotId() {
+        return notId;
+    }
+
+    public void setNotId(String notId) {
+        this.notId = notId;
+    }
+
+    public String getSarType() {
+        return sarType;
+    }
+
+    public void setSarType(String sarType) {
+        this.sarType = sarType;
+    }
+
+    public String getIsSearch() {
+        return isSearch;
+    }
+
+    public void setIsSearch(String isSearch) {
+        this.isSearch = isSearch;
+    }
+
+    public String getIsWarn() {
+        return isWarn;
+    }
+
+    public void setIsWarn(String isWarn) {
+        this.isWarn = isWarn;
+    }
+
+    public String getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(String isShow) {
+        this.isShow = isShow;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java

@@ -1,6 +1,6 @@
 package com.adc.da.slrs.standardSplit.entity;
 
-import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.base.page.BasePage;
 
 /**
  * <b>功能：</b>SAR_STAND_FILE SarStandFileEOPage<br>
@@ -8,7 +8,7 @@ import com.adc.da.base.entity.BaseEntity;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
-public class SarStandFileEOPage extends BaseEntity {
+public class SarStandFileEOPage extends BasePage {
 
     private String modifyTime;
     private String modifyTime1;

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java

@@ -0,0 +1,486 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <b>功能：</b>SAR_STAND_ITEMS SarStandItemsEOEntity<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2018-09-03 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarStandItemsEO extends BaseEntity {
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+    private String creationUser;
+    private Integer validFlag;
+    private String remarks;
+    private String responsibleUnit;
+    private String energyKind;
+    private String applyArctic;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date tackTime;
+    private String parts;
+    private String itemsName;
+    private String itemsNum;
+    private String standId;
+    private String id;
+    private String emergyKindShow;
+    private String applyArcticShow;
+    private String responsibleUnitShow;
+    private String termsConditions; //条款要求
+    private String mainPointImplementation; //实施要点
+    //新加字段
+    private String fo;//FO
+    private String foUser;//FO
+    private String dutyEngineer;//责任工程师
+    private String svpps;//SVPPS
+    private String claimType;//要求类型
+    private String busStandCover;//企标覆盖关系
+    private String fileType;//文件类型
+    //新加字段带show
+    private String foShow;//FO
+    private String dutyEngineerShow;//责任工程师
+    private String svppsShow;//SVPPS
+    private String claimTypeShow;//要求类型
+    private String busStandCoverShow;//企标覆盖关系
+    private String fileTypeShow;//文件类型
+    private String itemState;//条款状态
+    private List<String> idList;
+    private String oldId;
+    private String jspg;
+    private SarCompStatusInfoEO pgForm;
+
+    private String menuId;
+    /**
+     * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>modifyTime -> modify_time</li>
+     * <li>creationTime -> creation_time</li>
+     * <li>creationUser -> creation_user</li>
+     * <li>validFlag -> valid_flag</li>
+     * <li>remarks -> remarks</li>
+     * <li>responsibleUnit -> responsible_unit</li>
+     * <li>energyKind -> energy_kind</li>
+     * <li>applyArctic -> apply_arctic</li>
+     * <li>tackTime -> tack_time</li>
+     * <li>parts -> parts</li>
+     * <li>itemsName -> items_name</li>
+     * <li>itemsNum -> items_num</li>
+     * <li>standId -> stand_id</li>
+     * <li>id -> id</li>
+     */
+    public static String fieldToColumn(String fieldName) {
+        if (fieldName == null){ return null;}
+        switch (fieldName) {
+            case "modifyTime": return "modify_time";
+            case "creationTime": return "creation_time";
+            case "creationUser": return "creation_user";
+            case "validFlag": return "valid_flag";
+            case "remarks": return "remarks";
+            case "responsibleUnit": return "responsible_unit";
+            case "energyKind": return "energy_kind";
+            case "applyArctic": return "apply_arctic";
+            case "tackTime": return "tack_time";
+            case "parts": return "parts";
+            case "itemsName": return "items_name";
+            case "itemsNum": return "items_num";
+            case "standId": return "stand_id";
+            case "id": return "id";
+            case "termsConditions": return "terms_conditions";
+            case "mainPointImplementation": return "MAINPOINTS_IMPEMENTATION";
+            case "fo": return "fo";
+            case "dutyEngineer": return "duty_engineer";
+            case "svpps": return "svpps";
+            case "claimType": return "claim_type";
+            case "busStandCover": return "bus_stand_cover";
+            case "fileType": return "file_type";
+            default: return null;
+        }
+    }
+
+    /**
+     * 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>modify_time -> modifyTime</li>
+     * <li>creation_time -> creationTime</li>
+     * <li>creation_user -> creationUser</li>
+     * <li>valid_flag -> validFlag</li>
+     * <li>remarks -> remarks</li>
+     * <li>responsible_unit -> responsibleUnit</li>
+     * <li>energy_kind -> energyKind</li>
+     * <li>apply_arctic -> applyArctic</li>
+     * <li>tack_time -> tackTime</li>
+     * <li>parts -> parts</li>
+     * <li>items_name -> itemsName</li>
+     * <li>items_num -> itemsNum</li>
+     * <li>stand_id -> standId</li>
+     * <li>id -> id</li>
+     */
+    public static String columnToField(String columnName) {
+        if (columnName == null){ return null;}
+        switch (columnName) {
+            case "modify_time": return "modifyTime";
+            case "creation_time": return "creationTime";
+            case "creation_user": return "creationUser";
+            case "valid_flag": return "validFlag";
+            case "remarks": return "remarks";
+            case "responsible_unit": return "responsibleUnit";
+            case "energy_kind": return "energyKind";
+            case "apply_arctic": return "applyArctic";
+            case "tack_time": return "tackTime";
+            case "parts": return "parts";
+            case "items_name": return "itemsName";
+            case "items_num": return "itemsNum";
+            case "stand_id": return "standId";
+            case "id": return "id";
+            case "terms_conditions": return "termsConditions";
+            case "MAINPOINTS_IMPEMENTATION": return "mainPointImplementation";
+            case "fo": return "fo";
+            case "duty_engineer": return "dutyEngineer";
+            case "svpps": return "svpps";
+            case "claim_type": return "claimType";
+            case "bus_stand_cover": return "busStandCover";
+            case "file_type": return "fileType";
+            default: return null;
+        }
+    }
+
+    /**  **/
+    public Date getModifyTime() {
+        return this.modifyTime;
+    }
+
+    /**  **/
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    /**  **/
+    public Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**  **/
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**  **/
+    public String getCreationUser() {
+        return this.creationUser;
+    }
+
+    /**  **/
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    /**  **/
+    public Integer getValidFlag() {
+        return this.validFlag;
+    }
+
+    /**  **/
+    public void setValidFlag(Integer validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    /**  **/
+    public String getRemarks() {
+        return this.remarks;
+    }
+
+    /**  **/
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    /**  **/
+    public String getResponsibleUnit() {
+        return this.responsibleUnit;
+    }
+
+    /**  **/
+    public void setResponsibleUnit(String responsibleUnit) {
+        this.responsibleUnit = responsibleUnit;
+    }
+
+    /**  **/
+    public String getEnergyKind() {
+        return this.energyKind;
+    }
+
+    /**  **/
+    public void setEnergyKind(String energyKind) {
+        this.energyKind = energyKind;
+    }
+
+    /**  **/
+    public String getApplyArctic() {
+        return this.applyArctic;
+    }
+
+    /**  **/
+    public void setApplyArctic(String applyArctic) {
+        this.applyArctic = applyArctic;
+    }
+
+    /**  **/
+    public Date getTackTime() {
+        return this.tackTime;
+    }
+
+    /**  **/
+    public void setTackTime(Date tackTime) {
+        this.tackTime = tackTime;
+    }
+
+    /**  **/
+    public String getParts() {
+        return this.parts;
+    }
+
+    /**  **/
+    public void setParts(String parts) {
+        this.parts = parts;
+    }
+
+    /**  **/
+    public String getItemsName() {
+        return this.itemsName;
+    }
+
+    /**  **/
+    public void setItemsName(String itemsName) {
+        this.itemsName = itemsName;
+    }
+
+    /**  **/
+    public String getItemsNum() {
+        return this.itemsNum;
+    }
+
+    /**  **/
+    public void setItemsNum(String itemsNum) {
+        this.itemsNum = itemsNum;
+    }
+
+    /**  **/
+    public String getStandId() {
+        return this.standId;
+    }
+
+    /**  **/
+    public void setStandId(String standId) {
+        this.standId = standId;
+    }
+
+    /**  **/
+    public String getId() {
+        return this.id;
+    }
+
+    /**  **/
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getResponsibleUnitShow() {
+        return responsibleUnitShow;
+    }
+
+    public void setResponsibleUnitShow(String responsibleUnitShow) {
+        this.responsibleUnitShow = responsibleUnitShow;
+    }
+
+    public String getEmergyKindShow() {
+        return emergyKindShow;
+    }
+
+    public void setEmergyKindShow(String emergyKindShow) {
+        this.emergyKindShow = emergyKindShow;
+    }
+
+    public String getApplyArcticShow() {
+        return applyArcticShow;
+    }
+
+    public void setApplyArcticShow(String applyArcticShow) {
+        this.applyArcticShow = applyArcticShow;
+    }
+
+    public String getTermsConditions() {
+        return termsConditions;
+    }
+
+    public void setTermsConditions(String termsConditions) {
+        this.termsConditions = termsConditions;
+    }
+
+    public String getMainPointImplementation() {
+        return mainPointImplementation;
+    }
+
+    public void setMainPointImplementation(String mainPointImplementation) {
+        this.mainPointImplementation = mainPointImplementation;
+    }
+
+    public String getFo() {
+        return fo;
+    }
+
+    public void setFo(String fo) {
+        this.fo = fo;
+    }
+
+    public String getDutyEngineer() {
+        return dutyEngineer;
+    }
+
+    public void setDutyEngineer(String dutyEngineer) {
+        this.dutyEngineer = dutyEngineer;
+    }
+
+    public String getSvpps() {
+        return svpps;
+    }
+
+    public void setSvpps(String svpps) {
+        this.svpps = svpps;
+    }
+
+    public String getClaimType() {
+        return claimType;
+    }
+
+    public void setClaimType(String claimType) {
+        this.claimType = claimType;
+    }
+
+    public String getBusStandCover() {
+        return busStandCover;
+    }
+
+    public void setBusStandCover(String busStandCover) {
+        this.busStandCover = busStandCover;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getFoShow() {
+        return foShow;
+    }
+
+    public void setFoShow(String foShow) {
+        this.foShow = foShow;
+    }
+
+    public String getDutyEngineerShow() {
+        return dutyEngineerShow;
+    }
+
+    public void setDutyEngineerShow(String dutyEngineerShow) {
+        this.dutyEngineerShow = dutyEngineerShow;
+    }
+
+    public String getSvppsShow() {
+        return svppsShow;
+    }
+
+    public void setSvppsShow(String svppsShow) {
+        this.svppsShow = svppsShow;
+    }
+
+    public String getClaimTypeShow() {
+        return claimTypeShow;
+    }
+
+    public void setClaimTypeShow(String claimTypeShow) {
+        this.claimTypeShow = claimTypeShow;
+    }
+
+    public String getBusStandCoverShow() {
+        return busStandCoverShow;
+    }
+
+    public void setBusStandCoverShow(String busStandCoverShow) {
+        this.busStandCoverShow = busStandCoverShow;
+    }
+
+    public String getFileTypeShow() {
+        return fileTypeShow;
+    }
+
+    public void setFileTypeShow(String fileTypeShow) {
+        this.fileTypeShow = fileTypeShow;
+    }
+
+    public List<String> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<String> idList) {
+        this.idList = idList;
+    }
+
+    public String getItemState() {
+        return itemState;
+    }
+
+    public void setItemState(String itemState) {
+        this.itemState = itemState;
+    }
+
+    public String getJspg() {
+        return jspg;
+    }
+
+    public void setJspg(String jspg) {
+        this.jspg = jspg;
+    }
+
+    public SarCompStatusInfoEO getPgForm() {
+        return pgForm;
+    }
+
+    public void setPgForm(SarCompStatusInfoEO pgForm) {
+        this.pgForm = pgForm;
+    }
+
+    public String getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(String oldId) {
+        this.oldId = oldId;
+    }
+
+    public String getFoUser() {
+        return foUser;
+    }
+
+    public void setFoUser(String foUser) {
+        this.foUser = foUser;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEO.java

@@ -0,0 +1,588 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.*;
+
+/**
+ * <b>功能：</b>SAR_STANDARDS_INFO SarStandardsInfoEOEntity<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-08-19 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarStandardsInfoEO extends BaseEntity {
+
+    private String id;
+    private String standType;
+    private String country;
+    private String standSort;
+    private String standNumber;
+    private String standYear;
+    private String standName;
+    private String standEnName;
+    private String standState;
+    private String standNature;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date putTime;
+    private String synopsis;
+    private String replaceStandNum;
+    private String replacedStandNum;
+    private String creationUser;
+    private String validFlag;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date creationTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date modifyTime;
+    private String isRelateAccess;
+    // 以下为非表中字段
+    private String collectId; // 收藏表ID
+    private String countryShow;  //国家地区显示名称
+    private String standSortShow; // 标准类别显示名称
+    private String standStateShow; // 标准状态显示名称
+    private String standNatureShow; // 标准性质显示名称
+    private String sychronId; // 同步数据ID
+    private List<DicTypeEO> dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据
+    private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
+    private String sarStandAttrEOStr; //新增修改时属性表信息
+    private String menuId; //目录ID
+    private int upReplaceNumFlag; //记录是否修改了替代文件号
+    private int upNumFlag; //记录是否修改了文件号
+    private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
+    private String fileIds; //全部文件ID
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date newCarPutTime;
+    private List<SarStandItemsEO> itemsList = new ArrayList<>();
+    private String citeStand;//引用标准
+    private String citedStand;//被引用标准
+    private String relateStand;//对应其他标准
+    private String accessCountry;//纳入清单的国家
+    private String processNum;//流程编号
+    private String textStatus;//文本状态
+//    在库里的标准节点类型（工作组）
+    private String menuType;
+    private String allPutTime;
+    private String jspg;
+    private SarCompStatusInfoEO pgForm;
+    private String CHJL;
+    private String puttime;
+
+    /**
+     * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>id -> id</li>
+     * <li>standType -> stand_type</li>
+     * <li>country -> country</li>
+     * <li>standSort -> stand_sort</li>
+     * <li>standNumber -> stand_number</li>
+     * <li>standYear -> stand_year</li>
+     * <li>standName -> stand_name</li>
+     * <li>standEnName -> stand_en_name</li>
+     * <li>standState -> stand_state</li>
+     * <li>standNature -> stand_nature</li>
+     * <li>issueTime -> issue_time</li>
+     * <li>putTime -> put_time</li>
+     * <li>synopsis -> synopsis</li>
+     * <li>replaceStandNum -> replace_stand_num</li>
+     * <li>replacedStandNum -> replaced_stand_num</li>
+     * <li>creationUser -> creation_user</li>
+     * <li>validFlag -> valid_flag</li>
+     * <li>creationTime -> creation_time</li>
+     * <li>modifyTime -> modify_time</li>
+     */
+    public static String fieldToColumn(String fieldName) {
+        if (fieldName == null) return null;
+        switch (fieldName) {
+            case "id": return "id";
+            case "standType": return "stand_type";
+            case "country": return "country";
+            case "standSort": return "stand_sort";
+            case "standNumber": return "stand_number";
+            case "standYear": return "stand_year";
+            case "standName": return "stand_name";
+            case "standEnName": return "stand_en_name";
+            case "standState": return "stand_state";
+            case "standNature": return "stand_nature";
+            case "issueTime": return "issue_time";
+            case "putTime": return "put_time";
+            case "synopsis": return "synopsis";
+            case "replaceStandNum": return "replace_stand_num";
+            case "replacedStandNum": return "replaced_stand_num";
+            case "creationUser": return "creation_user";
+            case "validFlag": return "valid_flag";
+            case "creationTime": return "creation_time";
+            case "modifyTime": return "modify_time";
+            default: return null;
+        }
+    }
+
+    /**
+     * 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
+     * <p>字段列表：</p>
+     * <li>id -> id</li>
+     * <li>stand_type -> standType</li>
+     * <li>country -> country</li>
+     * <li>stand_sort -> standSort</li>
+     * <li>stand_number -> standNumber</li>
+     * <li>stand_year -> standYear</li>
+     * <li>stand_name -> standName</li>
+     * <li>stand_en_name -> standEnName</li>
+     * <li>stand_state -> standState</li>
+     * <li>stand_nature -> standNature</li>
+     * <li>issue_time -> issueTime</li>
+     * <li>put_time -> putTime</li>
+     * <li>synopsis -> synopsis</li>
+     * <li>replace_stand_num -> replaceStandNum</li>
+     * <li>replaced_stand_num -> replacedStandNum</li>
+     * <li>creation_user -> creationUser</li>
+     * <li>valid_flag -> validFlag</li>
+     * <li>creation_time -> creationTime</li>
+     * <li>modify_time -> modifyTime</li>
+     */
+    public static String columnToField(String columnName) {
+        if (columnName == null) return null;
+        switch (columnName) {
+            case "id": return "id";
+            case "stand_type": return "standType";
+            case "country": return "country";
+            case "stand_sort": return "standSort";
+            case "stand_number": return "standNumber";
+            case "stand_year": return "standYear";
+            case "stand_name": return "standName";
+            case "stand_en_name": return "standEnName";
+            case "stand_state": return "standState";
+            case "stand_nature": return "standNature";
+            case "issue_time": return "issueTime";
+            case "put_time": return "putTime";
+            case "synopsis": return "synopsis";
+            case "replace_stand_num": return "replaceStandNum";
+            case "replaced_stand_num": return "replacedStandNum";
+            case "creation_user": return "creationUser";
+            case "valid_flag": return "validFlag";
+            case "creation_time": return "creationTime";
+            case "modify_time": return "modifyTime";
+            default: return null;
+        }
+    }
+
+    /**  **/
+    public String getId() {
+        return this.id;
+    }
+
+    /**  **/
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**  **/
+    public String getStandType() {
+        return this.standType;
+    }
+
+    /**  **/
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
+
+    /**  **/
+    public String getCountry() {
+        return this.country;
+    }
+
+    /**  **/
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    /**  **/
+    public String getStandSort() {
+        return this.standSort;
+    }
+
+    /**  **/
+    public void setStandSort(String standSort) {
+        this.standSort = standSort;
+    }
+
+    /**  **/
+    public String getStandNumber() {
+        return this.standNumber;
+    }
+
+    /**  **/
+    public void setStandNumber(String standNumber) {
+        this.standNumber = standNumber;
+    }
+
+    /**  **/
+    public String getStandYear() {
+        return this.standYear;
+    }
+
+    /**  **/
+    public void setStandYear(String standYear) {
+        this.standYear = standYear;
+    }
+
+    /**  **/
+    public String getStandName() {
+        return this.standName;
+    }
+
+    /**  **/
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    /**  **/
+    public String getStandEnName() {
+        return this.standEnName;
+    }
+
+    /**  **/
+    public void setStandEnName(String standEnName) {
+        this.standEnName = standEnName;
+    }
+
+    /**  **/
+    public String getStandState() {
+        return this.standState;
+    }
+
+    /**  **/
+    public void setStandState(String standState) {
+        this.standState = standState;
+    }
+
+    /**  **/
+    public String getStandNature() {
+        return this.standNature;
+    }
+
+    /**  **/
+    public void setStandNature(String standNature) {
+        this.standNature = standNature;
+    }
+
+    /**  **/
+    public String getIssueTime() {
+        return this.issueTime;
+    }
+
+    /**  **/
+    public void setIssueTime(String issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    /**  **/
+    public Date getPutTime() {
+        return this.putTime;
+    }
+
+    /**  **/
+    public void setPutTime(Date putTime) {
+        this.putTime = putTime;
+    }
+
+    public String getSynopsis() {
+        return synopsis;
+    }
+
+    public void setSynopsis(String synopsis) {
+        this.synopsis = synopsis;
+    }
+
+    public String getReplaceStandNum() {
+        return replaceStandNum;
+    }
+
+    public void setReplaceStandNum(String replaceStandNum) {
+        this.replaceStandNum = replaceStandNum;
+    }
+
+    /**  **/
+    public String getReplacedStandNum() {
+        return this.replacedStandNum;
+    }
+
+    /**  **/
+    public void setReplacedStandNum(String replacedStandNum) {
+        this.replacedStandNum = replacedStandNum;
+    }
+
+    /**  **/
+    public String getCreationUser() {
+        return this.creationUser;
+    }
+
+    /**  **/
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    /**  **/
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    /**  **/
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    /**  **/
+    public Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**  **/
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**  **/
+    public Date getModifyTime() {
+        return this.modifyTime;
+    }
+
+    /**  **/
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(String collectId) {
+        this.collectId = collectId;
+    }
+
+    public String getCountryShow() {
+        return countryShow;
+    }
+
+    public void setCountryShow(String countryShow) {
+        this.countryShow = countryShow;
+    }
+
+    public String getStandSortShow() {
+        return standSortShow;
+    }
+
+    public void setStandSortShow(String standSortShow) {
+        this.standSortShow = standSortShow;
+    }
+
+    public String getStandStateShow() {
+        return standStateShow;
+    }
+
+    public void setStandStateShow(String standStateShow) {
+        this.standStateShow = standStateShow;
+    }
+
+    public String getStandNatureShow() {
+        return standNatureShow;
+    }
+
+    public void setStandNatureShow(String standNatureShow) {
+        this.standNatureShow = standNatureShow;
+    }
+
+    public String getSychronId() {
+        return sychronId;
+    }
+
+    public void setSychronId(String sychronId) {
+        this.sychronId = sychronId;
+    }
+
+    public List<DicTypeEO> getDicTypeList() {
+        return dicTypeList;
+    }
+
+    public void setDicTypeList(List<DicTypeEO> dicTypeList) {
+        this.dicTypeList = dicTypeList;
+    }
+
+    public Map<String, Object> getAttrInfoMap() {
+        return attrInfoMap;
+    }
+
+    public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
+        this.attrInfoMap = attrInfoMap;
+    }
+
+    public String getSarStandAttrEOStr() {
+        return sarStandAttrEOStr;
+    }
+
+    public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
+        this.sarStandAttrEOStr = sarStandAttrEOStr;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public int getUpReplaceNumFlag() {
+        return upReplaceNumFlag;
+    }
+
+    public void setUpReplaceNumFlag(int upReplaceNumFlag) {
+        this.upReplaceNumFlag = upReplaceNumFlag;
+    }
+
+    public int getUpNumFlag() {
+        return upNumFlag;
+    }
+
+    public void setUpNumFlag(int upNumFlag) {
+        this.upNumFlag = upNumFlag;
+    }
+
+    public List<SarStandAttrDetailsEO> getAttrInfoList() {
+        return attrInfoList;
+    }
+
+    public void setAttrInfoList(List<SarStandAttrDetailsEO> attrInfoList) {
+        this.attrInfoList = attrInfoList;
+    }
+
+    public String getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(String fileIds) {
+        this.fileIds = fileIds;
+    }
+
+    public Date getNewCarPutTime() {
+        return newCarPutTime;
+    }
+
+    public void setNewCarPutTime(Date newCarPutTime) {
+        this.newCarPutTime = newCarPutTime;
+    }
+
+    public String getIsRelateAccess() {
+        return isRelateAccess;
+    }
+
+    public void setIsRelateAccess(String isRelateAccess) {
+        this.isRelateAccess = isRelateAccess;
+    }
+
+    public List<SarStandItemsEO> getItemsList() {
+        return itemsList;
+    }
+
+    public void setItemsList(List<SarStandItemsEO> itemsList) {
+        this.itemsList = itemsList;
+    }
+
+    public String getCiteStand() {
+        return citeStand;
+    }
+
+    public void setCiteStand(String citeStand) {
+        this.citeStand = citeStand;
+    }
+
+    public String getCitedStand() {
+        return citedStand;
+    }
+
+    public void setCitedStand(String citedStand) {
+        this.citedStand = citedStand;
+    }
+
+    public String getAccessCountry() {
+        return accessCountry;
+    }
+
+    public void setAccessCountry(String accessCountry) {
+        this.accessCountry = accessCountry;
+    }
+
+    public String getProcessNum() {
+        return processNum;
+    }
+
+    public void setProcessNum(String processNum) {
+        this.processNum = processNum;
+    }
+
+    public String getTextStatus() {
+        return textStatus;
+    }
+
+    public void setTextStatus(String textStatus) {
+        this.textStatus = textStatus;
+    }
+
+    public String getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType) {
+        this.menuType = menuType;
+    }
+
+    public String getRelateStand() {
+        return relateStand;
+    }
+
+    public void setRelateStand(String relateStand) {
+        this.relateStand = relateStand;
+    }
+
+    public String getAllPutTime() {
+        return allPutTime;
+    }
+
+    public void setAllPutTime(String allPutTime) {
+        this.allPutTime = allPutTime;
+    }
+
+    public String getJspg() {
+        return jspg;
+    }
+
+    public void setJspg(String jspg) {
+        this.jspg = jspg;
+    }
+
+    public SarCompStatusInfoEO getPgForm() {
+        return pgForm;
+    }
+
+    public void setPgForm(SarCompStatusInfoEO pgForm) {
+        this.pgForm = pgForm;
+    }
+
+    public String getCHJL() {
+        return CHJL;
+    }
+
+    public void setCHJL(String CHJL) {
+        this.CHJL = CHJL;
+    }
+
+    public String getPuttime() {
+        return puttime;
+    }
+
+    public void setPuttime(String puttime) {
+        this.puttime = puttime;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandardsInfoEOPage.java

@@ -0,0 +1,651 @@
+package com.adc.da.slrs.standardSplit.entity;
+
+import com.adc.da.base.page.BasePage;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <b>功能：</b>SAR_STANDARDS_INFO SarStandardsInfoEOPage<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-08-19 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+public class SarStandardsInfoEOPage extends BasePage {
+
+    private String id;
+    private String idOperator = "=";
+    private String standType;
+    private String standTypeOperator = "=";
+    private String country;
+    private String countryOperator = "=";
+    private String standSort;
+    private String standSortOperator = "=";
+    private String standNumber;
+    private String standNumberOperator = "=";
+    private String standYear;
+    private String standYearOperator = "=";
+    private String standName;
+    private String standNameOperator = "=";
+    private String standEnName;
+    private String standEnNameOperator = "=";
+    private String standState;
+    private String standStateOperator = "=";
+    private String standNature;
+    private String standNatureOperator = "=";
+    private String issueTime;
+    private String issueTime1;
+    private String issueTime2;
+    private String issueTimeOperator = "=";
+    private String putTime;
+    private String putTime1;
+    private String putTime2;
+    private String putTimeOperator = "=";
+    private String synopsis;
+    private String synopsisOperator = "=";
+    private String replaceStandNum;
+    private String replaceStandNumOperator = "=";
+    private String replacedStandNum;
+    private String replacedStandNumOperator = "=";
+    private String creationUser;
+    private String creationUserOperator = "=";
+    private String validFlag;
+    private String validFlagOperator = "=";
+    private String creationTime;
+    private String creationTime1;
+    private String creationTime2;
+    private String creationTimeOperator = "=";
+    private String modifyTime;
+    private String isRelateAccess;
+    private String modifyTime1;
+    private String modifyTime2;
+    private String modifyTimeOperator = "=";
+    private List<String> menuRoleList; //有权限的目录
+    private String[] idlist;  //多个id
+    private String menuId; //目录ID
+    private String rootMenuId;
+    private String attrSearchStr;
+    private String advanceSearchStr;
+    private Map<String,String> attrSearchMap; //属性表数据条件查询
+    // 树结构增加搜索条件
+    private String collectMenuId;
+    private String labelMenuId;
+    private String applyArctic;
+    private String ids;
+    private List<String> replaceStandNumList;
+    private List<String> menuAllChildrenIdList;
+    private List<SarAdvanceSearchVO> advanceSearchVOList;
+    private String advanceSearchVOStr;
+    private String proType; // 请求的流程类型
+    private String userId;
+    private String productId;
+    private Integer nowOrder;
+    private Integer nowOrderBy;
+    private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
+    private String order1 = "desc";
+    private String isNumYear;
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdOperator() {
+        return this.idOperator;
+    }
+
+    public void setIdOperator(String idOperator) {
+        this.idOperator = idOperator;
+    }
+
+    public String getStandType() {
+        return this.standType;
+    }
+
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
+
+    public String getStandTypeOperator() {
+        return this.standTypeOperator;
+    }
+
+    public void setStandTypeOperator(String standTypeOperator) {
+        this.standTypeOperator = standTypeOperator;
+    }
+
+    public String getCountry() {
+        return this.country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCountryOperator() {
+        return this.countryOperator;
+    }
+
+    public void setCountryOperator(String countryOperator) {
+        this.countryOperator = countryOperator;
+    }
+
+    public String getStandSort() {
+        return this.standSort;
+    }
+
+    public void setStandSort(String standSort) {
+        this.standSort = standSort;
+    }
+
+    public String getStandSortOperator() {
+        return this.standSortOperator;
+    }
+
+    public void setStandSortOperator(String standSortOperator) {
+        this.standSortOperator = standSortOperator;
+    }
+
+    public String getStandNumber() {
+        return this.standNumber;
+    }
+
+    public void setStandNumber(String standNumber) {
+        this.standNumber = standNumber;
+    }
+
+    public String getStandNumberOperator() {
+        return this.standNumberOperator;
+    }
+
+    public void setStandNumberOperator(String standNumberOperator) {
+        this.standNumberOperator = standNumberOperator;
+    }
+
+    public String getStandYear() {
+        return this.standYear;
+    }
+
+    public void setStandYear(String standYear) {
+        this.standYear = standYear;
+    }
+
+    public String getStandYearOperator() {
+        return this.standYearOperator;
+    }
+
+    public void setStandYearOperator(String standYearOperator) {
+        this.standYearOperator = standYearOperator;
+    }
+
+    public String getStandName() {
+        return this.standName;
+    }
+
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    public String getStandNameOperator() {
+        return this.standNameOperator;
+    }
+
+    public void setStandNameOperator(String standNameOperator) {
+        this.standNameOperator = standNameOperator;
+    }
+
+    public String getStandEnName() {
+        return this.standEnName;
+    }
+
+    public void setStandEnName(String standEnName) {
+        this.standEnName = standEnName;
+    }
+
+    public String getStandEnNameOperator() {
+        return this.standEnNameOperator;
+    }
+
+    public void setStandEnNameOperator(String standEnNameOperator) {
+        this.standEnNameOperator = standEnNameOperator;
+    }
+
+    public String getStandState() {
+        return this.standState;
+    }
+
+    public void setStandState(String standState) {
+        this.standState = standState;
+    }
+
+    public String getStandStateOperator() {
+        return this.standStateOperator;
+    }
+
+    public void setStandStateOperator(String standStateOperator) {
+        this.standStateOperator = standStateOperator;
+    }
+
+    public String getStandNature() {
+        return this.standNature;
+    }
+
+    public void setStandNature(String standNature) {
+        this.standNature = standNature;
+    }
+
+    public String getStandNatureOperator() {
+        return this.standNatureOperator;
+    }
+
+    public void setStandNatureOperator(String standNatureOperator) {
+        this.standNatureOperator = standNatureOperator;
+    }
+
+    public String getIssueTime() {
+        return this.issueTime;
+    }
+
+    public void setIssueTime(String issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public String getIssueTime1() {
+        return this.issueTime1;
+    }
+
+    public void setIssueTime1(String issueTime1) {
+        this.issueTime1 = issueTime1;
+    }
+
+    public String getIssueTime2() {
+        return this.issueTime2;
+    }
+
+    public void setIssueTime2(String issueTime2) {
+        this.issueTime2 = issueTime2;
+    }
+
+    public String getIssueTimeOperator() {
+        return this.issueTimeOperator;
+    }
+
+    public void setIssueTimeOperator(String issueTimeOperator) {
+        this.issueTimeOperator = issueTimeOperator;
+    }
+
+    public String getPutTime() {
+        return this.putTime;
+    }
+
+    public void setPutTime(String putTime) {
+        this.putTime = putTime;
+    }
+
+    public String getPutTime1() {
+        return this.putTime1;
+    }
+
+    public void setPutTime1(String putTime1) {
+        this.putTime1 = putTime1;
+    }
+
+    public String getPutTime2() {
+        return this.putTime2;
+    }
+
+    public void setPutTime2(String putTime2) {
+        this.putTime2 = putTime2;
+    }
+
+    public String getPutTimeOperator() {
+        return this.putTimeOperator;
+    }
+
+    public void setPutTimeOperator(String putTimeOperator) {
+        this.putTimeOperator = putTimeOperator;
+    }
+
+    public String getSynopsis() {
+        return this.synopsis;
+    }
+
+    public void setSynopsis(String synopsis) {
+        this.synopsis = synopsis;
+    }
+
+    public String getSynopsisOperator() {
+        return this.synopsisOperator;
+    }
+
+    public void setSynopsisOperator(String synopsisOperator) {
+        this.synopsisOperator = synopsisOperator;
+    }
+
+    public String getReplaceStandNum() {
+        return this.replaceStandNum;
+    }
+
+    public void setReplaceStandNum(String replaceStandNum) {
+        this.replaceStandNum = replaceStandNum;
+    }
+
+    public String getReplaceStandNumOperator() {
+        return this.replaceStandNumOperator;
+    }
+
+    public void setReplaceStandNumOperator(String replaceStandNumOperator) {
+        this.replaceStandNumOperator = replaceStandNumOperator;
+    }
+
+    public String getReplacedStandNum() {
+        return this.replacedStandNum;
+    }
+
+    public void setReplacedStandNum(String replacedStandNum) {
+        this.replacedStandNum = replacedStandNum;
+    }
+
+    public String getReplacedStandNumOperator() {
+        return this.replacedStandNumOperator;
+    }
+
+    public void setReplacedStandNumOperator(String replacedStandNumOperator) {
+        this.replacedStandNumOperator = replacedStandNumOperator;
+    }
+
+    public String getCreationUser() {
+        return this.creationUser;
+    }
+
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    public String getCreationUserOperator() {
+        return this.creationUserOperator;
+    }
+
+    public void setCreationUserOperator(String creationUserOperator) {
+        this.creationUserOperator = creationUserOperator;
+    }
+
+    public String getValidFlag() {
+        return this.validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getValidFlagOperator() {
+        return this.validFlagOperator;
+    }
+
+    public void setValidFlagOperator(String validFlagOperator) {
+        this.validFlagOperator = validFlagOperator;
+    }
+
+    public String getCreationTime() {
+        return this.creationTime;
+    }
+
+    public void setCreationTime(String creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public String getCreationTime1() {
+        return this.creationTime1;
+    }
+
+    public void setCreationTime1(String creationTime1) {
+        this.creationTime1 = creationTime1;
+    }
+
+    public String getCreationTime2() {
+        return this.creationTime2;
+    }
+
+    public void setCreationTime2(String creationTime2) {
+        this.creationTime2 = creationTime2;
+    }
+
+    public String getCreationTimeOperator() {
+        return this.creationTimeOperator;
+    }
+
+    public void setCreationTimeOperator(String creationTimeOperator) {
+        this.creationTimeOperator = creationTimeOperator;
+    }
+
+    public String getModifyTime() {
+        return this.modifyTime;
+    }
+
+    public void setModifyTime(String modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getModifyTime1() {
+        return this.modifyTime1;
+    }
+
+    public void setModifyTime1(String modifyTime1) {
+        this.modifyTime1 = modifyTime1;
+    }
+
+    public String getModifyTime2() {
+        return this.modifyTime2;
+    }
+
+    public void setModifyTime2(String modifyTime2) {
+        this.modifyTime2 = modifyTime2;
+    }
+
+    public String getModifyTimeOperator() {
+        return this.modifyTimeOperator;
+    }
+
+    public void setModifyTimeOperator(String modifyTimeOperator) {
+        this.modifyTimeOperator = modifyTimeOperator;
+    }
+
+    public List<String> getMenuRoleList() {
+        return menuRoleList;
+    }
+
+    public void setMenuRoleList(List<String> menuRoleList) {
+        this.menuRoleList = menuRoleList;
+    }
+
+    public String[] getIdlist() {
+        return idlist;
+    }
+
+    public void setIdlist(String[] idlist) {
+        this.idlist = idlist;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public String getRootMenuId() {
+        return rootMenuId;
+    }
+
+    public void setRootMenuId(String rootMenuId) {
+        this.rootMenuId = rootMenuId;
+    }
+
+    public Map<String, String> getAttrSearchMap() {
+        return attrSearchMap;
+    }
+
+    public void setAttrSearchMap(Map<String, String> attrSearchMap) {
+        this.attrSearchMap = attrSearchMap;
+    }
+
+    public String getCollectMenuId() {
+        return collectMenuId;
+    }
+
+    public void setCollectMenuId(String collectMenuId) {
+        this.collectMenuId = collectMenuId;
+    }
+
+    public String getLabelMenuId() {
+        return labelMenuId;
+    }
+
+    public void setLabelMenuId(String labelMenuId) {
+        this.labelMenuId = labelMenuId;
+    }
+
+    public String getAttrSearchStr() {
+        return attrSearchStr;
+    }
+
+    public void setAttrSearchStr(String attrSearchStr) {
+        this.attrSearchStr = attrSearchStr;
+    }
+
+    public String getApplyArctic() {
+        return applyArctic;
+    }
+
+    public void setApplyArctic(String applyArctic) {
+        this.applyArctic = applyArctic;
+    }
+
+    public List<String> getReplaceStandNumList() {
+        return replaceStandNumList;
+    }
+
+    public void setReplaceStandNumList(List<String> replaceStandNumList) {
+        this.replaceStandNumList = replaceStandNumList;
+    }
+
+    public String getIsRelateAccess() {
+        return isRelateAccess;
+    }
+
+    public void setIsRelateAccess(String isRelateAccess) {
+        this.isRelateAccess = isRelateAccess;
+    }
+
+    public String getIds() {
+        return ids;
+    }
+
+    public void setIds(String ids) {
+        this.ids = ids;
+    }
+
+    public String getAdvanceSearchStr() {
+        return advanceSearchStr;
+    }
+
+    public void setAdvanceSearchStr(String advanceSearchStr) {
+        this.advanceSearchStr = advanceSearchStr;
+    }
+
+    public List<SarAdvanceSearchVO> getAdvanceSearchVOList() {
+        return advanceSearchVOList;
+    }
+
+    public void setAdvanceSearchVOList(List<SarAdvanceSearchVO> advanceSearchVOList) {
+        this.advanceSearchVOList = advanceSearchVOList;
+    }
+
+    public String getAdvanceSearchVOStr() {
+        return advanceSearchVOStr;
+    }
+
+    public void setAdvanceSearchVOStr(String advanceSearchVOStr) {
+        this.advanceSearchVOStr = advanceSearchVOStr;
+    }
+
+    public List<String> getMenuAllChildrenIdList() {
+        return menuAllChildrenIdList;
+    }
+
+    public void setMenuAllChildrenIdList(List<String> menuAllChildrenIdList) {
+        this.menuAllChildrenIdList = menuAllChildrenIdList;
+    }
+
+    public String getProType() {
+        return proType;
+    }
+
+    public void setProType(String proType) {
+        this.proType = proType;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+
+    public String getOrderBy1() {
+        return orderBy1;
+    }
+
+    public void setOrderBy1(String orderBy1) {
+        this.orderBy1 = orderBy1;
+    }
+
+
+    public String getOrder1() {
+        return order1;
+    }
+
+    public void setOrder1(String order1) {
+        this.order1 = order1;
+    }
+
+    public Integer getNowOrder() {
+        return nowOrder;
+    }
+
+    public void setNowOrder(Integer nowOrder) {
+        this.nowOrder = nowOrder;
+    }
+
+
+    public void setNowOrderBy(Integer nowOrderBy) {
+        this.nowOrderBy = nowOrderBy;
+    }
+
+    public Integer getNowOrderBy() {
+        return nowOrderBy;
+    }
+
+    public String getIsNumYear() {
+        return isNumYear;
+    }
+
+    public void setIsNumYear(String isNumYear) {
+        this.isNumYear = isNumYear;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitInfoEOService.java

@@ -28,4 +28,6 @@ public interface SarFileSplitInfoEOService {
     int deleteByIds(String ids);
 
     PersonMsgEO updateNew(PersonMsgEO val) throws Exception;
+
+    String getClauseBySplitId(String standNum, String fileType);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java

@@ -0,0 +1,49 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.common.SplitTableInfo;
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
+import com.adc.da.slrs.standardSplit.dto.*;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
+import com.adc.da.util.http.ResponseMessage;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public interface SarFileSplitItemsEOService {
+
+    Map<String,Object> getByPage(SarFileSplitItemsEOPage page);
+
+    List<SarFileSplitItemsEO> queryByList(SarFileSplitItemsEOPage page);
+
+    SarFileSplitItemsEO selectByPrimaryKey(String id);
+
+    int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO);
+
+    int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO);
+
+    int deleteByPrimaryKey(String id);
+
+    int batchDeleteItems(String ids);
+
+    boolean judgeContaintChilds(String ids);
+
+    List<FileSplitItemsExportDto> queryByOrdersForExport(SarFileSplitItemsEOPage page);
+
+    List<FileSplitValExportDto> combineItemValInfo(List<SarFileSplitItemsValEO> getValList,List<FileSpiltValTableExportDto>
+            allTableList,List<FileSplitValImgExportDto> allImgList,SarFileSplitItemsEOPage page);
+
+    void downLoadImgList(List<FileSplitValImgExportDto> allImgList,String fileNowPath) throws IOException;
+
+    void downLoadFileList(List<AttFileEO> attfileEo, String fileNowPath) throws IOException ;
+
+    ResponseMessage<SarFileSplitItemsEO> importSplitItems(List<SarFileSplitItemsImportDto> datasUpdate,
+                                                          String unzipfilepath, SarFileSplitInfoEO sarFileSplitInfoEO,
+                                                          List<SplitTableInfo> getSheetTableList);
+
+    void combineItems(String ids);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsParamsEOService.java

@@ -0,0 +1,11 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEOPage;
+
+import java.util.List;
+
+public interface SarFileSplitItemsParamsEOService {
+
+    List<SarFileSplitItemsParamsEO> queryByList(SarFileSplitItemsParamsEOPage paramPage);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsTableEOService.java

@@ -0,0 +1,4 @@
+package com.adc.da.slrs.standardSplit.service;
+
+public interface SarFileSplitItemsTableEOService {
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java

@@ -0,0 +1,11 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
+
+import java.util.List;
+
+public interface SarFileSplitItemsValEOService {
+
+    List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java

@@ -0,0 +1,33 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.base.page.BasePage;
+import com.adc.da.slrs.standardSplit.entity.DrageMenuEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitMenuEOPage;
+import java.util.List;
+
+public interface SarFileSplitMenuEOService {
+
+    List<SarFileSplitMenuEO> queryByPage(BasePage page);
+
+    List<SarFileSplitMenuEO> queryByList(SarFileSplitMenuEOPage page);
+
+    SarFileSplitMenuEO selectByPrimaryKey(String id);
+
+    int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO);
+
+    int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO);
+
+    void deleteMenu(String id);
+
+    int dragMenu(DrageMenuEO drageMenuEO);
+
+    boolean judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception;
+
+    int copyMenu (SarFileSplitMenuEO sarMenuEO);
+
+    int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO);
+
+    String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandAttrDetailsEOService.java

@@ -1,4 +1,10 @@
 package com.adc.da.slrs.standardSplit.service;
 
+import com.adc.da.sys.common.SelectionResult;
+
+import java.util.List;
+
 public interface SarStandAttrDetailsEOService {
+
+    List<SelectionResult> selectFileFieldForSel(String attrField);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java

@@ -1,4 +1,25 @@
 package com.adc.da.slrs.standardSplit.service;
 
+import com.adc.da.base.page.BasePage;
+import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
+import java.util.List;
+
 public interface SarStandFileEOService {
+
+    List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand);
+
+    List<SarStandFileEO> queryByPage(SarStandFileEOPage page);
+
+    List<SarStandFileEO> queryByList(SarStandFileEOPage page);
+
+    SarStandFileEO selectByPrimaryKey(String id) throws Exception;
+
+    int insertSelective(SarStandFileEO sarStandFileEO) throws Exception;
+
+    int updateByPrimaryKeySelective(SarStandFileEO sarStandFileEO) throws Exception;
+
+    int deleteByPrimaryKey(String id) throws Exception;
+
+    List<SarStandFileEO> selectFileByAttId(String attId) throws Exception;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandardsInfoEOService.java

@@ -0,0 +1,10 @@
+package com.adc.da.slrs.standardSplit.service;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
+
+import java.util.List;
+
+public interface SarStandardsInfoEOService {
+
+    List<SarStandardsInfoEO> selectStandardsByStandnumber(String standNum, String val);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/MenuServiceImpl.java

@@ -10,6 +10,6 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class MenuServiceImpl implements MenuService {
-    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(MenuServiceImpl.class);
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -70,6 +70,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
     private PersonCollectEODao personCollectEODao;
     @Autowired
     private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao;
+    @Autowired
+    private SarFileSplitInfoEODao dao;
 
     @Override
     public List<SarFileSplitInfoEO> queryByPage(BasePage page) throws Exception{
@@ -659,4 +661,14 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
         return null;
     }
 
+    @Override
+    public String getClauseBySplitId(String standNum, String fileType) {
+        SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage();
+        sarFileSplitInfoEOPage.setNumOrName(standNum);
+        sarFileSplitInfoEOPage.setFileType(fileType);
+        sarFileSplitInfoEOPage.setSplitStatus("2");
+        List<SarFileSplitInfoEO> rows = dao.queryByPageOwn(sarFileSplitInfoEOPage);
+        return rows.get(0).getId();
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java

@@ -0,0 +1,988 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.service.IAttFileEOService;
+import com.adc.da.att.vo.AttFileVo;
+import com.adc.da.common.FileUnZip;
+import com.adc.da.common.SplitTableInfo;
+import com.adc.da.login.util.UserUtils;
+import com.adc.da.slrs.standardSplit.dao.*;
+import com.adc.da.slrs.standardSplit.dto.*;
+import com.adc.da.slrs.standardSplit.entity.*;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService;
+import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.sys.dao.DicTypeEODao;
+import com.adc.da.sys.dao.RoleEODao;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.adc.da.sys.util.LoginUserUtil;
+import com.adc.da.sys.util.UUIDUtils;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import com.adc.da.utils.treetool.Tree;
+import com.adc.da.utils.treetool.TreeNode;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.*;
+
+import static com.adc.da.utils.util.ExcelUtil.checkObjAllFieldsIsNull;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOServiceImpl.class);
+
+    @Autowired
+    private SarFileSplitMenuEOService sarFileSplitMenuEOService;
+    @Autowired
+    private SarFileSplitItemsEODao dao;
+    @Autowired
+    private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao;
+    @Autowired
+    private SarFileSplitItemsValEODao sarFileSplitItemsValEODao;
+    @Autowired
+    private SysInfoEOService sysInfoEOService;
+    @Autowired
+    private SarFileSplitMenuEODao sarFileSplitMenuEODao;
+    @Autowired
+    private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao;
+    @Autowired
+    private SarFileSplitItemsEODao sarFileSplitItemsEODao;
+    @Autowired
+    private DicTypeEODao dicTypeEODao;
+    @Value("${file.path}")
+    private String uploadFilePath;
+    @Autowired
+    private RoleEODao roleEODao;
+    @Autowired
+    private IAttFileEOService attFileEOService;
+    @Autowired
+    private SarFileSplitInfoEOService sarFileSplitInfoEOService;
+
+
+    @Override
+    public Map<String, Object> getByPage(SarFileSplitItemsEOPage page) {
+        page.setValidFlag("0");
+        page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc");
+        if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) {
+            List<SarFileSplitMenuEO> sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage());
+            Tree tree = new Tree<>(sarFileSplitMenuEOList);
+            TreeNode treeNode = tree.getTreeNode(page.getMenuId());
+
+            List<String> menuIds = new ArrayList<>();
+            menuIds.add(treeNode.getNodeId());
+            for (TreeNode node : treeNode.getAllChildren()) {
+                menuIds.add(node.getNodeId());
+            }
+            page.setMenuIdList(menuIds);
+        }
+        int count = dao.queryByCount(page);
+        List<SarFileSplitItemsEO> rows = dao.queryByPage(page);
+        if (rows != null && !rows.isEmpty()) {
+            for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) {
+                //查询svpps
+                String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps());
+                sarFileSplitItemsEO.setSvppsShow(svppsShow);
+                SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage();
+                paramPage.setItemId(sarFileSplitItemsEO.getId());
+                List<SarFileSplitItemsParamsEO> paramList = sarFileSplitItemsParamsEODao.queryByList(paramPage);
+                sarFileSplitItemsEO.setParamsList(paramList);
+                String foName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getFo());
+                sarFileSplitItemsEO.setFoShow(foName);
+                //TODO  2021年6月17日  补充责任部门和项目评估角色回显时如果时多个时回显为空的情况
+                String dutyEngineerName = sysInfoEOService.getRoleNamesByIds(sarFileSplitItemsEO.getDutyEngineer());
+                sarFileSplitItemsEO.setDutyEngineerShow(dutyEngineerName);
+                //责任部门多个时
+                String orgNames = sysInfoEOService.getOrgNamesByIds(sarFileSplitItemsEO.getResponsibleUnit());
+                sarFileSplitItemsEO.setResponsibleUnitShow(orgNames);
+            }
+
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("list",rows);
+        map.put("count",count);
+        return map;
+    }
+
+    @Override
+    public List<SarFileSplitItemsEO> queryByList(SarFileSplitItemsEOPage page) {
+        return dao.queryByList(page);
+    }
+
+    @Override
+    public SarFileSplitItemsEO selectByPrimaryKey(String id) {
+        return dao.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO) {
+        return dao.insertSelective(sarFileSplitItemsEO);
+    }
+
+    @Override
+    public int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) {
+        List<SarFileSplitItemsValEO> getValList = sarFileSplitItemsEO.getItemValEOList();
+        String itemConditions = "";
+        String userId = UserUtils.getUserId();
+        int resultCount = 0;
+        //修改特殊参数要求信息
+        updateParamsContent(sarFileSplitItemsEO);
+        //修改条款要求内容
+        if (getValList != null && !getValList.isEmpty()) {
+            String delIds = sarFileSplitItemsEO.getDelItemIds();
+            List<String> itemValIds = new ArrayList<>();
+            //删除VAL表前台删掉的条目信息
+            if (StringUtils.isNotEmpty(delIds)) {
+                String[] delArr = delIds.split(",");
+                SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO();
+                delEO.setIdList(delArr);
+                if (delArr != null && delArr.length > 0) {
+                    sarFileSplitItemsValEODao.deleteByIds(delEO);
+                    //删除table表数据
+                    itemValIds = new ArrayList<>(Arrays.asList(delArr));
+                }
+            }
+            //向val表更新数据
+            int ind = 1;
+            List<SarFileSplitItemsValEO> addValList = new ArrayList<>();
+            List<SarFileSplitItemsValEO> updateValList = new ArrayList<>();
+            for (SarFileSplitItemsValEO valEO : getValList) {
+                // 当前段内容
+                String valContent = "";
+                if ("TEXT".equals(valEO.getType())) {
+                    valContent = "<p>" + valEO.getItemContent() + "</p>";
+                } else if ("IMG".equals(valEO.getType())) {
+                    valContent =  valEO.getItemContent() ;
+                    //\"<img class=\\'wordImg\\' src=\\'\"++"\'>
+                } else if ("TABLE".equals(valEO.getType())) {
+                    valContent = valEO.getItemContent();
+                }
+                itemConditions += valContent;
+                // val表信息
+                if (StringUtils.isNotEmpty(valEO.getId())) {
+                    valEO.setDisplaySeq(ind);
+                    valEO.setModifyTime(new Date());
+                    valEO.setModifyUser(userId);
+                    updateValList.add(valEO);
+                    itemValIds.add(valEO.getId());
+//                    sarFileSplitItemsValEODao.updateByPrimaryKeySelective(valEO);
+                } else {
+                    valEO.setId(UUIDUtils.randomUUID20());
+                    valEO.setDisplaySeq(ind);
+                    valEO.setValidFlag(0);
+                    valEO.setCreationTime(new Date());
+                    valEO.setModifyTime(new Date());
+                    valEO.setCreationUser(userId);
+                    valEO.setModifyUser(userId);
+                    addValList.add(valEO);
+                }
+                ind++;
+            }
+            if (addValList != null && !addValList.isEmpty()) {
+                sarFileSplitItemsValEODao.insertForeach(addValList);
+            }
+            if  (updateValList != null && !updateValList.isEmpty()) {
+                for(SarFileSplitItemsValEO s : updateValList){
+                    sarFileSplitItemsValEODao.updateForeach(Arrays.asList(s));
+                }
+            }
+            sarFileSplitItemsEO.setItermsConditions(itemConditions);
+            resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
+        } else {
+            sarFileSplitItemsEO.setItermsConditions("");
+            resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
+            // 删除val表全部信息
+            sarFileSplitItemsValEODao.deleteByitemId(sarFileSplitItemsEO.getId());
+        }
+        return resultCount;
+    }
+
+    /**
+     * @Author yangxuenan
+     * @Description 修改特殊参数要求内容
+     * Date 2020/2/4 15:56
+     * @Param [sarFileSplitItemsEO]
+     * @return void
+     **/
+    public void updateParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO){
+        List<String> itemList = new ArrayList<>();
+        itemList.add(sarFileSplitItemsEO.getId());
+        sarFileSplitItemsParamsEODao.deleteByItemIds(itemList);
+        List<SarFileSplitItemsParamsEO> paramList = sarFileSplitItemsEO.getParamsList();
+        if(paramList != null && !paramList.isEmpty()){
+            for(SarFileSplitItemsParamsEO paramsEO : paramList){
+                paramsEO.setId(UUIDUtils.randomUUID20());
+                paramsEO.setItemId(sarFileSplitItemsEO.getId());
+                paramsEO.setInfoId(sarFileSplitItemsEO.getInfoId());
+                paramsEO.setValidFlag(0);
+                paramsEO.setCreationTime(new Date());
+                paramsEO.setModifyTime(new Date());
+            }
+            sarFileSplitItemsParamsEODao.insertForeach(paramList);
+        }
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return dao.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int batchDeleteItems(String ids) {
+        String[] itemIds = ids.split(",");
+        List<String> idList = Arrays.asList(itemIds);
+        // 查到对应menu
+        List<SarFileSplitItemsEO> getMenuList = dao.queryByItemsIds(idList);
+        List<SarFileSplitItemsEO> getAllItemList = new ArrayList<>();
+        List<String> menuIdList = new ArrayList<>();
+        List<String> allItemIdList = new ArrayList<>();
+        int result = 0;
+        if (getMenuList != null && !getMenuList.isEmpty()) {
+            for(SarFileSplitItemsEO splitItemsEO : getMenuList){
+                menuIdList.add(splitItemsEO.getMenuId());
+                List<String> menuList = sarFileSplitMenuEODao.getChild(splitItemsEO.getMenuId());
+                menuIdList.addAll(menuList);
+            }
+            if(!menuIdList.isEmpty()){
+                for(String menuId:menuIdList){
+                    List<SarFileSplitItemsEO> rows = dao.queryItemsByMenuId(menuId);
+                    getAllItemList.addAll(rows);
+                }
+            }
+            if (!getAllItemList.isEmpty()) {
+                for (SarFileSplitItemsEO itemsEO : getAllItemList) {
+                    if (!allItemIdList.contains(itemsEO.getId())) {
+                        allItemIdList.add(itemsEO.getId());
+                    }
+                }
+                // 删除menu表数据
+                sarFileSplitMenuEODao.deleteByIdList(menuIdList);
+                // 删除val表数据
+                sarFileSplitItemsValEODao.deleteValByitemIds(allItemIdList);
+                //删除table数据
+                sarFileSplitItemsTableEODao.deleteByitemIds(allItemIdList);
+                //删除特殊参数要求params表数据
+                sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList);
+                //删除res表数据
+//                sarFileSplitItemsResEODao.deleteByItemIds(allItemIdList);
+                //删除file表数据
+//                sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList);
+                result = dao.deleteByItemsIdList(allItemIdList);
+            }else if(!idList.isEmpty()){//菜单被删掉了，数据当时被保留下来的
+                allItemIdList.clear();
+                allItemIdList.addAll(idList);
+                // 删除val表数据
+                sarFileSplitItemsValEODao.deleteValByitemIds(allItemIdList);
+                //删除table数据
+                sarFileSplitItemsTableEODao.deleteByitemIds(allItemIdList);
+                //删除特殊参数要求params表数据
+                sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList);
+                result = dao.deleteByItemsIdList(allItemIdList);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public boolean judgeContaintChilds(String ids) {
+        String[] itemIds = ids.split(",");
+        List<String> idList = Arrays.asList(itemIds);
+        // 查到对应menu
+        List<SarFileSplitItemsEO> getMenuList = dao.queryByItemsIds(idList);
+        if (getMenuList != null && !getMenuList.isEmpty()) {
+            for (SarFileSplitItemsEO splitItemsEO : getMenuList) {
+                SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO();
+                sarMenuEO.setId(splitItemsEO.getMenuId());
+                List<SarFileSplitMenuEO> list = sarFileSplitMenuEODao.queryByPidExcpetSelf(sarMenuEO);
+                if(list != null && !list.isEmpty()){
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public List<FileSplitItemsExportDto> queryByOrdersForExport(SarFileSplitItemsEOPage page) {
+        List<FileSplitItemsExportDto> list = sarFileSplitItemsEODao.queryByOrdersForExport(page);
+
+        for (FileSplitItemsExportDto data:list) {
+            //查询svpps
+            String svppsShow = sysInfoEOService.getSvppsNamesByIds(data.getSvpps());
+            data.setSvpps(svppsShow);
+            List<DicTypeEO> getDicType = dicTypeEODao.getDicTypeByDicCode("ENERGYTYPES");
+            List<DicTypeEO> getDicType1 = dicTypeEODao.getDicTypeByDicCode("BZFGGXOUIUJ");
+            getDicType.addAll(getDicType1);
+            for (DicTypeEO dicTypeEO:getDicType) {
+                if (dicTypeEO.getDicTypeCode().equals(data.getApplyArctic())){
+                    data.setApplyArctic(dicTypeEO.getDicTypeName());
+                }
+                if (dicTypeEO.getDicTypeCode().equals(data.getBusStandCover())){
+                    data.setBusStandCover(dicTypeEO.getDicTypeName());
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<FileSplitValExportDto> combineItemValInfo(List<SarFileSplitItemsValEO> getValList, List<FileSpiltValTableExportDto> allTableList, List<FileSplitValImgExportDto> allImgList, SarFileSplitItemsEOPage page) {
+        int tableIndex = page.getTableIndex();
+        int imgIndex = page.getImgIndex();
+        List<FileSplitValExportDto> valContent = new ArrayList<>();
+        if (getValList != null && !getValList.isEmpty()) {
+            String preType = "";
+            for(SarFileSplitItemsValEO itemsValEO : getValList){
+                String type = itemsValEO.getType();
+                FileSplitValExportDto lastOne = new FileSplitValExportDto();
+                lastOne.setValType(type);
+                if(preType.equals(type) && "TEXT".equals(type)) {
+                    lastOne = valContent.get(valContent.size() - 1);
+                    lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n");
+                    valContent.set(valContent.size() - 1, lastOne);
+                } else if ("TEXT".equals(type)) {
+                    lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n");
+                    valContent.add(lastOne);
+                } else if ("TABLE".equals(type)) {
+                    String tableName = String.valueOf(tableIndex);
+                    lastOne.setValContent("tableSheet" + tableName);
+                    //查询table信息
+                    SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage();
+                    tablePage.setItemsValId(itemsValEO.getId());
+                    valContent.add(lastOne);
+//                    List<List<SarFileSplitItemsTableEO>> tableList = combineTableList(itemsValEO);
+                    FileSpiltValTableExportDto tableExportDto = new FileSpiltValTableExportDto();
+                    tableExportDto.setTableName("tableSheet" + tableName);
+//                    tableExportDto.setTableEOList(tableList);
+                    tableExportDto.setTableHtCon(itemsValEO.getItemContent());
+                    allTableList.add(tableExportDto);
+                    tableIndex++;
+                    page.setTableIndex(tableIndex);
+                } else if ("IMG".equals(type)) {
+                    String imgContent = itemsValEO.getItemContent();
+                    String imgUUIndex = "img" + String.valueOf(imgIndex);
+                    if (StringUtils.isNotEmpty(imgContent)){
+                        int pathIndex = imgContent.indexOf("src='uploadPath");
+                        if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) {
+                            String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2);
+                            String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length());
+                            lastOne.setValContent(imgUUIndex+".png");
+                            valContent.add(lastOne);
+                            FileSplitValImgExportDto fileSplitValImgExportDto = new FileSplitValImgExportDto();
+                            fileSplitValImgExportDto.setImgName(imgUUIndex+".png");
+                            if (StringUtils.isNotEmpty(itemsValEO.getImgName())) {
+                                fileSplitValImgExportDto.setImgPath(itemsValEO.getImgName());
+                            } else {
+                                fileSplitValImgExportDto.setImgPath(imgPath);
+                            }
+                            allImgList.add(fileSplitValImgExportDto);
+                            imgIndex++;
+                            page.setImgIndex(imgIndex);
+                        }
+                    }
+                }
+                preType = itemsValEO.getType();
+            }
+        }
+        return valContent;
+    }
+
+    @Override
+    public void downLoadImgList(List<FileSplitValImgExportDto> allImgList, String fileNowPath) throws IOException {
+        for(FileSplitValImgExportDto imgExportDto : allImgList){
+            String oldPath = uploadFilePath+ "/" + imgExportDto.getImgPath();
+            String newPath = fileNowPath + "/" + imgExportDto.getImgName();
+            File oldFile = new File(oldPath);
+            if (oldFile.exists()){
+                copyFile1(oldPath, newPath);
+            }
+        }
+    }
+
+    @Override
+    public void downLoadFileList(List<AttFileEO> attfileEo, String fileNowPath) throws IOException {
+        for(AttFileEO fileExportDto : attfileEo){
+            String oldPath = uploadFilePath+ "/" + fileExportDto.getFilePath() + fileExportDto.getFileName();
+            String newPath = fileNowPath + "/" + fileExportDto.getOldFileName();
+            File oldFile = new File(oldPath);
+            if (oldFile.exists()){
+                copyFile1(oldPath, newPath);
+            }
+        }
+    }
+
+    @Override
+    @Transactional
+    public ResponseMessage<SarFileSplitItemsEO> importSplitItems(List<SarFileSplitItemsImportDto> list, String filepath,
+                                                                 SarFileSplitInfoEO sarFileSplitInfoEO, List<SplitTableInfo> getSheetTableList) {
+        //此处需要做各种验证，数据库操作
+        try {
+            String infoId = null;
+            if (StringUtils.isNotBlank(sarFileSplitInfoEO.getInfoId())){
+                infoId = sarFileSplitInfoEO.getInfoId();
+                sarFileSplitInfoEO.setInfoId(null);
+            }else {
+                infoId = UUIDUtils.randomUUID20();
+            }
+            //验证导入数据是否符合规则
+            Map map = validateImportDatas(list,filepath);
+            boolean isOk = (boolean) map.get("result");
+            if (!isOk) {
+                //验证没有通过
+                String message = (String) map.get("message");
+                return Result.error("fail", message);
+            }
+            //将导入数据循环合并整理后 新增至相应表
+            list = (List<SarFileSplitItemsImportDto>) map.get("resultList");
+            int countSuccess = 0;
+            // 最终添加的数据
+            List<SarFileSplitItemsEO> addItemsEOList = new ArrayList<>();
+            int itemNum = 0;
+            String firstId = UUIDUtils.randomUUID20();
+            String menuid = sarFileSplitInfoEO.getMenuId();
+            if (null == menuid) {
+                SarFileSplitItemsEO firstItem = new SarFileSplitItemsEO();
+                firstItem.setId(firstId);
+                firstItem.setItemsNum("总目录");
+                firstItem.setValidFlag(0);
+                firstItem.setCreationTime(new Date());
+                firstItem.setModifyTime(new Date());
+                addItemsEOList.add(firstItem);  //新的总目录家在了添加的list中   当前仅一条
+            }
+
+            for (SarFileSplitItemsImportDto importDto : list) { //遍历传入的值
+                //判断此行数据是否全部为空,是则不读取
+                if(checkObjAllFieldsIsNull(importDto)){
+                    continue;
+                }
+                SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO();
+                BeanUtils.copyProperties(importDto, sarFileSplitItemsEO);
+                sarFileSplitItemsEO.setInfoId(infoId);
+                List<SarFileSplitItemsValEO> addItemValList = new ArrayList<>();
+                if (addItemsEOList != null && !addItemsEOList.isEmpty()) {
+                    SarFileSplitItemsEO oldItems = addItemsEOList.get(addItemsEOList.size()-1);
+                    if (itemNum > 0 && sarFileSplitItemsEO.getItemsNum().equals(oldItems.getItemsNum())
+                            && sarFileSplitItemsEO.getItemsName().equals(oldItems.getItemsName())) {
+                        addItemValList = oldItems.getItemValEOList();
+                        String itemContent = oldItems.getItermsConditions()+sarFileSplitItemsEO.getItermsConditions();
+                        oldItems.setItermsConditions(itemContent);
+                        if(StringUtils.isBlank(sarFileSplitItemsEO.getItermsConditions())){
+                            continue;
+                        }
+                        String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n");
+                        if (valArr != null && valArr.length > 0) {
+                            for (int i=0;i<valArr.length;i++) {
+                                SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
+                                boolean isText = true;
+                                if (getSheetTableList != null && !getSheetTableList.isEmpty()) {
+                                    for (SplitTableInfo splitTableInfo : getSheetTableList) {
+                                        if (splitTableInfo.getTableName().equals(valArr[i])) {
+                                            isText = false;
+                                            valEO.setType("TABLE");
+                                            valEO.setItemContent(splitTableInfo.getTableHtml());
+                                        }
+                                    }
+                                }
+                                List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]);
+                                if (nowfilelist != null && !nowfilelist.isEmpty()) {
+                                    AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
+                                    if(attFileVo!=null){
+                                        isText = false;
+                                        String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName();
+                                        String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
+                                        valEO.setType("IMG");
+                                        valEO.setItemContent(imgCon);
+                                    }
+                                }
+                                if (isText) {
+                                    valEO.setType("TEXT");
+                                    valEO.setItemContent(valArr[i]);
+                                }
+                                addItemValList.add(valEO);
+                            }
+                        }
+                        oldItems.setItemValEOList(addItemValList);
+                    }else {
+                        String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n");
+                        if (valArr != null && valArr.length > 0) {
+                            for (int i=0;i<valArr.length;i++) {
+                                SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
+                                boolean isText = true;
+                                if (getSheetTableList != null && !getSheetTableList.isEmpty()) {
+                                    for (SplitTableInfo splitTableInfo : getSheetTableList) {
+                                        if (splitTableInfo.getTableName().equals(valArr[i])) {
+                                            isText = false;
+                                            valEO.setType("TABLE");
+                                            valEO.setItemContent(splitTableInfo.getTableHtml());
+                                        }
+                                    }
+                                }
+                                List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]);
+                                if (nowfilelist != null && !nowfilelist.isEmpty()) {
+                                    AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
+                                    if(attFileVo!=null){
+                                        isText = false;
+                                        String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName();
+                                        String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
+                                        valEO.setType("IMG");
+                                        valEO.setItemContent(imgCon);
+                                    }
+                                }
+                                if (isText) {
+                                    valEO.setType("TEXT");
+                                    valEO.setItemContent(valArr[i]);
+                                }
+                                addItemValList.add(valEO);
+                            }
+                        }
+                        sarFileSplitItemsEO.setItemValEOList(addItemValList);
+                        addItemsEOList.add(sarFileSplitItemsEO);
+                    }
+                } else {
+                    String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n");
+                    if (valArr != null && valArr.length > 0) {
+                        for (int i=0;i<valArr.length;i++) {
+                            SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
+                            boolean isText = true;
+                            if (getSheetTableList != null && !getSheetTableList.isEmpty()) {
+                                for (SplitTableInfo splitTableInfo : getSheetTableList) {
+                                    if (splitTableInfo.getTableName().equals(valArr[i])) {
+                                        isText = false;
+                                        valEO.setType("TABLE");
+                                        valEO.setItemContent(splitTableInfo.getTableHtml());
+                                    }
+                                }
+                            }
+                            List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]);
+                            if (nowfilelist != null && !nowfilelist.isEmpty()) {
+                                AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0));
+                                if(attFileVo!=null){
+                                    isText = false;
+                                    String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName();
+                                    String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
+                                    valEO.setType("IMG");
+                                    valEO.setItemContent(imgCon);
+                                }
+                            }
+                            if (isText) {
+                                valEO.setType("TEXT");
+                                valEO.setItemContent(valArr[i]);
+                            }
+                            addItemValList.add(valEO);
+                        }
+                    }
+                    sarFileSplitItemsEO.setItemValEOList(addItemValList);
+                    addItemsEOList.add(sarFileSplitItemsEO);
+                }
+                itemNum++;
+            }
+
+            //导入拆分结果前首先新增拆分条目
+            if (StringUtils.isBlank(menuid)) {
+                sarFileSplitInfoEO.setCreationTime(new Date());
+                sarFileSplitInfoEO.setModifyTime(new Date());
+                sarFileSplitInfoEO.setId(infoId);
+                sarFileSplitInfoEO.setValidFlag(0);
+                sarFileSplitInfoEO.setResult("1");
+                sarFileSplitInfoEO.setModifyUser(LoginUserUtil.getUserId());
+                sarFileSplitInfoEOService.insertSelective(sarFileSplitInfoEO);
+            }
+
+            Map<String, String> menuPidMap = new HashMap<>();
+            //默认为总目录了
+            if (StringUtils.isBlank(menuid)) {
+                menuPidMap.put("总目录", firstId);
+            }else{
+                menuPidMap.put("总目录",menuid );
+            }
+            for (SarFileSplitItemsEO itemsEO : addItemsEOList) {
+                String menuIdT = createItemsInfo(itemsEO,infoId,countSuccess,menuPidMap);
+                menuPidMap.put(itemsEO.getItemsNum(),menuIdT);
+                countSuccess++;
+            }
+            //统计成功结果需要去掉总目录这条数据
+            String msg = "成功导入" + (countSuccess-1) + "条";
+            return Result.success("0", msg, null);
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+            return Result.error("导入失败");
+        }
+    }
+
+    public String createItemsInfo(SarFileSplitItemsEO sarFileSplitItemsEO,String infoId,int countNum,Map<String,String> menuPMap){
+        String userId = LoginUserUtil.getUserId();
+        //创建菜单
+        SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
+        sarFileSplitMenuEO.setInfoId(infoId);
+        sarFileSplitMenuEO.setName(sarFileSplitItemsEO.getItemsNum());
+        sarFileSplitMenuEO.setItemName(sarFileSplitItemsEO.getItemsName());
+        //获取父节点id
+        String menuNm = sarFileSplitItemsEO.getItemsNum();
+        if(menuNm.indexOf(".") > 0){
+            menuNm = menuNm.substring(0,menuNm.lastIndexOf("."));
+            sarFileSplitMenuEO.setpId(menuPMap.get(menuNm));
+        }else if("总目录".equalsIgnoreCase(menuNm)){
+            sarFileSplitMenuEO.setPId("");
+        }else{
+            sarFileSplitMenuEO.setpId(menuPMap.get("总目录"));
+        }
+
+        sarFileSplitMenuEO.setDisplaySeq(countNum+1L);
+        sarFileSplitMenuEO.setCreationUser(userId);
+        sarFileSplitMenuEO.setModifyUser(userId);
+        String menuId = sarFileSplitMenuEOService.addMenuForImport(sarFileSplitMenuEO);
+        //添加items表数据
+        String itemsId = UUIDUtils.randomUUID20();
+        sarFileSplitItemsEO.setId(itemsId);
+        sarFileSplitItemsEO.setMenuId(menuId);
+        sarFileSplitItemsEO.setValidFlag(0);
+        sarFileSplitItemsEO.setCreationTime(new Date());
+        sarFileSplitItemsEO.setModifyTime(new Date());
+        sarFileSplitItemsEO.setCreationUser(userId);
+        dao.insertSelective(sarFileSplitItemsEO);
+        //添加val表数据
+        List<SarFileSplitItemsValEO> getValList = sarFileSplitItemsEO.getItemValEOList();
+        int ind = 1;
+        if (getValList != null && !getValList.isEmpty()) {
+            for (SarFileSplitItemsValEO valEO : getValList) {
+                // 当前段内容
+                String valContent = "";
+                if ("TEXT".equals(valEO.getType())) {
+                    valContent = "<p>" + valEO.getItemContent() + "</p>";
+                } else if ("IMG".equals(valEO.getType())) {
+                    valContent = "<img class=\'wordImg\' src=\''+ valEO.getItemContent() +'\'>";
+                } else if ("TABLE".equals(valEO.getType())) {
+                    valContent = valEO.getItemContent();
+                }
+                // val表信息
+                valEO.setId(UUIDUtils.randomUUID20());
+                valEO.setItemId(itemsId);
+                valEO.setDisplaySeq(ind);
+                valEO.setValidFlag(0);
+                valEO.setCreationTime(new Date());
+                valEO.setModifyTime(new Date());
+                valEO.setCreationUser(userId);
+                valEO.setModifyUser(userId);
+                ind++;
+            }
+            sarFileSplitItemsValEODao.insertForeach(getValList);
+        }
+        return menuId;
+    }
+
+    public Map validateImportDatas(List<SarFileSplitItemsImportDto> datas, String filepath) throws Exception {
+        //存放数据验证结果信息
+        List<String> stringMessage = new ArrayList<>();
+        List<String> claimStypelist = new ArrayList<>();
+        List<String> foList=new ArrayList<>();
+        List<String> dutyEngineerList=new ArrayList<>();
+        int i = 1;    //记录行号
+        int num = 0; //记录是第几条数据
+        //循环验证数据
+        for (SarFileSplitItemsImportDto dto : datas) {
+            i++;
+            int countError = 0;   //记录失败数据数量
+            DicTypeEO dic = new DicTypeEO();
+            List<DicTypeEO> getDic = new ArrayList<>();
+            String errorMsg = "第" + i + "行：";
+            //关联文件已经删除了
+//            dto.setRelevanceFileName(dto.getRelevanceFile());
+            if (num > 0 && StringUtils.isEmpty(dto.getItemsNum()) && StringUtils.isEmpty(dto.getItemsName())) {
+                String nowItemContent = dto.getItermsConditions();
+                BeanUtils.copyProperties(datas.get(num-1), dto);
+                dto.setItermsConditions(nowItemContent);
+                // dto.setRelevanceFile(dto.getRelevanceFileName());
+            }
+            if (StringUtils.isEmpty(dto.getItemsNum())) {
+                errorMsg += "条款号不能为空;";
+                countError++;
+            } else {
+                if (dto.getItemsNum().length()>100) {
+                    errorMsg += "条款号不能超过100个字符;";
+                    countError++;
+                }
+            }
+            if (StringUtils.isEmpty(dto.getItemsName())) {
+                errorMsg += "条款名称不能为空;";
+                countError++;
+            } else {
+                if (dto.getItemsName().length()>100) {
+                    errorMsg += "条款名称不能超过100个字符;";
+                    countError++;
+                }
+            }
+            String saveApplyCode = "";
+            if (StringUtils.isNotEmpty(dto.getApplyArctic())) {
+                dto.setApplyArctic(dto.getApplyArctic().replace("，", ","));
+                String applys[] = dto.getApplyArctic().split(",");
+                if(applys.length>20){
+                    errorMsg += "适用车型选项不能超过20个;";
+                    countError++;
+                } else if (dto.getApplyArctic().length() > 500) {
+                    errorMsg += "适用车型不能超过500个字符;";
+                    countError++;
+                } else {
+                    Set set = new HashSet();
+                    for (int a = 0; a < applys.length; a++) {
+                        dic.setDicTypeName(applys[a]);
+                        dic.setDicTypeCode("ENERGYTYPES");
+                        getDic = dicTypeEODao.getDicTypeByDicTypeName(dic);
+                        if (getDic.size() == 1) {
+                            saveApplyCode += getDic.get(0).getDicTypeCode() + ",";
+                        } else if (getDic.size() > 0) {
+                            errorMsg += "适用车型" + applys[a] + "不明确;";
+                            countError++;
+                            break;
+                        } else {
+                            errorMsg += "适用车型" + applys[a] + "不存在;";
+                            countError++;
+                            break;
+                        }
+                        set.add(applys[a]);
+                        if (a==applys.length-1 && applys.length != set.size()){
+                            errorMsg += "适用车型存在重复数据;";
+                            countError++;
+                        }
+                    }
+                    if (!saveApplyCode.equals("")){
+                        dto.setApplyArctic(saveApplyCode.substring(0,saveApplyCode.length()-1));
+                    }
+                }
+            }
+            if(!claimStypelist.contains(dto.getClaimType())) {
+                if (StringUtils.isNotEmpty(dto.getClaimType())) {
+                    dic.setDicTypeName(dto.getClaimType());
+                    dic.setDicTypeCode("REQUESTTYPE");
+                    if (dto.getClaimType().length() > 500) {
+                        errorMsg += "要求类型不能超过500个字符;";
+                        countError++;
+                    } else {
+                        getDic = dicTypeEODao.getDicTypeByDicTypeName(dic);
+                        Set set = new HashSet();
+                        if (getDic != null) {
+                            if (getDic.size() == 1) {
+                                dto.setClaimType(getDic.get(0).getDicTypeCode());
+                                claimStypelist.add(getDic.get(0).getDicTypeCode());
+                            } else if (getDic.size() > 0) {
+                                errorMsg += "要求类型不明确;";
+                                countError++;
+                            } else {
+                                errorMsg += "要求类型不存在;";
+                                countError++;
+                            }
+                        } else {
+                            errorMsg += "要求类型不存在;";
+                            countError++;
+                        }
+                    }
+                }
+            }
+            if(StringUtils.isNotEmpty(dto.getItermsConditions())){
+                if(dto.getItermsConditions().length() > 50000){
+                    errorMsg += "内容简介不能超过50000个字符；";
+                    countError++;
+                }
+            }
+            if(!foList.contains(dto.getFo())) {
+                if (StringUtils.isNotEmpty(dto.getFo())) {
+                    if (dto.getFo().length() > 200) {
+                        errorMsg += "FO不能超过200个字符；";
+                        countError++;
+                    } else {
+                        String uname = roleEODao.getIdsByNames(dto.getFo().split(","));
+                        if (StringUtils.isNotBlank(uname)) {
+                            dto.setFo(uname);
+                            foList.addAll(Arrays.asList(uname.split(",")));
+                        } else {
+                            errorMsg += "FO不存在;";
+                            countError++;
+                        }
+                    }
+                }
+            }
+            if(!dutyEngineerList.contains(dto.getDutyEngineer())) {
+                if (StringUtils.isNotEmpty(dto.getDutyEngineer())) {
+                    if (dto.getDutyEngineer().length() > 100) {
+                        errorMsg += "责任工程师不能超过100个字符;";
+                        countError++;
+                    } else {
+                        String emList = roleEODao.getIdsByNames(dto.getDutyEngineer().split(","));
+                        if (StringUtils.isNotBlank(emList)) {
+                            dto.setDutyEngineer(emList);
+                            dutyEngineerList.addAll(Arrays.asList(dto.getDutyEngineer().split(",")));
+                        } else {
+                            errorMsg += "系统中没有用户：" + dto.getDutyEngineer();
+                            countError++;
+                        }
+                    }
+                }
+            }
+            if(StringUtils.isNotEmpty(dto.getSvpps())){
+                if(dto.getSvpps().length() > 200){
+                    errorMsg += "SVPPS不能超过200个字符；";
+                    countError++;
+                }else {
+                    String svppsShow = sysInfoEOService.getSvppsIdByName(dto.getSvpps());
+                    dto.setSvpps(svppsShow);
+                }
+            }
+            if(StringUtils.isNotEmpty(dto.getBusStandCover())){
+                if(dto.getBusStandCover().length() > 200){
+                    errorMsg += "企标覆盖关系不能超过200个字符；";
+                    countError++;
+                }else {
+                    List<DicTypeEO> getDicType = dicTypeEODao.getDicTypeByDicCode("BZFGGXOUIUJ");
+                    for (DicTypeEO dicTypeEO:getDicType) {
+                        if (dicTypeEO.getDicTypeName().equals(dto.getBusStandCover())){
+                            dto.setBusStandCover(dicTypeEO.getDicTypeCode());
+                        }
+                    }
+                }
+            }
+            if(StringUtils.isNotBlank(dto.getResponsibleUnit())){
+                if(dto.getResponsibleUnit().length() > 100){
+                    errorMsg += "责任部门不能超过100个字符；";
+                    countError++;
+                }else {
+                    String id = sysInfoEOService.getOrgIdByName(dto.getResponsibleUnit(),"DEPART");
+                    if(StringUtils.isNotBlank(id)){
+                        dto.setResponsibleUnit(id);
+                    } else {
+                        errorMsg += "系统中没有部门"+dto.getResponsibleUnit();
+                        countError++;
+                    }
+                }
+            }
+            if (countError > 0) {
+                stringMessage.add(errorMsg);
+            }
+            num++;
+        }
+        Map map = new HashMap();
+        if (stringMessage.isEmpty()) {
+            map.put("result", true);
+            map.put("resultList", datas);
+            map.put("message", "");
+        } else {
+            map.put("result", false);
+            String html = "";
+            if (stringMessage.size()>0){
+                html = StringUtils.join(stringMessage,"</br>");
+            }
+            map.put("message", html);
+        }
+        return map;
+    }
+
+
+    @Override
+    public void combineItems(String ids) {
+        String userId = UserUtils.getUserId();
+        String[] idArr = ids.split(",");
+        SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage();
+        page.setIdList(Arrays.asList(idArr));
+        page.setValidFlag("0");
+        page.setPageSize(1000);
+        page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc");
+        List<SarFileSplitItemsEO> getList = dao.queryByPage(page);
+        if (getList != null && !getList.isEmpty()) {
+            // 最终合并后的条款
+            SarFileSplitItemsEO resultItem = getList.get(0);
+            String reaultItemId = resultItem.getId();
+            // 合并所有条款内容
+            StringBuilder resultContent = new StringBuilder();
+            resultContent.append(resultItem.getItermsConditions());
+            // 合并所有val表内容
+            List<SarFileSplitItemsValEO> resultValList = new ArrayList<>();
+            SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage();
+            valEOPage.setItemId(reaultItemId);
+            List<SarFileSplitItemsValEO> valList = sarFileSplitItemsValEODao.queryByList(valEOPage);
+            resultValList.addAll(valList);
+            // 保存所有合并后需要删掉的条款id
+            List<String> delIds = new ArrayList<>();
+            List<String> delMenuIds = new ArrayList<>();
+            for (int i = 1; i < getList.size(); i++) {
+                SarFileSplitItemsEO itemsEO = getList.get(i);
+                delIds.add(itemsEO.getId());
+                delMenuIds.add(itemsEO.getMenuId());
+                String itemContent = "<p>" + itemsEO.getItemsNum() + "</p>" + itemsEO.getItermsConditions();
+                resultContent.append(itemContent);
+                SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
+                valEO.setItemId(reaultItemId);
+                valEO.setType("TEXT");
+                valEO.setItemContent(itemsEO.getItemsNum());
+                valEO.setId(UUIDUtils.randomUUID20());
+                valEO.setValidFlag(0);
+                valEO.setCreationTime(new Date());
+                valEO.setModifyTime(new Date());
+                valEO.setCreationUser(userId);
+                valEO.setModifyUser(userId);
+                resultValList.add(valEO);
+                SarFileSplitItemsValEOPage valEOPage1 = new SarFileSplitItemsValEOPage();
+                valEOPage1.setItemId(itemsEO.getId());
+                List<SarFileSplitItemsValEO> valList1 = sarFileSplitItemsValEODao.queryByList(valEOPage1);
+                resultValList.addAll(valList1);
+            }
+            // 开始进行合并数据处理
+            changeInfos(resultContent, reaultItemId, delMenuIds, delIds, resultValList);
+        }
+    }
+
+    public void changeInfos (StringBuilder resultContent,String reaultItemId,List<String> delMenuIds,List<String> delIds,List<SarFileSplitItemsValEO> resultValList) {
+        //1.更新最终合并的条款内容
+        if (resultContent != null) {
+            SarFileSplitItemsEO newItems = new SarFileSplitItemsEO();
+            newItems.setId(reaultItemId);
+            newItems.setItermsConditions(resultContent.toString());
+            dao.updateByPrimaryKeySelective(newItems);
+        }
+        // 2.删除多余节点数据
+        if (delMenuIds != null && !delMenuIds.isEmpty()) {
+            sarFileSplitMenuEODao.deleteByIdList(delMenuIds);
+        }
+        // 3.删除多余条款及val表数据
+        if (delIds != null && !delIds.isEmpty()) {
+            dao.deleteByItemsIdList(delIds);
+            delIds.add(reaultItemId);
+            sarFileSplitItemsValEODao.deleteValByitemIds(delIds);
+        }
+        // 4.保存新的val表数据
+        if (resultValList != null && !resultValList.isEmpty()) {
+            int ind = 0;
+            for (SarFileSplitItemsValEO valEO : resultValList) {
+                ind++;
+                valEO.setItemId(reaultItemId);
+                valEO.setDisplaySeq(ind);
+            }
+            sarFileSplitItemsValEODao.insertForeach(resultValList);
+        }
+    }
+
+    public static void copyFile1(String srcPath, String destPath) throws IOException {
+        // 打开输入流
+        FileInputStream fis = new FileInputStream(srcPath);
+        // 打开输出流
+        FileOutputStream fos = new FileOutputStream(destPath);
+        // 读取和写入信息
+        int len = 0;
+        while ((len = fis.read()) != -1) {
+            fos.write(len);
+        }
+        // 关闭流  先开后关  后开先关
+        fos.close(); // 后开先关
+        fis.close(); // 先开后关
+
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsParamsEOServiceImpl.java

@@ -0,0 +1,28 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsParamsEODao;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsParamsEOPage;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsParamsEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarFileSplitItemsParamsEOServiceImpl implements SarFileSplitItemsParamsEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsParamsEOServiceImpl.class);
+
+    @Autowired
+    private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao;
+
+    @Override
+    public List<SarFileSplitItemsParamsEO> queryByList(SarFileSplitItemsParamsEOPage paramPage) {
+        return sarFileSplitItemsParamsEODao.queryByList(paramPage);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsTableEOServiceImpl.java

@@ -0,0 +1,14 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsTableEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarFileSplitItemsTableEOServiceImpl implements SarFileSplitItemsTableEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsTableEOServiceImpl.class);
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java

@@ -0,0 +1,28 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsValEODao;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarFileSplitItemsValEOServiceImpl implements SarFileSplitItemsValEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOServiceImpl.class);
+
+    @Autowired
+    private SarFileSplitItemsValEODao sarFileSplitItemsValEODao;
+
+    @Override
+    public List<SarFileSplitItemsValEO> queryByList(SarFileSplitItemsValEOPage valEOPage) {
+        return sarFileSplitItemsValEODao.queryByList(valEOPage);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -0,0 +1,452 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.base.page.BasePage;
+import com.adc.da.slrs.standardSplit.dao.*;
+import com.adc.da.slrs.standardSplit.entity.*;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitMenuEOService;
+import com.adc.da.sys.util.LoginUserUtil;
+import com.adc.da.sys.util.UUIDUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.*;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarFileSplitMenuEOServiceImpl.class);
+
+    @Autowired
+    private SarFileSplitMenuEODao dao;
+    @Autowired
+    private SarFileSplitItemsEODao sarFileSplitItemsEODao;
+    @Autowired
+    private SarFileSplitItemsValEODao sarFileSplitItemsValEODao;
+    @Autowired
+    private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao;
+    @Autowired
+    private SarFileSplitMenuEODao SarFileSplitMenuEODao;
+    @Autowired
+    private SarFileSplitItemsParamsEODao sarFileSplitItemsParamsEODao;
+
+    @Override
+    public List<SarFileSplitMenuEO> queryByPage(BasePage page){
+        return SarFileSplitMenuEODao.queryByPage(page);
+    }
+
+    @Override
+    public List<SarFileSplitMenuEO> queryByList(SarFileSplitMenuEOPage page){
+        return SarFileSplitMenuEODao.queryByList(page);
+    }
+
+    @Override
+    public SarFileSplitMenuEO selectByPrimaryKey(String id){
+        return SarFileSplitMenuEODao.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO){
+        sarFileSplitMenuEO.setId(UUIDUtils.randomUUID20());
+        sarFileSplitMenuEO.setValidFlag(0);
+        sarFileSplitMenuEO.setCreationTime(new Date());
+        sarFileSplitMenuEO.setModifyTime(new Date());
+        int count = dao.insertSelective(sarFileSplitMenuEO);
+        // 之后的所有节点序号增加
+        SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage();
+        page.setPId(sarFileSplitMenuEO.getPId());
+        List<SarFileSplitMenuEO> getList = dao.queryByList(page);
+        if (getList != null && !getList.isEmpty()) {
+            for(SarFileSplitMenuEO menu : getList){
+                Long olgSeq = menu.getDisplaySeq();
+                if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) {
+                    menu.setDisplaySeq(olgSeq + 1);
+                    dao.updateByPrimaryKeySelective(menu);
+                }
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(SarFileSplitMenuEO sarFileSplitMenuEO){
+        return dao.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+    }
+
+    @Override
+    public void deleteMenu(String id) {
+        List<String> menuIds = new ArrayList<>();
+        menuIds.add(id);
+        // 删除节点及子节点
+        List<String> ids = dao.getChild(id);
+        if(ids!=null && !ids.isEmpty()){
+            dao.deleteByPId(ids);
+            sarFileSplitItemsValEODao.deleteValByMenuIds(ids);
+            sarFileSplitItemsTableEODao.deleteTableByMenuIds(ids);
+            sarFileSplitItemsEODao.deleteByMenuIds(ids);
+        }
+    }
+
+    @Override
+    public int dragMenu(DrageMenuEO drageMenuEO) {
+        SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
+        sarFileSplitMenuEO.setInfoId(drageMenuEO.getInfoId());
+        sarFileSplitMenuEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitMenuEO.setModifyTime(new Date());
+        sarFileSplitMenuEO.setId(drageMenuEO.getMenuId());
+        int result = 0;
+        if (drageMenuEO.getMoveType().equals("inner")) {
+            sarFileSplitMenuEO.setPId(drageMenuEO.getTargetMenuId());
+            if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) {
+                // 修改被影响的其他节点的排序，修改时间，修改人
+                long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId());
+                sarFileSplitMenuEO.setChildrenCount(childrenCount);
+                sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()+1);
+                sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay());
+                result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO);
+                // 如果子节点个数多，都需修改
+                if (childrenCount>1) {
+                    // 计算移动节点前后排序差
+                    long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay()-1;
+                    SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO();
+                    childrenUpdateEO.setId(drageMenuEO.getMenuId());
+                    childrenUpdateEO.setChildrenCount(betwttenNum);
+                    childrenUpdateEO.setModifyTime(new Date());
+                    childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId());
+                    result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO);
+                }
+                sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()+1);
+            } else {
+                // 修改被影响的其他节点的排序，修改时间，修改人
+                long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId());
+                sarFileSplitMenuEO.setChildrenCount(childrenCount);
+                sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1);
+                sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay());
+                result += dao.updateDisplaySeqCut(sarFileSplitMenuEO);
+                // 如果子节点个数多，都需修改
+                if (childrenCount>1) {
+                    // 计算移动节点前后排序差
+                    long betwttenNum = drageMenuEO.getTargetMenuDisplay()-childrenCount+1- drageMenuEO.getMenuDisplay();
+                    SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO();
+                    childrenUpdateEO.setId(drageMenuEO.getMenuId());
+                    childrenUpdateEO.setChildrenCount(betwttenNum);
+                    childrenUpdateEO.setModifyTime(new Date());
+                    childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId());
+                    result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO);
+                }
+                sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount+1);
+            }
+        } else if (drageMenuEO.getMoveType().equals("prev")) {
+            sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId());
+            if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) {
+                // 修改被影响的其他节点的排序，修改时间，修改人
+                long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId());
+                sarFileSplitMenuEO.setChildrenCount(childrenCount);
+                sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay());
+                sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay());
+                result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO);
+                // 如果子节点个数多，都需修改
+                if (childrenCount>1) {
+                    // 计算移动节点前后排序差
+                    long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay();
+                    SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO();
+                    childrenUpdateEO.setId(drageMenuEO.getMenuId());
+                    childrenUpdateEO.setChildrenCount(betwttenNum);
+                    childrenUpdateEO.setModifyTime(new Date());
+                    childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId());
+                    result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO);
+                }
+                sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay());
+            } else {
+                // 修改被影响的其他节点的排序，修改时间，修改人
+                long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId());
+                sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1);
+                sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()-1);
+                sarFileSplitMenuEO.setChildrenCount(childrenCount);
+                result += dao.updateDisplaySeqCut(sarFileSplitMenuEO);
+                // 如果子节点个数多，都需修改
+                if (childrenCount>1) {
+                    // 计算移动节点前后排序差
+                    long betwttenNum = drageMenuEO.getTargetMenuDisplay()- childrenCount - drageMenuEO.getMenuDisplay();
+                    SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO();
+                    childrenUpdateEO.setId(drageMenuEO.getMenuId());
+                    childrenUpdateEO.setChildrenCount(betwttenNum);
+                    childrenUpdateEO.setModifyTime(new Date());
+                    childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId());
+                    result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO);
+                }
+
+                sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount);
+            }
+
+        } else {
+            sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId());
+            if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) {
+                // 修改被影响的其他节点的排序，修改时间，修改人 往上移动
+                // 查询目标最大的排序
+                long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId());
+                // 查询移动节点包括子节点一共有多少个
+                long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId());
+                sarFileSplitMenuEO.setDisplaySeqStart(targetDisplay+1);
+                sarFileSplitMenuEO.setChildrenCount(childrenCount);
+                sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay());
+                result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO);
+                // 如果子节点个数多，都需修改
+                if (childrenCount>1) {
+                    // 计算移动节点前后排序差
+                    long betwttenNum = drageMenuEO.getMenuDisplay()-targetDisplay-1;
+                    SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO();
+                    childrenUpdateEO.setId(drageMenuEO.getMenuId());
+                    childrenUpdateEO.setChildrenCount(betwttenNum);
+                    childrenUpdateEO.setModifyTime(new Date());
+                    childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId());
+                    result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO);
+                }
+                sarFileSplitMenuEO.setDisplaySeq(targetDisplay+1);
+            } else {
+                // 修改被影响的其他节点的排序，修改时间，修改人 往下移动
+                // 如果该节点下有字节点，寻找该节点包括所有子节点的最大排序
+                // 查询目标最大的排序
+                long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId());
+                long menuMaxDisplay = getMaxDisplayByid(drageMenuEO.getMenuId());
+                // 查询移动节点包括子节点一共有多少个
+                long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId());
+                sarFileSplitMenuEO.setDisplaySeqStart(menuMaxDisplay);
+                sarFileSplitMenuEO.setChildrenCount(childrenCount);
+                sarFileSplitMenuEO.setDisplaySeqEnd(targetDisplay);
+                result += dao.updateDisplaySeqCut(sarFileSplitMenuEO);
+                // 如果子节点个数多，都需修改
+                if (childrenCount>1) {
+                    // 计算移动节点前后排序差
+                    long betwttenNum = targetDisplay-childrenCount+1 - drageMenuEO.getMenuDisplay();
+                    SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO();
+                    childrenUpdateEO.setId(drageMenuEO.getMenuId());
+                    childrenUpdateEO.setChildrenCount(betwttenNum);
+                    childrenUpdateEO.setModifyTime(new Date());
+                    childrenUpdateEO.setModifyUser(LoginUserUtil.getUserId());
+                    result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO);
+                }
+                sarFileSplitMenuEO.setDisplaySeq(targetDisplay-childrenCount+1);
+                // 修改字节的的排序
+            }
+        }
+        // 修改当前节点，父亲Id，排序，修改时间，修改人
+        result += dao.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+        return result;
+    }
+
+    // 通过ID查询该结点及结点下所有的节点排序的最大值
+    public int getMaxDisplayByid(String menuID) {
+        return  dao.getMaxDisplayByid(menuID);
+    }
+
+    @Override
+    public boolean  judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception {
+        boolean result = false;   //true 表示有记录，false表示无记录
+        //先判断目录下是否有子节点
+        List<SarFileSplitMenuEO> list = dao.queryByPidExcpetSelf(sarMenuEO);
+        if(list.size()<=0){
+            //再查节点下是否有标准，法规，企业标准记录
+            SarFileSplitItemsEOPage itemEO = new SarFileSplitItemsEOPage();
+            itemEO.setMenuId(sarMenuEO.getId());
+            itemEO.setValidFlag("0");
+            List<SarFileSplitItemsEO> listresult = sarFileSplitItemsEODao.queryByList(itemEO);
+            if(listresult !=null && listresult.size()>0){
+                result=true;
+            }
+        }
+        else{
+            result=true;
+        }
+        return result;
+    }
+
+    @Override
+    public int copyMenu (SarFileSplitMenuEO sarMenuEO) {
+        int result = 0;
+        // 用来存放item的新旧ID，key：旧ID，value：新ID
+        Map itemIdMap = new HashMap<>();
+        List<String> oldItemIdList = new ArrayList<>();
+        Map itemValIdMap = new HashMap<>();
+        Map menuIdMap = new HashMap<>();
+        // 根据目录ID查询相关信息
+        sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId());
+        // 查询该节点下所有的 子节点 并修改排序
+        List<SarFileSplitMenuEO> sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO);
+        int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId());
+        SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
+        sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1));
+        sarFileSplitMenuEO.setDisplaySeqEnd(10000L);
+        sarFileSplitMenuEO.setChildrenCount(Long.valueOf(sarFileSplitMenuEOList.size()));
+        sarFileSplitMenuEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitMenuEO.setModifyTime(new Date());
+        sarFileSplitMenuEO.setInfoId(sarMenuEO.getInfoId());
+        dao.updateDisplaySeqAdd(sarFileSplitMenuEO);
+        for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) {
+            menuIdMap.put(sarFileSplitMenuEOfor.getId(),UUIDUtils.randomUUID20());
+        }
+        for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) {
+            sarFileSplitMenuEOfor.setId(menuIdMap.get(sarFileSplitMenuEOfor.getId()).toString());
+            if (menuIdMap.containsKey(sarFileSplitMenuEOfor.getpId())){
+                sarFileSplitMenuEOfor.setpId(menuIdMap.get(sarFileSplitMenuEOfor.getpId()).toString());
+            }
+            sarFileSplitMenuEOfor.setDisplaySeq(sarFileSplitMenuEOfor.getDisplaySeq() + sarFileSplitMenuEOList.size());
+            sarFileSplitMenuEOfor.setCreationTime(new Date());
+            sarFileSplitMenuEOfor.setModifyTime(new Date());
+            sarFileSplitMenuEOfor.setCreationUser(LoginUserUtil.getUserId());
+            sarFileSplitMenuEOfor.setModifyUser(LoginUserUtil.getUserId());
+        }
+        // SAR_FILE_ITEMS_MENU 添加数据，
+        result = dao.insertForeach(sarFileSplitMenuEOList);
+        // SAR_FILE_ITEMS   添加数据，
+        List<SarFileSplitItemsEO> sarFileSplitItemsEOList = sarFileSplitItemsEODao.queryItemsByMenuId(sarMenuEO.getId());
+        for (SarFileSplitItemsEO sarFileSplitItemsEO : sarFileSplitItemsEOList) {
+            String newItemId = UUIDUtils.randomUUID20();
+            oldItemIdList.add(sarFileSplitItemsEO.getId());
+            itemIdMap.put(sarFileSplitItemsEO.getId(), newItemId);
+            sarFileSplitItemsEO.setId(newItemId);
+            sarFileSplitItemsEO.setMenuId(menuIdMap.get(sarFileSplitItemsEO.getMenuId()).toString());
+            sarFileSplitItemsEO.setCreationTime(new Date());
+            sarFileSplitItemsEO.setModifyTime(new Date());
+            sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
+            sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
+        }
+        result += sarFileSplitItemsEODao.insertForeach(sarFileSplitItemsEOList);
+        // SAR_FILE_ITEMS_VAL   添加数据，
+        List<SarFileSplitItemsValEO> sarFileSplitItemsValEOList = sarFileSplitItemsValEODao.queryItemsValByMenuId(oldItemIdList);
+        for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) {
+            String newItemValId = UUIDUtils.randomUUID20();
+            itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId);
+            sarFileSplitItemsValEO.setId(newItemValId);
+            sarFileSplitItemsValEO.setItemId(itemIdMap.get(sarFileSplitItemsValEO.getItemId()).toString());
+            sarFileSplitItemsValEO.setCreationTime(new Date());
+            sarFileSplitItemsValEO.setModifyTime(new Date());
+            sarFileSplitItemsValEO.setCreationUser(LoginUserUtil.getUserId());
+            sarFileSplitItemsValEO.setModifyUser(LoginUserUtil.getUserId());
+        }
+        if (sarFileSplitItemsValEOList.size()>0) {
+            result += sarFileSplitItemsValEODao.insertForeach(sarFileSplitItemsValEOList);
+        }
+        // SAR_FILE_ITEMS_PARAMS  添加数据，
+        List<SarFileSplitItemsParamsEO> sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsEODao.queryItemsParamsByMenuId(oldItemIdList);
+        for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) {
+            sarFileSplitItemsParamsEO.setId(UUIDUtils.randomUUID20());
+            sarFileSplitItemsParamsEO.setItemId(itemIdMap.get(sarFileSplitItemsParamsEO.getItemId()).toString());
+            sarFileSplitItemsParamsEO.setCreationTime(new Date());
+            sarFileSplitItemsParamsEO.setModifyTime(new Date());
+        }
+        if (sarFileSplitItemsParamsEOList.size()>0){
+            result += sarFileSplitItemsParamsEODao.insertForeach(sarFileSplitItemsParamsEOList);
+        }
+        return result;
+    }
+
+    @Override
+    public int copyMenuNotChildren(SarFileSplitItemsEO sarFileSplitItemsEO) {
+        int result =0;
+        List<String> oldItemIdList = new ArrayList<>();
+        Map itemValIdMap = new HashMap<>();
+        oldItemIdList.add(sarFileSplitItemsEO.getId());
+
+        sarFileSplitItemsEO = sarFileSplitItemsEODao.selectByPrimaryKey(sarFileSplitItemsEO.getId());
+
+        // 查询该节点下所有的 子节点 并修改排序
+        SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO();
+        sarMenuEO.setId(sarFileSplitItemsEO.getMenuId());
+        List<SarFileSplitMenuEO> sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO);
+        sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId());
+        int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId());
+        SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
+        sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1));
+        sarFileSplitMenuEO.setDisplaySeqEnd(10000L);
+        sarFileSplitMenuEO.setChildrenCount(1L);
+        sarFileSplitMenuEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitMenuEO.setModifyTime(new Date());
+        sarFileSplitMenuEO.setInfoId(sarFileSplitItemsEO.getInfoId());
+        dao.updateDisplaySeqAdd(sarFileSplitMenuEO);
+
+        // SAR_FILE_ITEMS_MENU 添加数据，
+        sarMenuEO.setId(UUIDUtils.randomUUID20());
+        sarMenuEO.setDisplaySeq(Long.valueOf(maxDisplay + 1));
+        sarMenuEO.setCreationTime(new Date());
+        sarMenuEO.setModifyTime(new Date());
+        sarMenuEO.setCreationUser(LoginUserUtil.getUserId());
+        sarMenuEO.setModifyUser(LoginUserUtil.getUserId());
+        result = dao.insertSelective(sarMenuEO);
+
+        // SAR_FILE_ITEMS   添加数据，
+        sarFileSplitItemsEO.setId(UUIDUtils.randomUUID20());
+        sarFileSplitItemsEO.setMenuId(sarMenuEO.getId());
+        sarFileSplitItemsEO.setCreationTime(new Date());
+        sarFileSplitItemsEO.setModifyTime(new Date());
+        sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
+        sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
+        result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO);
+
+        // SAR_FILE_ITEMS_VAL   添加数据，
+        List<SarFileSplitItemsValEO> sarFileSplitItemsValEOList = sarFileSplitItemsValEODao.queryItemsValByMenuId(oldItemIdList);
+        for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) {
+            String newItemValId = UUIDUtils.randomUUID20();
+            itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId);
+            sarFileSplitItemsValEO.setId(newItemValId);
+            sarFileSplitItemsValEO.setItemId(sarFileSplitItemsEO.getId());
+            sarFileSplitItemsValEO.setCreationTime(new Date());
+            sarFileSplitItemsValEO.setModifyTime(new Date());
+            sarFileSplitItemsValEO.setCreationUser(LoginUserUtil.getUserId());
+            sarFileSplitItemsValEO.setModifyUser(LoginUserUtil.getUserId());
+        }
+        if (sarFileSplitItemsValEOList.size()>0) {
+            result += sarFileSplitItemsValEODao.insertForeach(sarFileSplitItemsValEOList);
+        }
+        // SAR_FILE_ITEMS_PARAMS  添加数据，
+        List<SarFileSplitItemsParamsEO> sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsEODao.queryItemsParamsByMenuId(oldItemIdList);
+        for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) {
+            sarFileSplitItemsParamsEO.setId(UUIDUtils.randomUUID20());
+            sarFileSplitItemsParamsEO.setItemId(sarFileSplitItemsEO.getId());
+            sarFileSplitItemsParamsEO.setCreationTime(new Date());
+            sarFileSplitItemsParamsEO.setModifyTime(new Date());
+        }
+        if (sarFileSplitItemsParamsEOList.size()>0){
+            result += sarFileSplitItemsParamsEODao.insertForeach(sarFileSplitItemsParamsEOList);
+        }
+        // SAR_FILE_ITEMS_TABLE  添加数据，
+        List<SarFileSplitItemsTableEO> sarFileSplitItemsTableEOList = sarFileSplitItemsTableEODao.queryItemsTableByMenuId(oldItemIdList);
+        for (SarFileSplitItemsTableEO sarFileSplitItemsTableEO : sarFileSplitItemsTableEOList) {
+            sarFileSplitItemsTableEO.setId(UUIDUtils.randomUUID20());
+            sarFileSplitItemsTableEO.setItemsId(sarFileSplitItemsEO.getId());
+            sarFileSplitItemsTableEO.setItemsValId(itemValIdMap.get(sarFileSplitItemsTableEO.getItemsValId()).toString());
+            sarFileSplitItemsTableEO.setCreationTime(new Date());
+            sarFileSplitItemsTableEO.setModifyTime(new Date());
+            sarFileSplitItemsTableEO.setModifyUser(LoginUserUtil.getUserId());
+        }
+        if (sarFileSplitItemsTableEOList.size()>0){
+            result += sarFileSplitItemsTableEODao.insertForeach(sarFileSplitItemsTableEOList);
+        }
+        return result;
+    }
+
+    @Override
+    public String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO) {
+        sarFileSplitMenuEO.setId(UUIDUtils.randomUUID20());
+        sarFileSplitMenuEO.setValidFlag(0);
+        sarFileSplitMenuEO.setCreationTime(new Date());
+        sarFileSplitMenuEO.setModifyTime(new Date());
+        int count = dao.insertSelective(sarFileSplitMenuEO);
+        // 之后的所有节点序号增加
+        /*SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage();
+        page.setPId(sarFileSplitMenuEO.getPId());
+        List<SarFileSplitMenuEO> getList = dao.queryByList(page);
+        if (getList != null && !getList.isEmpty()) {
+            for(SarFileSplitMenuEO menu : getList){
+                Long olgSeq = menu.getDisplaySeq();
+                if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) {
+                    menu.setDisplaySeq(olgSeq + 1);
+                    dao.updateByPrimaryKeySelective(menu);
+                }
+            }
+        }*/
+        return sarFileSplitMenuEO.getId();
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandAttrDetailsEOServiceImpl.java

@@ -1,14 +1,27 @@
 package com.adc.da.slrs.standardSplit.service.impl;
 
+import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao;
 import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService;
+import com.adc.da.sys.common.SelectionResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class SarStandAttrDetailsEOServiceImpl implements SarStandAttrDetailsEOService {
-    private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(SarStandAttrDetailsEOServiceImpl.class);
+
+    @Autowired
+    private SarStandAttrDetailsEODao sarStandAttrDetailsEODao;
+
+    @Override
+    public List<SelectionResult> selectFileFieldForSel(String attrField){
+        return sarStandAttrDetailsEODao.selectFileFieldForSel(attrField);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java

@@ -1,14 +1,66 @@
 package com.adc.da.slrs.standardSplit.service.impl;
 
+import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao;
+import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao;
+import com.adc.da.slrs.standardSplit.entity.SarStandFileEO;
+import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage;
 import com.adc.da.slrs.standardSplit.service.SarStandFileEOService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
 
 @Service
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class SarStandFileEOServiceImpl implements SarStandFileEOService {
-    private static final Logger logger = LoggerFactory.getLogger(SarLawsInfoEOServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class);
+
+    @Autowired
+    private SarStandFileEODao sarStandFileEODao;
+    @Autowired
+    private SarStandAttrDetailsEODao sarStandAttrDetailsEODao;
+
+    @Override
+    public List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand){
+        return sarStandFileEODao.getStandFileListByPage(stand);
+    }
+
+    @Override
+    public List<SarStandFileEO> queryByPage(SarStandFileEOPage page){
+        return sarStandFileEODao.queryByPage(page);
+    }
+
+    @Override
+    public List<SarStandFileEO> queryByList(SarStandFileEOPage page){
+        return sarStandFileEODao.queryByList(page);
+    }
+
+    @Override
+    public SarStandFileEO selectByPrimaryKey(String id) throws Exception{
+        return sarStandFileEODao.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int insertSelective(SarStandFileEO sarStandFileEO) throws Exception {
+        return sarStandFileEODao.insertSelective(sarStandFileEO);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(SarStandFileEO sarStandFileEO) throws Exception{
+        return sarStandFileEODao.updateByPrimaryKeySelective(sarStandFileEO);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String id) throws Exception{
+        return sarStandFileEODao.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public List<SarStandFileEO> selectFileByAttId(String attId) throws Exception{
+        return sarStandFileEODao.selectFileByAttId(attId);
+    }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandardsInfoEOServiceImpl.java

@@ -0,0 +1,29 @@
+package com.adc.da.slrs.standardSplit.service.impl;
+
+import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardsInfoEO;
+import com.adc.da.slrs.standardSplit.dao.SarStandardsInfoEODao;
+import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarStandardsInfoEOServiceImpl implements SarStandardsInfoEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoEOServiceImpl.class);
+
+    @Autowired
+    private SarStandardsInfoEODao dao;
+
+    @Override
+    public List<SarStandardsInfoEO> selectStandardsByStandnumber(String standNum, String val) {
+        SarStandardsInfoEO sarStandardsInfoEO = new SarStandardsInfoEO();
+        sarStandardsInfoEO.setStandNumber(standNum);
+        sarStandardsInfoEO.setStandType(val);
+        return dao.selectStandardsByStandnumber(sarStandardsInfoEO);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/vo/RecommendVO.java

@@ -0,0 +1,56 @@
+package com.adc.da.slrs.standardSplit.vo;
+
+import com.adc.da.base.entity.BaseEntity;
+
+/**
+ * Created by gaoayn on 2018/9/13 19:29
+ * 用于搜索中心的推荐
+ */
+public class RecommendVO extends BaseEntity {
+
+    private String nameShow;
+    private String numberShow;
+    private String typeShow;
+    private String id;
+    private String module;
+
+    public String getNameShow() {
+        return nameShow;
+    }
+
+    public void setNameShow(String nameShow) {
+        this.nameShow = nameShow;
+    }
+
+    public String getNumberShow() {
+        return numberShow;
+    }
+
+    public void setNumberShow(String numberShow) {
+        this.numberShow = numberShow;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTypeShow() {
+        return typeShow;
+    }
+
+    public void setTypeShow(String typeShow) {
+        this.typeShow = typeShow;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+}

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandAttrDetailsEOMapper.xml

@@ -0,0 +1,354 @@
+<?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.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao" >
+  <!-- Result Map-->
+  <resultMap id="BaseResultMap" type="com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO" >
+    <id column="id" property="id" />
+    <result column="attr_field" property="attrField" />
+    <result column="attr_name" property="attrName" />
+    <result column="attr_type" property="attrType" />
+    <result column="order_num" property="orderNum" />
+    <result column="is_edit" property="isEdit" />
+    <result column="creation_user" property="creationUser" />
+    <result column="valid_flag" property="validFlag" />
+    <result column="creation_time" property="creationTime" />
+    <result column="modify_time" property="modifyTime" />
+    <result column="attr_len" property="attrLen" />
+    <result column="is_must" property="isMust" />
+    <result column="is_show_imp" property="isShowImp" />
+    <result column="show_region_id" property="showRegionId" />
+    <result column="sel_val" property="selVal" />
+    <result column="sar_type" property="sarType" />
+    <result column="is_search" property="isSearch" />
+    <result column="is_warn" property="isWarn" />
+  </resultMap>
+
+  <!-- SAR_STAND_ATTR_DETAILS table all fields -->
+  <sql id="Base_Column_List" >
+     id, attr_field, attr_name, attr_type, order_num, is_edit, creation_user,
+     valid_flag, creation_time, modify_time,
+     attr_len,is_must,is_show_imp,show_region_id,sel_val,sar_type,is_search,is_warn
+  </sql>
+
+    <sql id="Base_Column_List_Show" >
+     SAR_STAND_ATTR_DETAILS.id, attr_field, attr_name, attr_type, SAR_STAND_ATTR_DETAILS.order_num, is_edit, SAR_STAND_ATTR_DETAILS.creation_user,
+     SAR_STAND_ATTR_DETAILS.valid_flag, SAR_STAND_ATTR_DETAILS.creation_time, SAR_STAND_ATTR_DETAILS.modify_time,
+     attr_len,is_must,is_show_imp,show_region_id,sel_val,SAR_STAND_ATTR_DETAILS.sar_type,is_search,is_warn
+  </sql>
+
+  <!-- 查询条件 -->
+  <sql id="Base_Where_Clause">
+    where 1=1 and SAR_STAND_ATTR_DETAILS.valid_flag=0
+    <trim suffixOverrides="," >
+        <if test="isShow != null" >
+            and SAR_STAND_ATTR_DETAILS.is_show_imp = 0
+        </if>
+      <if test="id != null" >
+        and SAR_STAND_ATTR_DETAILS.id ${idOperator} #{id}
+      </if>
+      <if test="attrField != null" >
+        and attr_field ${attrFieldOperator} #{attrField}
+      </if>
+      <if test="attrName != null" >
+        and attr_name ${attrNameOperator} #{attrName}
+      </if>
+      <if test="attrType != null" >
+        and attr_type ${attrTypeOperator} #{attrType}
+      </if>
+      <if test="orderNum != null" >
+        and SAR_STAND_ATTR_DETAILS.order_num ${orderNumOperator} #{orderNum}
+      </if>
+      <if test="isEdit != null" >
+        and is_edit ${isEditOperator} #{isEdit}
+      </if>
+      <if test="creationUser != null" >
+        and SAR_STAND_ATTR_DETAILS.creation_user ${creationUserOperator} #{creationUser}
+      </if>
+      <if test="validFlag != null" >
+        and SAR_STAND_ATTR_DETAILS.valid_flag ${validFlagOperator} #{validFlag}
+      </if>
+      <if test="creationTime != null" >
+        and SAR_STAND_ATTR_DETAILS.creation_time ${creationTimeOperator} #{creationTime}
+      </if>
+      <if test="creationTime1 != null" >
+        and SAR_STAND_ATTR_DETAILS.creation_time &gt;= #{creationTime1}
+      </if>
+      <if test="creationTime2 != null" >
+        and SAR_STAND_ATTR_DETAILS.creation_time &lt;= #{creationTime2}
+      </if>
+      <if test="modifyTime != null" >
+        and SAR_STAND_ATTR_DETAILS.modify_time ${modifyTimeOperator} #{modifyTime}
+      </if>
+      <if test="modifyTime1 != null" >
+        and SAR_STAND_ATTR_DETAILS.modify_time &gt;= #{modifyTime1}
+      </if>
+      <if test="modifyTime2 != null" >
+        and SAR_STAND_ATTR_DETAILS.modify_time &lt;= #{modifyTime2}
+      </if>
+      <if test="attrLen != null" >
+        and attr_len ${attrLenOperator} #{attrLen}
+      </if>
+        <if test="sarType != null" >
+            and SAR_STAND_ATTR_DETAILS.sar_type like concat(concat('%',#{sarType}),'%')
+        </if>
+        <if test="isSearch != null" >
+            and is_search = #{isSearch}
+        </if>
+        <if test="isWarn != null" >
+            and is_warn = #{isWarn}
+        </if>
+        <if test="notId != null" >
+        and SAR_STAND_ATTR_DETAILS.ID != #{notId}
+      </if>
+        <if test="idList != null" >
+            and SAR_STAND_ATTR_DETAILS.ID in
+            <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </trim>
+  </sql>
+
+  <!-- 插入记录 -->
+  <insert id="insert" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO" >
+    <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_SAR_STAND_ATTR_DETAILS.NEXTVAL FROM DUAL
+    </selectKey> -->
+    insert into SAR_STAND_ATTR_DETAILS(<include refid="Base_Column_List" />)
+    values (#{id, jdbcType=VARCHAR}, #{attrField, jdbcType=VARCHAR}, #{attrName, jdbcType=VARCHAR}, #{attrType, jdbcType=VARCHAR}, #{orderNum, jdbcType=VARCHAR}, #{isEdit, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{attrLen, jdbcType=VARCHAR})
+  </insert>
+
+  <!-- 动态插入记录 主键是序列 -->
+  <insert id="insertSelective" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO" >
+        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_SAR_STAND_ATTR_DETAILS.NEXTVAL FROM DUAL
+    </selectKey> -->
+        insert into SAR_STAND_ATTR_DETAILS
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id != null" >id,</if>
+                <if test="attrField != null" >attr_field,</if>
+                <if test="attrName != null" >attr_name,</if>
+                <if test="attrType != null" >attr_type,</if>
+                <if test="orderNum != null" >order_num,</if>
+                <if test="isEdit != null" >is_edit,</if>
+                <if test="creationUser != null" >creation_user,</if>
+                <if test="validFlag != null" >valid_flag,</if>
+                <if test="creationTime != null" >creation_time,</if>
+                <if test="modifyTime != null" >modify_time,</if>
+                <if test="attrLen != null" >attr_len,</if>
+                <if test="isMust != null" >is_must,</if>
+                <if test="isShowImp != null" >is_show_imp,</if>
+                <if test="showRegionId != null" >show_region_id,</if>
+                <if test="selVal != null" >sel_val,</if>
+                <if test="sarType != null" >sar_type,</if>
+                <if test="isSearch != null" >is_search,</if>
+                <if test="isWarn != null" >is_warn,</if>
+            </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+                <if test="id != null" >#{id, jdbcType=VARCHAR},</if>
+                <if test="attrField != null" >#{attrField, jdbcType=VARCHAR},</if>
+                <if test="attrName != null" >#{attrName, jdbcType=VARCHAR},</if>
+                <if test="attrType != null" >#{attrType, jdbcType=VARCHAR},</if>
+                <if test="orderNum != null" >#{orderNum, jdbcType=VARCHAR},</if>
+                <if test="isEdit != null" >#{isEdit, jdbcType=VARCHAR},</if>
+                <if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if>
+                <if test="validFlag != null" >#{validFlag, jdbcType=VARCHAR},</if>
+                <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
+                <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
+                <if test="attrLen != null" >#{attrLen, jdbcType=VARCHAR},</if>
+                <if test="isMust != null" >#{isMust, jdbcType=VARCHAR},</if>
+                <if test="isShowImp != null" >#{isShowImp, jdbcType=VARCHAR},</if>
+                <if test="showRegionId != null" >#{showRegionId, jdbcType=VARCHAR},</if>
+                <if test="selVal != null" >#{selVal, jdbcType=VARCHAR},</if>
+                <if test="sarType != null" >#{sarType, jdbcType=VARCHAR},</if>
+                <if test="isSearch != null" >#{isSearch, jdbcType=VARCHAR},</if>
+                <if test="isWarn != null" >#{isWarn, jdbcType=VARCHAR},</if>
+            </trim>
+  </insert>
+
+  <!-- 根据pk，修改记录-->
+  <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO" >
+    update SAR_STAND_ATTR_DETAILS
+       set  attr_field = #{attrField},
+            attr_name = #{attrName},
+            attr_type = #{attrType},
+            order_num = #{orderNum},
+            is_edit = #{isEdit},
+            creation_user = #{creationUser},
+            valid_flag = #{validFlag},
+            creation_time = #{creationTime},
+            modify_time = #{modifyTime},
+            attr_len = #{attrLen}
+     where  id = #{id}
+  </update>
+
+  <!-- 修改记录，只修改只不为空的字段 -->
+  <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO" >
+    update SAR_STAND_ATTR_DETAILS
+    <set >
+      <if test="attrField != null" >
+        attr_field = #{attrField},
+      </if>
+      <if test="attrName != null" >
+        attr_name = #{attrName},
+      </if>
+      <if test="attrType != null" >
+        attr_type = #{attrType},
+      </if>
+      <if test="orderNum != null" >
+        order_num = #{orderNum},
+      </if>
+      <if test="isEdit != null" >
+        is_edit = #{isEdit},
+      </if>
+      <if test="creationUser != null" >
+        creation_user = #{creationUser},
+      </if>
+      <if test="validFlag != null" >
+        valid_flag = #{validFlag},
+      </if>
+      <if test="creationTime != null" >
+        creation_time = #{creationTime},
+      </if>
+      <if test="modifyTime != null" >
+        modify_time = #{modifyTime},
+      </if>
+      <if test="attrLen != null" >
+        attr_len = #{attrLen},
+      </if>
+        <if test="isMust != null" >
+            is_must = #{isMust},
+        </if>
+        <if test="isShowImp != null" >
+            is_show_imp = #{isShowImp},
+        </if>
+        <if test="showRegionId != null" >
+            show_region_id = #{showRegionId},
+        </if>
+        <if test="selVal != null" >
+            sel_val = #{selVal},
+        </if>
+        <if test="sarType != null" >
+            sar_type = #{sarType},
+        </if>
+        <if test="isSearch != null" >
+            is_search = #{isSearch},
+        </if>
+        <if test="isWarn != null" >
+            is_warn = #{isWarn},
+        </if>
+    </set>
+     where id = #{id}
+  </update>
+
+  <!-- 根据id查询 SAR_STAND_ATTR_DETAILS -->
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+    select <include refid="Base_Column_List" /> 
+      from SAR_STAND_ATTR_DETAILS
+     where id = #{value} and valid_flag=0
+
+  </select>
+
+  <!-- 删除记录 -->
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from SAR_STAND_ATTR_DETAILS
+     where id = #{value} and valid_flag=0
+
+  </delete>
+
+  <!-- SAR_STAND_ATTR_DETAILS 列表总数-->
+  <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
+    select count(1) from SAR_STAND_ATTR_DETAILS
+    <include refid="Base_Where_Clause"/>
+  </select>
+
+  <!-- 查询SAR_STAND_ATTR_DETAILS列表 -->
+  <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+	select <include refid="Base_Column_List" />,areaName from
+		(select tmp_tb.* from
+			(select <include refid="Base_Column_List_Show" />,UT_AREA.area_name as areaName from SAR_STAND_ATTR_DETAILS
+			left join UT_AREA on SAR_STAND_ATTR_DETAILS.show_region_id = UT_AREA.id
+			 <include refid="Base_Where_Clause"/>
+			 order by SAR_STAND_ATTR_DETAILS.order_num,SAR_STAND_ATTR_DETAILS.id
+			) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+  </select>
+
+  <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+    select <include refid="Base_Column_List"/> from SAR_STAND_ATTR_DETAILS
+    <include refid="Base_Where_Clause"/>
+    order by order_num,id
+  </select>
+
+    <update id="deleteByIds" parameterType="java.lang.String" >
+        delete from SAR_STAND_ATTR_DETAILS
+        where id in
+        <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="selectAllFieldToStr" resultType="java.lang.String" parameterType="com.adc.da.base.page.BasePage">
+        SELECT listagg ( attr_field, ',' ) within GROUP ( ORDER BY attr_field )
+        from SAR_STAND_ATTR_DETAILS
+        <include refid="Base_Where_Clause"/>
+        order by order_num,id
+    </select>
+
+    <select id="selectFieldByName" resultMap="BaseResultMap" parameterType="java.lang.String">
+        SELECT <include refid="Base_Column_List" />
+        from SAR_STAND_ATTR_DETAILS
+        where attr_name = #{attrName} and valid_flag=0
+        <if test='sarType != null and sarType == "INLAND_STAND"'>
+            and (sar_type=#{sarType} or sar_type='STAND')
+        </if>
+        <if test='sarType != null and sarType == "FOREIGN_STAND"'>
+            and (sar_type=#{sarType} or sar_type='STAND')
+        </if>
+        <if test='sarType != null and sarType != "FOREIGN_STAND" and sarType != "INLAND_STAND"'>
+            and sar_type=#{sarType}
+        </if>
+        limit 0,1
+    </select>
+
+    <select id="selectFileFieldForSel" resultType="com.adc.da.sys.common.SelectionResult" parameterType="java.lang.String">
+        SELECT attr_field as value, attr_name as label
+        from SAR_STAND_ATTR_DETAILS
+        where valid_flag=0 and attr_type='FILE' and
+        (sar_type='STAND' or sar_type='INLAND_STAND' or sar_type='FOREIGN_STAND')
+        <if test="attrField != null">
+            and attr_field=#{attrField}
+        </if>
+        group by attr_field,attr_name
+    </select>
+
+<!--    标准拆分在用-->
+    <select id="selectFileFieldForSel1" resultType="com.adc.da.sys.common.SelectionResult"
+            parameterType="java.lang.String">
+        SELECT attr_field as value, attr_name as label
+        from SAR_STAND_ATTR_DETAILS
+        where valid_flag=0 and attr_type='FILE' and
+        (sar_type='STAND' or sar_type='INLAND_STAND' or sar_type='FOREIGN_STAND' or SAR_TYPE = 'FOREIGN_LAWS')
+        <if test="attrField != null">
+            and attr_field=#{attrField}
+        </if>
+        group by attr_field,attr_name
+    </select>
+
+
+    <select id="selectNameByField" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT attr_name
+        from SAR_STAND_ATTR_DETAILS
+        where attr_field = #{attrField} and valid_flag=0
+        <if test='sarType != null and sarType == "INLAND_STAND"'>
+            and (sar_type=#{sarType} or sar_type='STAND')
+        </if>
+        <if test='sarType != null and sarType == "FOREIGN_STAND"'>
+            and (sar_type=#{sarType} or sar_type='STAND')
+        </if>
+        <if test='sarType != null and sarType != "FOREIGN_STAND" and sarType != "INLAND_STAND"'>
+            and sar_type=#{sarType}
+        </if>
+        limit 0,1
+    </select>
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml

@@ -0,0 +1,359 @@
+<?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.adc.da.slrs.standardSplit.dao.SarStandFileEODao" >
+  <!-- Result Map-->
+  <resultMap id="BaseResultMap" type="com.adc.da.slrs.standardSplit.entity.SarStandFileEO" >
+      <id column="id" property="id" />
+      <result column="modify_time" property="modifyTime" />
+      <result column="creation_time" property="creationTime" />
+      <result column="valid_flag" property="validFlag" />
+      <result column="use_model" property="useModel" />
+      <result column="att_id" property="attId" />
+      <result column="ori_att_id" property="oriAttId" />
+      <result column="stand_id" property="standId" />
+      <result column="file_suffix" property="fileSuffix" />
+      <result column="file_name" property="fileName" />
+      <result column="stand_file_classify" property="standFileClassify" />
+      <result column="password" property="password" />
+      <result column="creation_user" property="creationUser" />
+      <result column="resId" property="resId" />
+      <result column="standNumber" property="standNumber" />
+      <result column="standName" property="standName" />
+      <result column="sarType" property="sarType" />
+  </resultMap>
+
+  <!-- SAR_STAND_FILE table all fields -->
+  <sql id="Base_Column_List" >
+     modify_time, creation_time, valid_flag, use_model, att_id, stand_id, id,file_suffix,file_name,stand_file_classify,
+     password,creation_user,ori_att_id
+  </sql>
+
+  <!-- 查询条件 -->
+  <sql id="Base_Where_Clause">
+    where 1=1
+    <trim suffixOverrides="," >
+      <if test="modifyTime != null" >
+        and modify_time ${modifyTimeOperator} #{modifyTime}
+      </if>
+      <if test="modifyTime1 != null" >
+        and modify_time &gt;= #{modifyTime1}
+      </if>
+      <if test="modifyTime2 != null" >
+        and modify_time &lt;= #{modifyTime2}
+      </if>
+      <if test="creationTime != null" >
+        and creation_time ${creationTimeOperator} #{creationTime}
+      </if>
+      <if test="creationTime1 != null" >
+        and creation_time &gt;= #{creationTime1}
+      </if>
+      <if test="creationTime2 != null" >
+        and creation_time &lt;= #{creationTime2}
+      </if>
+      <if test="validFlag != null" >
+        and valid_flag ${validFlagOperator} #{validFlag}
+      </if>
+      <if test="useModel != null" >
+        and use_model ${useModelOperator} #{useModel}
+      </if>
+      <if test="attId != null" >
+        and att_id ${attIdOperator} #{attId}
+      </if>
+      <if test="standId != null" >
+        and stand_id ${standIdOperator} #{standId}
+      </if>
+      <if test="id != null" >
+        and id ${idOperator} #{id}
+      </if>
+    </trim>
+  </sql>
+
+  <!-- 插入记录 -->
+  <insert id="insert" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandFileEO" >
+    <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_SAR_STAND_FILE.NEXTVAL FROM DUAL
+    </selectKey> -->
+    insert into SAR_STAND_FILE(<include refid="Base_Column_List" />)
+    values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER},
+    #{useModel, jdbcType=VARCHAR}, #{attId, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR},
+    #{id, jdbcType=VARCHAR},#{fileSuffix, jdbcType=VARCHAR},#{fileName, jdbcType=VARCHAR},#{standFileClassify, jdbcType=VARCHAR},
+      #{password, jdbcType=VARCHAR},#{creationUser, jdbcType=VARCHAR})
+  </insert>
+
+  <!-- 动态插入记录 主键是序列 -->
+  <insert id="insertSelective" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandFileEO" >
+        insert into SAR_STAND_FILE
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="modifyTime != null" >modify_time,</if>
+                <if test="creationTime != null" >creation_time,</if>
+                <if test="validFlag != null" >valid_flag,</if>
+                <if test="useModel != null" >use_model,</if>
+                <if test="attId != null" >att_id,</if>
+                <if test="standId != null" >stand_id,</if>
+                <if test="id != null" >id,</if>
+                <if test="fileSuffix != null" >file_suffix,</if>
+                <if test="fileName != null" >file_name,</if>
+                <if test="standFileClassify != null" >stand_file_classify,</if>
+                <if test="password != null" >password,</if>
+                <if test="creationUser != null" >creation_user,</if>
+                <if test="oriAttId != null" >ori_att_id,</if>
+            </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+                <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
+                <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
+                <if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
+                <if test="useModel != null" >#{useModel, jdbcType=VARCHAR},</if>
+                <if test="attId != null" >#{attId, jdbcType=VARCHAR},</if>
+                <if test="standId != null" >#{standId, jdbcType=VARCHAR},</if>
+                <if test="id != null" >#{id, jdbcType=VARCHAR},</if>
+                <if test="fileSuffix != null" >#{fileSuffix, jdbcType=VARCHAR},</if>
+                <if test="fileName != null" >#{fileName, jdbcType=VARCHAR},</if>
+                <if test="standFileClassify != null" >#{standFileClassify, jdbcType=VARCHAR},</if>
+                <if test="password != null" >#{password, jdbcType=VARCHAR},</if>
+                <if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if>
+                <if test="oriAttId != null" >#{oriAttId, jdbcType=VARCHAR},</if>
+            </trim>
+  </insert>
+
+  <!-- 修改记录，只修改只不为空的字段 -->
+  <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandFileEO" >
+    update SAR_STAND_FILE
+    <set >
+        <if test="oriAttId != null" >
+            ori_att_id = #{oriAttId},
+        </if>
+      <if test="modifyTime != null" >
+        modify_time = #{modifyTime},
+      </if>
+      <if test="creationTime != null" >
+        creation_time = #{creationTime},
+      </if>
+      <if test="validFlag != null" >
+        valid_flag = #{validFlag},
+      </if>
+      <if test="useModel != null" >
+        use_model = #{useModel},
+      </if>
+      <if test="attId != null" >
+        att_id = #{attId},
+      </if>
+      <if test="standId != null" >
+        stand_id = #{standId},
+      </if>
+    </set>
+     where id = #{id}
+  </update>
+
+  <!-- 根据id查询 SAR_STAND_FILE -->
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+    select <include refid="Base_Column_List" /> 
+      from SAR_STAND_FILE
+     where id = #{value} and valid_flag=0
+
+  </select>
+
+  <!-- 删除记录 -->
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from SAR_STAND_FILE
+     where id = #{value}
+
+  </delete>
+
+  <!-- SAR_STAND_FILE 列表总数-->
+  <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
+    select count(1) from SAR_STAND_FILE
+    <include refid="Base_Where_Clause"/>
+  </select>
+
+  <!-- 查询SAR_STAND_FILE列表 -->
+  <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+	select <include refid="Base_Column_List" /> from
+		(select tmp_tb.*  from
+			(select <include refid="Base_Column_List" /> from SAR_STAND_FILE
+			 <include refid="Base_Where_Clause"/>
+			 <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+			 	${pager.orderCondition}
+			 </if>
+			) tmp_tb limit ${pager.startIndex-1},${pageSize}}) a
+  </select>
+
+  <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+    select <include refid="Base_Column_List"/> from SAR_STAND_FILE
+    <include refid="Base_Where_Clause"/>
+    <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+       ${pager.orderCondition}
+    </if>
+  </select>
+
+    <select id="selectFileByStandId" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select <include refid="Base_Column_List" />
+        from SAR_STAND_FILE
+        where stand_id = #{value} and valid_flag = 0
+    </select>
+
+    <select id="selectFileByAttId" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select <include refid="Base_Column_List" />
+        from SAR_STAND_FILE
+        where valid_flag = 0
+        and stand_id = (
+        select stand_id
+        from SAR_STAND_FILE
+        where att_id = #{value} and valid_flag = 0 and use_model = 'SOURCE_FILE'
+        limit 0,1
+        )
+        and use_model = 'WEB_FILE'
+        and ori_att_id = #{value}
+        order by modify_time desc
+    </select>
+
+    <!--        gaoyan  根据resid 查询 -->
+    <select id="selectFileByResId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandFileEO">
+        select <include refid="Base_Column_List" />
+        from SAR_STAND_FILE
+        where use_model = 'SOURCE_FILE'
+    </select>
+
+    <select id="selectFileMsgByAttId" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select <include refid="Base_Column_List" />
+        from SAR_STAND_FILE
+        where valid_flag = 0
+        and att_id = #{value}
+    </select>
+
+    <select id="selectFileByStandIdAndId" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandFileEO">
+        select <include refid="Base_Column_List" />
+        from SAR_STAND_FILE
+        where valid_flag = 0
+        <if test="standId != null" >
+            and stand_id = #{standId}
+        </if>
+        <if test="idlist != null">
+            and id not in
+            <foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <delete id="deleteByStandId" parameterType="java.lang.String">
+    delete from SAR_STAND_FILE
+     where stand_id = #{value}
+
+  </delete>
+
+    <insert id="insertForeach" parameterType="java.util.List">
+            insert into SAR_STAND_FILE
+            (<include refid="Base_Column_List" />)
+            values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.modifyTime, jdbcType=TIMESTAMP},
+            #{item.creationTime, jdbcType=TIMESTAMP},
+            #{item.validFlag, jdbcType=INTEGER},
+            #{item.useModel, jdbcType=VARCHAR},
+            #{item.attId, jdbcType=VARCHAR},
+            #{item.standId, jdbcType=VARCHAR},
+            #{item.id, jdbcType=VARCHAR},
+            #{item.fileSuffix, jdbcType=VARCHAR},
+            #{item.fileName, jdbcType=VARCHAR},
+            #{item.standFileClassify, jdbcType=VARCHAR},
+            #{item.password, jdbcType=VARCHAR},
+            #{item.creationUser, jdbcType=VARCHAR},
+            #{item.oriAttId, jdbcType=VARCHAR})
+        </foreach>
+    </insert>
+
+    <select id="getStandFileListByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+        select * from
+        (select tmp_tb.* from
+        (
+        SELECT
+        SAR_STAND_FILE.id AS resId,
+        SAR_STAND_FILE.stand_id,
+        SAR_STAND_FILE.STAND_FILE_CLASSIFY,
+        SAR_STAND_FILE.file_name,
+        (
+        if(
+        SAR_STANDARDS_INFO.STAND_YEAR='',
+        CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
+        CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
+        ) ) AS standNumber,
+        SAR_STANDARDS_INFO.stand_name as standName,
+        SAR_STAND_FILE.att_id AS attId,
+        SAR_STANDARDS_INFO.STAND_TYPE as sarType
+        FROM
+        SAR_STAND_FILE
+        LEFT JOIN SAR_STANDARDS_INFO ON ( SAR_STAND_FILE.STAND_ID = SAR_STANDARDS_INFO.ID AND SAR_STANDARDS_INFO.VALID_FLAG = 0 )
+        where SAR_STANDARDS_INFO.VALID_FLAG =0 and SAR_STAND_FILE.VALID_FLAG =0
+        <if test="fileSuffixList != null">
+            and SAR_STAND_FILE.file_suffix in
+            <foreach collection="fileSuffixList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="standNumber != null">
+            and
+            if(
+            SAR_STANDARDS_INFO.STAND_YEAR='',
+            CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
+            CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
+            ) like concat(concat('%',#{standNumber}),'%')
+        </if>
+        <if test="standName != null">
+            and SAR_STANDARDS_INFO.stand_name like concat(concat ('%',#{standName}),'%')
+        </if>
+        <if test="standFileClassify != null">
+            and SAR_STAND_FILE.STAND_FILE_CLASSIFY = #{standFileClassify}
+        </if>
+        <if test="fileType != null">
+            and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType}
+        </if>
+        order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id
+        )  tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+    </select>
+
+    <select id="queryStandFileListByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
+        select count(1) from (
+        SELECT
+        SAR_STAND_FILE.id AS resId,
+        SAR_STAND_FILE.stand_id,
+        SAR_STAND_FILE.STAND_FILE_CLASSIFY,
+        SAR_STAND_FILE.file_name,
+        (
+        if(
+        SAR_STANDARDS_INFO.STAND_YEAR='',
+        CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
+        CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
+        ) ) AS standNumber,
+        SAR_STANDARDS_INFO.stand_name as standName,
+        SAR_STAND_FILE.att_id AS attId,
+        SAR_STANDARDS_INFO.STAND_TYPE as sarType
+        FROM
+        SAR_STAND_FILE
+        LEFT JOIN SAR_STANDARDS_INFO ON ( SAR_STAND_FILE.STAND_ID = SAR_STANDARDS_INFO.ID AND SAR_STANDARDS_INFO.VALID_FLAG = 0 )
+        where SAR_STANDARDS_INFO.VALID_FLAG =0 and SAR_STAND_FILE.VALID_FLAG =0
+        <if test="fileSuffixList != null">
+            and SAR_STAND_FILE.file_suffix in
+            <foreach collection="fileSuffixList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="standNumber != null">
+            and if(
+            SAR_STANDARDS_INFO.STAND_YEAR='',
+            CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
+            CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
+            ) like concat(concat('%',#{standNumber}),'%')
+        </if>
+        <if test="standName != null">
+            and SAR_STANDARDS_INFO.stand_name like concat(concat ('%',#{standName}),'%')
+        </if>
+        <if test="standFileClassify != null">
+            and SAR_STAND_FILE.STAND_FILE_CLASSIFY = #{standFileClassify}
+        </if>
+        <if test="fileType != null">
+            and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType}
+        </if>
+        ) r
+    </select>
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandardsInfoEOMapper.xml

@@ -0,0 +1,844 @@
+<?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.adc.da.slrs.standardSplit.dao.SarStandardsInfoEODao" >
+  <!-- Result Map-->
+  <resultMap id="BaseResultMap" type="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO" >
+    <id column="id" property="id" />
+    <result column="stand_type" property="standType" />
+    <result column="country" property="country" />
+    <result column="stand_sort" property="standSort" />
+    <result column="stand_number" property="standNumber" />
+    <result column="stand_year" property="standYear" />
+    <result column="stand_name" property="standName" />
+    <result column="stand_en_name" property="standEnName" />
+    <result column="stand_state" property="standState" />
+    <result column="stand_nature" property="standNature" />
+    <result column="issue_time" property="issueTime" />
+    <result column="put_time" property="putTime" />
+    <result column="synopsis" property="synopsis" />
+    <result column="replace_stand_num" property="replaceStandNum" />
+    <result column="replaced_stand_num" property="replacedStandNum" />
+    <result column="creation_user" property="creationUser" />
+    <result column="valid_flag" property="validFlag" />
+    <result column="creation_time" property="creationTime" />
+    <result column="modify_time" property="modifyTime" />
+    <result column="newCarPutTime" property="newCarPutTime" />
+    <result column="is_relate_access" property="isRelateAccess" />
+      <result column="cite_stand" property="citeStand" />
+      <result column="cited_stand" property="citedStand" />
+      <result column="allPutTime" property="allPutTime" />
+  </resultMap>
+
+    <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        <result column="is_relate_access" property="isRelateAccess" />
+        <result column="synopsis" property="synopsis"/>
+        <result column="put_time" property="putTime"/>
+        <result column="issue_time" property="issueTime"/>
+        <result column="replaced_stand_num" property="replacedStandNum"/>
+        <result column="replace_stand_num" property="replaceStandNum"/>
+        <result column="stand_en_name" property="standEnName"/>
+        <result column="stand_name" property="standName"/>
+        <result column="stand_year" property="standYear"/>
+        <result column="stand_number" property="standNumber"/>
+        <result column="id" property="id"/>
+    </resultMap>
+
+  <!-- SAR_STANDARDS_INFO table all fields -->
+  <sql id="Base_Column_List" >
+     SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort,
+     SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
+     SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
+     SAR_STANDARDS_INFO.synopsis, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
+     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand
+  </sql>
+
+    <sql id="Base_Column_List_Show" >
+     SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort,
+     SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
+     SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
+     concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
+     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow,
+     dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand
+  </sql>
+
+    <sql id="Group_Column_List_Show">
+     SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort,
+     SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
+     SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
+     concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
+     SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME,
+     dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand
+  </sql>
+
+  <!-- 查询条件 -->
+  <sql id="Base_Where_Clause">
+    where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
+    <trim suffixOverrides="," >
+      <if test="id != null" >
+        and id ${idOperator} #{id}
+      </if>
+      <if test="standType != null" >
+        and stand_type ${standTypeOperator} #{standType}
+      </if>
+      <if test="country != null" >
+        and country ${countryOperator} #{country}
+      </if>
+      <if test="standSort != null" >
+        and stand_sort ${standSortOperator} #{standSort}
+      </if>
+      <if test="standNumber != null" >
+        and stand_number ${standNumberOperator} #{standNumber}
+      </if>
+      <if test="standYear != null" >
+        and stand_year ${standYearOperator} #{standYear}
+      </if>
+      <if test="standName != null" >
+        and stand_name ${standNameOperator} #{standName}
+      </if>
+      <if test="standEnName != null" >
+        and stand_en_name ${standEnNameOperator} #{standEnName}
+      </if>
+      <if test="standState != null" >
+        and stand_state ${standStateOperator} #{standState}
+      </if>
+      <if test="standNature != null" >
+        and stand_nature ${standNatureOperator} #{standNature}
+      </if>
+      <if test="issueTime != null" >
+        and issue_time ${issueTimeOperator} #{issueTime}
+      </if>
+      <if test="issueTime1 != null" >
+        and issue_time &gt;= #{issueTime1}
+      </if>
+      <if test="issueTime2 != null" >
+        and issue_time &lt;= #{issueTime2}
+      </if>
+      <if test="putTime != null" >
+        and put_time ${putTimeOperator} #{putTime}
+      </if>
+      <if test="putTime1 != null" >
+        and put_time &gt;= #{putTime1}
+      </if>
+      <if test="putTime2 != null" >
+        and put_time &lt;= #{putTime2}
+      </if>
+      <if test="synopsis != null" >
+        and synopsis ${synopsisOperator} #{synopsis}
+      </if>
+      <if test="replaceStandNum != null" >
+        and replace_stand_num ${replaceStandNumOperator} #{replaceStandNum}
+      </if>
+      <if test="replacedStandNum != null" >
+        and replaced_stand_num ${replacedStandNumOperator} #{replacedStandNum}
+      </if>
+      <if test="creationUser != null" >
+        and creation_user ${creationUserOperator} #{creationUser}
+      </if>
+      <if test="validFlag != null" >
+        and valid_flag ${validFlagOperator} #{validFlag}
+      </if>
+      <if test="creationTime != null" >
+        and creation_time ${creationTimeOperator} #{creationTime}
+      </if>
+      <if test="creationTime1 != null" >
+        and creation_time &gt;= #{creationTime1}
+      </if>
+      <if test="creationTime2 != null" >
+        and creation_time &lt;= #{creationTime2}
+      </if>
+      <if test="modifyTime != null" >
+        and modify_time ${modifyTimeOperator} #{modifyTime}
+      </if>
+      <if test="modifyTime1 != null" >
+        and modify_time &gt;= #{modifyTime1}
+      </if>
+      <if test="modifyTime2 != null" >
+        and modify_time &lt;= #{modifyTime2}
+      </if>
+        <if test="isRelateAccess != null" >
+        and is_relate_access = #{isRelateAccess}
+      </if>
+    </trim>
+  </sql>
+
+  <!-- 插入记录 -->
+  <insert id="insert" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO" >
+    insert into SAR_STANDARDS_INFO(<include refid="Base_Column_List" />)
+    values (#{id, jdbcType=VARCHAR}, #{standType, jdbcType=VARCHAR}, #{country, jdbcType=VARCHAR}, #{standSort, jdbcType=VARCHAR}, #{standNumber, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, #{standName, jdbcType=VARCHAR}, #{standEnName, jdbcType=VARCHAR}, #{standState, jdbcType=VARCHAR}, #{standNature, jdbcType=VARCHAR}, #{issueTime, jdbcType=TIMESTAMP}, #{putTime, jdbcType=TIMESTAMP}, #{synopsis, jdbcType=CLOB}, #{replaceStandNum, jdbcType=CLOB}, #{replacedStandNum, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP})
+  </insert>
+
+  <!-- 动态插入记录 主键是序列 -->
+  <insert id="insertSelective" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO" >
+        insert into SAR_STANDARDS_INFO
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id != null" >id,</if>
+                <if test="standType != null" >stand_type,</if>
+                <if test="country != null" >country,</if>
+                <if test="standSort != null" >stand_sort,</if>
+                <if test="standNumber != null" >stand_number,</if>
+                <if test="standYear != null" >stand_year,</if>
+                <if test="standName != null" >stand_name,</if>
+                <if test="standEnName != null" >stand_en_name,</if>
+                <if test="standState != null" >stand_state,</if>
+                <if test="standNature != null" >stand_nature,</if>
+                <if test="issueTime != null" >issue_time,</if>
+                <if test="putTime != null" >put_time,</if>
+                <if test="synopsis != null" >synopsis,</if>
+                <if test="replaceStandNum != null" >replace_stand_num,</if>
+                <if test="replacedStandNum != null" >replaced_stand_num,</if>
+                <if test="creationUser != null" >creation_user,</if>
+                <if test="validFlag != null" >valid_flag,</if>
+                <if test="creationTime != null" >creation_time,</if>
+                <if test="modifyTime != null" >modify_time,</if>
+                <if test="isRelateAccess != null" >is_relate_access,</if>
+                <if test="citeStand != null" >cite_stand,</if>
+                <if test="citedStand != null" >cited_stand,</if>
+            </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+                <if test="id != null" >#{id, jdbcType=VARCHAR},</if>
+                <if test="standType != null" >#{standType, jdbcType=VARCHAR},</if>
+                <if test="country != null" >#{country, jdbcType=VARCHAR},</if>
+                <if test="standSort != null" >#{standSort, jdbcType=VARCHAR},</if>
+                <if test="standNumber != null" >#{standNumber, jdbcType=VARCHAR},</if>
+                <if test="standYear != null" >#{standYear, jdbcType=VARCHAR},</if>
+                <if test="standName != null" >#{standName, jdbcType=VARCHAR},</if>
+                <if test="standEnName != null" >#{standEnName, jdbcType=VARCHAR},</if>
+                <if test="standState != null" >#{standState, jdbcType=VARCHAR},</if>
+                <if test="standNature != null" >#{standNature, jdbcType=VARCHAR},</if>
+                <if test="issueTime != null" >#{issueTime, jdbcType=VARCHAR},</if>
+                <if test="putTime != null" >#{putTime, jdbcType=TIMESTAMP},</if>
+                <if test="synopsis != null" >#{synopsis, jdbcType=CLOB},</if>
+                <if test="replaceStandNum != null" >#{replaceStandNum, jdbcType=CLOB},</if>
+                <if test="replacedStandNum != null" >#{replacedStandNum, jdbcType=VARCHAR},</if>
+                <if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if>
+                <if test="validFlag != null" >#{validFlag, jdbcType=VARCHAR},</if>
+                <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
+                <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
+                <if test="isRelateAccess != null" >#{isRelateAccess, jdbcType=VARCHAR},</if>
+                <if test="citeStand != null" >#{citeStand, jdbcType=VARCHAR},</if>
+                <if test="citedStand != null" >#{citedStand, jdbcType=VARCHAR},</if>
+            </trim>
+  </insert>
+
+  <!-- 根据pk，修改记录-->
+  <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO" >
+    update SAR_STANDARDS_INFO
+       set  stand_type = #{standType},
+            country = #{country},
+            stand_sort = #{standSort},
+            stand_number = #{standNumber},
+            stand_year = #{standYear},
+            stand_name = #{standName},
+            stand_en_name = #{standEnName},
+            stand_state = #{standState},
+            stand_nature = #{standNature},
+            issue_time = #{issueTime},
+            put_time = #{putTime},
+            synopsis = #{synopsis},
+            replace_stand_num = #{replaceStandNum},
+            replaced_stand_num = #{replacedStandNum},
+            creation_user = #{creationUser},
+            valid_flag = #{validFlag},
+            creation_time = #{creationTime},
+            modify_time = #{modifyTime}
+     where  id = #{id}
+  </update>
+
+  <!-- 修改记录，只修改只不为空的字段 -->
+  <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO" >
+    update SAR_STANDARDS_INFO
+    <set >
+      <if test="standType != null" >
+        stand_type = #{standType},
+      </if>
+      <if test="country != null" >
+        country = #{country},
+      </if>
+      <if test="standSort != null" >
+        stand_sort = #{standSort},
+      </if>
+      <if test="standNumber != null" >
+        stand_number = #{standNumber},
+      </if>
+      <if test="standYear != null" >
+        stand_year = #{standYear},
+      </if>
+      <if test="standName != null" >
+        stand_name = #{standName},
+      </if>
+      <if test="standEnName != null" >
+        stand_en_name = #{standEnName},
+      </if>
+      <if test="standState != null" >
+        stand_state = #{standState},
+      </if>
+      <if test="standNature != null" >
+        stand_nature = #{standNature},
+      </if>
+      <if test="issueTime != null" >
+        issue_time = #{issueTime},
+      </if>
+      <if test="putTime != null" >
+        put_time = #{putTime},
+      </if>
+      <if test="synopsis != null" >
+        synopsis = #{synopsis},
+      </if>
+      <if test="replaceStandNum != null" >
+        replace_stand_num = #{replaceStandNum},
+      </if>
+      <if test="replacedStandNum != null" >
+        replaced_stand_num = #{replacedStandNum},
+      </if>
+      <if test="creationUser != null" >
+        creation_user = #{creationUser},
+      </if>
+      <if test="validFlag != null" >
+        valid_flag = #{validFlag},
+      </if>
+      <if test="creationTime != null" >
+        creation_time = #{creationTime},
+      </if>
+      <if test="modifyTime != null" >
+        modify_time = #{modifyTime},
+      </if>
+        <if test="isRelateAccess != null" >
+            is_relate_access = #{isRelateAccess},
+        </if>
+        <if test="citeStand != null" >
+            cite_stand = #{citeStand},
+        </if>
+        <if test="citedStand != null" >
+            cited_stand = #{citedStand},
+        </if>
+    </set>
+     where id = #{id}
+  </update>
+
+  <!-- 根据id查询 SAR_STANDARDS_INFO -->
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+    select <include refid="Base_Column_List" />
+      from SAR_STANDARDS_INFO
+     where id = #{value}
+
+  </select>
+
+  <!-- 删除记录 -->
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from SAR_STANDARDS_INFO
+     where id = #{value}
+
+  </delete>
+
+  <!-- SAR_STANDARDS_INFO 列表总数-->
+  <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
+    select count(1) from SAR_STANDARDS_INFO
+    <include refid="Base_Where_Clause"/>
+  </select>
+
+  <!-- 查询SAR_STANDARDS_INFO列表 -->
+  <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+	select <include refid="Base_Column_List" /> from
+		(select tmp_tb.* from
+			(select <include refid="Base_Column_List" /> from SAR_STANDARDS_INFO
+			 <include refid="Base_Where_Clause"/>
+			 <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+			 	${pager.orderCondition}
+			 </if>
+			) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+  </select>
+
+  <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
+    select <include refid="Base_Column_List"/> from SAR_STANDARDS_INFO
+    <include refid="Base_Where_Clause"/>
+    <if test="pager.orderCondition != null and pager.orderCondition != ''" >
+       ${pager.orderCondition}
+    </if>
+  </select>
+
+    <sql id="SarStandardsInfo_Where_Clause">
+        left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is
+        not null and dicountry.valid_flag = 0)
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
+        dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
+        left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0)
+        where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
+        <trim suffixOverrides=",">
+            <!-- 标准分类 国内标准，国外标准  必要搜索项                 -->
+            <if test='standType != null and standType != "ALL"'>
+                and stand_type = #{standType}
+            </if>
+            <!--                     基本搜索项                         -->
+            <!-- 国家、地区 -->
+            <if test="country != null">
+                and country = #{country}
+            </if>
+            <!-- 标准编号 -->
+            <if test="standNumber != null and isNumYear == null">
+                and (
+                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
+                and SAR_STANDARDS_INFO.STAND_YEAR = '')
+                or (stand_name like concat(concat('%',#{standNumber}),'%'))
+                )
+            </if>
+--             精准查询时使用
+            <if test="standNumber != null and isNumYear != null">
+                and (
+                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR) = #{standNumber} and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = #{standNumber}
+                and SAR_STANDARDS_INFO.STAND_YEAR = '')
+                or (stand_name = #{standNumber}
+                )
+            </if>
+
+            <!-- 标准名称 -->
+            <if test="standName != null">
+                and stand_name like concat(concat('%',#{standName}),'%')
+            </if>
+            <if test="standEnName != null">
+                and stand_en_name like concat(concat('%',#{standEnName}),'%')
+            </if>
+            <!-- 标准状态 -->
+            <if test="standState != null">
+                and stand_state = #{standState}
+            </if>
+            <!--                   高级检索项                          -->
+            <!--  标准性质 -->
+            <if test="standNature != null">
+                and stand_nature = #{standNature}
+            </if>
+            <!--  代替标准  允许输入的时候输入多个-->
+            <if test="replaceStandNum != null">
+                and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
+            </if>
+            <!--  被代替标准 -->
+            <if test="replacedStandNum != null">
+                and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%')
+            </if>
+            <!--  目录判断 -->
+            <if test="menuId != null and menuId !='nomenu' and menuAllChildrenIdList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
+            </if>
+            <!-- 游离态标准查询 -->
+            <!-- <if test="menuId != null and menuId =='nomenu' and standType =='INLAND'">
+                and SAR_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide
+                ='INLAND_STAND')
+                &lt;!&ndash;-查询游离态标准，编号和名称是分开的 &ndash;&gt;
+                <if test="standNumber != null">
+                    and ((concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                    SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
+                    or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
+                    and SAR_STANDARDS_INFO.STAND_YEAR is null))
+                </if>
+            </if>
+            <if test="menuId != null and menuId =='nomenu' and standType =='FOREIGN'">
+                and SAR_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide
+                ='FOREIGN_STAND')
+                <if test="standNumber != null">
+                    and ((concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                    SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
+                    or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
+                    and SAR_STANDARDS_INFO.STAND_YEAR is null))
+                </if>
+            </if> -->
+            <!--  当第一次进入页面未选择记录时-->
+<!--            <if test="(menuId == null or menuId =='') and standType =='INLAND'">-->
+<!--                and SAR_STAND_MENU.MENU_ID in (-->
+<!--                select SAR_MENU.id from SAR_MENU start with id=(select SAR_MENU.id from SAR_MENU WHERE parent_id is null-->
+<!--                and sor_divide-->
+<!--                ='INLAND_STAND') connect by prior id= parent_id-->
+<!--                )-->
+<!--            </if>-->
+            <!--  新修改需求，根据角色查询有权限的菜单数据-->
+            <if test="menuRoleList != null">
+                and SAR_STAND_MENU.MENU_ID in
+                <foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+<!--            <if test="(menuId == null or menuId =='') and standType =='FOREIGN'">-->
+<!--                and SAR_STAND_MENU.MENU_ID in (-->
+<!--                select SAR_MENU.id from SAR_MENU start with id=(select SAR_MENU.id from SAR_MENU WHERE parent_id is null-->
+<!--                and sor_divide-->
+<!--                ='FOREIGN_STAND') connect by prior id= parent_id-->
+<!--                )-->
+<!--            </if>-->
+            <!-- 导出数据过程中，选择的id -->
+            <if test="idlist != null">
+                and SAR_STANDARDS_INFO.id in
+                <foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="standSort != null" >
+                and SAR_STANDARDS_INFO.stand_sort = #{standSort}
+            </if>
+            <!--内容摘要-->
+            <if test="synopsis != null" >
+                AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0
+            </if>
+            <if test="collectMenuId != null">
+                and SAR_STANDARDS_INFO.id in (
+                select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
+                and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+                and TS_PERSON_COLLECT.user_id=#{userId}
+                )
+            </if>
+            <if test='labelMenuId != null and labelMenuId == "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ is not null
+            </if>
+            <if test='labelMenuId != null and labelMenuId != "gxhbq"'>
+                and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%')
+            </if>
+            <if test="applyArctic != null">
+                and SAR_STAND_ATTR_INFO.SYCLLX = #{applyArctic}
+            </if>
+            <if test="isRelateAccess != null" >
+                and is_relate_access = #{isRelateAccess}
+            </if>
+            <if test="advanceSearchStr != null">
+                and (${advanceSearchStr})
+            </if>
+        </trim>
+    </sql>
+
+<!--    分页查询-->
+    <select id="getSarStandardsInfoPage" resultMap="BaseResultMap"
+            parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select * from
+        (select tmp_tb.*  from
+        (select
+        <include refid="Base_Column_List_Show"/>,SAR_STAND_ATTR_INFO.CHJL AS CHJL,
+        (case WHEN dicstandState.DIC_TYPE_NAME = '草稿' THEN 1
+        WHEN dicstandState.DIC_TYPE_NAME = '征求意见稿' THEN 2
+        WHEN dicstandState.DIC_TYPE_NAME = '送审稿' THEN 3
+        WHEN dicstandState.DIC_TYPE_NAME = '报批稿' THEN 4
+        WHEN dicstandState.DIC_TYPE_NAME = '发布稿' THEN 5
+        WHEN dicstandState.DIC_TYPE_NAME = '已实施' THEN 6
+        WHEN dicstandState.DIC_TYPE_NAME = '计划修订' THEN 7
+        WHEN dicstandState.DIC_TYPE_NAME = '修订中' THEN 8
+        WHEN dicstandState.DIC_TYPE_NAME = '已修订' THEN 9
+        WHEN dicstandState.DIC_TYPE_NAME = '已作废' THEN 10
+        WHEN dicstandState.DIC_TYPE_NAME IS NULL THEN 11
+        WHEN dicstandState.DIC_TYPE_NAME ='' THEN 11
+        END) AS paixu,
+        (
+        CASE
+        WHEN ZCCSSRQ = 'TBD' THEN '6999-01-01'
+        WHEN ZCCSSRQ = '已发布' THEN '7000-01-01'
+        WHEN ZCCSSRQ = '已实施' THEN '7999-01-01'
+        WHEN ZCCSSRQ = 'N/A' THEN '8999-01-01'
+        WHEN ZCCSSRQ IS NULL THEN '9999-01-01'
+        WHEN ZCCSSRQ ='' THEN '9999-01-01'
+        ELSE ZCCSSRQ
+        END
+        ) AS ZCCSSRQPAIXU,
+        (
+        CASE
+        WHEN XCXSSRQ = 'TBD' THEN '6999-01-01'
+        WHEN XCXSSRQ = '已发布' THEN '7000-01-01'
+        WHEN XCXSSRQ = '已实施' THEN '7999-01-01'
+        WHEN XCXSSRQ = 'N/A' THEN '8999-01-01'
+        WHEN XCXSSRQ IS NULL THEN '9999-01-01'
+        WHEN XCXSSRQ ='' THEN '9999-01-01'
+        ELSE XCXSSRQ
+        END
+        ) AS XCXSSRQPAIXU,
+        (
+        CASE
+        WHEN SAR_STANDARDS_INFO.issue_time = 'TBD' THEN '6999-01-01'
+        WHEN SAR_STANDARDS_INFO.issue_time = '已发布' THEN '7000-01-01'
+        WHEN SAR_STANDARDS_INFO.issue_time = '已实施' THEN '7999-01-01'
+        WHEN SAR_STANDARDS_INFO.issue_time = 'N/A' THEN '8999-01-01'
+        WHEN SAR_STANDARDS_INFO.issue_time IS NULL THEN '9999-01-01'
+        WHEN SAR_STANDARDS_INFO.issue_time ='' THEN '9999-01-01'
+        ELSE SAR_STANDARDS_INFO.issue_time
+        END
+        ) AS issueTime
+        from SAR_STANDARDS_INFO
+        <include refid="SarStandardsInfo_Where_Clause"/>
+        GROUP BY <include refid="Group_Column_List_Show"/>,CHJL,SAR_STAND_ATTR_INFO.XCXSSRQ,SAR_STAND_ATTR_INFO.ZCCSSRQ
+        order by
+        ${orderBy1} ${order1},SAR_STANDARDS_INFO.id
+        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+    </select>
+    <!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
+    <!--if(isnull(SAR_STANDARDS_INFO.issue_time),0,1) desc  ,-->
+    <!-- 分页查询条件查询一共有多少条数据，配合分页 -->
+    <select id="getSarStandardsInfoCount" resultType="java.lang.Integer"
+            parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select count(1) from (select count(*) from SAR_STANDARDS_INFO
+        <include refid="SarStandardsInfo_Where_Clause"/>
+        GROUP BY SAR_STANDARDS_INFO.id) a
+    </select>
+
+    <select id="selectByPrimaryKeyAndModifyTime" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        select
+        <include refid="Base_Column_List"/>
+        from SAR_STANDARDS_INFO
+        where id = #{id} and valid_flag=0
+        <if test="modifyTime != null">
+            and (modify_time &gt; #{modifyTime} or modify_time &lt; #{modifyTime}) a
+        </if>
+    </select>
+
+<!--    根据标准号查询-->
+    <select id="selectStandardsByStandnumber" resultMap="BaseResultMap"
+            parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        where SAR_STANDARDS_INFO.valid_flag = 0
+        <!-- 标准类型 -->
+        <if test="standType != null">
+            and stand_type = #{standType}
+        </if>
+        <if test="standNumber != null">
+            and ((concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+            SAR_STANDARDS_INFO.STAND_YEAR) = ( #{standNumber}) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+            or (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = ( #{standNumber})
+            and SAR_STANDARDS_INFO.STAND_YEAR = '')
+            )
+        </if>
+        <if test="sychronId != null">
+            and id != #{sychronId}
+        </if>
+    </select>
+
+<!--    查询表中是否存在某字段-->
+    <select id="selectStandColumn" resultType="java.lang.Integer" parameterType="java.lang.String">
+        SELECT COUNT(*)
+        FROM information_schema.columns
+        WHERE table_name = 'SAR_STANDARDS_INFO' AND column_name = #{columnName}
+    </select>
+
+<!--    统计更新过的标准数量-->
+    <select id="selectCounterStandardsCount" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        SELECT count(1)
+        FROM  SAR_STANDARDS_INFO
+        WHERE STAND_TYPE = #{standType} And Valid_flag = 0
+        <if test="modifyTime != null">
+            and MODIFY_TIME > #{modifyTime}
+        </if>
+    </select>
+
+    <update id="updateByStandNum"  parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        update  SAR_STANDARDS_INFO set
+        stand_state=#{standState} where 1=1 and valid_flag=0
+        <if test="standSort != null">
+            and stand_sort = #{standSort}
+        </if>
+        <if test="standNumber != null">
+            and stand_Number = #{standNumber}
+        </if>
+        <if test="standYear != null">
+            and stand_year = #{standYear}
+        </if>
+    </update>
+
+    <select id="selectStandardsInfoByIdAndRole" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select SAR_STANDARDS_INFO.id
+        from SAR_STANDARDS_INFO
+        left join SAR_STAND_MENU on SAR_STANDARDS_INFO.id=SAR_STAND_MENU.stand_id
+        where SAR_STANDARDS_INFO.valid_flag=0
+        and SAR_STAND_MENU.valid_flag=0
+        <if test="id != null">
+            and SAR_STANDARDS_INFO.id = #{id}
+        </if>
+        <if test="menuRoleList != null">
+            and SAR_STAND_MENU.MENU_ID in
+            <foreach collection="menuRoleList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <delete id="deleteByPrimaryKeyFlag" parameterType="java.lang.String">
+        delete from SAR_STANDARDS_INFO
+        where id = #{id} and valid_flag=1
+    </delete>
+
+    <update id="updateReplacedNumById"  parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        update SAR_STANDARDS_INFO set REPLACED_STAND_NUM = #{replacedStandNum} where id = #{id}
+    </update>
+
+    <update id="updateCitedStandById"  parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEO">
+        update SAR_STANDARDS_INFO set CITED_STAND = #{citedStand} where id = #{id}
+    </update>
+
+
+    <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
+            parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select<include refid="Base_Column_List_Show"/>
+        from SAR_STANDARDS_INFO
+        <include refid="SarStandardsInfo_Where_Clause"/>
+        GROUP BY <include refid="Group_Column_List_Show"/>
+        order by SAR_STANDARDS_INFO.issue_time is null,SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id
+    </select>
+
+    <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List_Show"/>
+        from SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is
+        not null and dicountry.valid_flag = 0)
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
+        dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
+        left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id
+        where SAR_STANDARDS_INFO.id = #{id}
+        GROUP BY <include refid="Group_Column_List_Show"/>
+    </select>
+
+    <select id="selectRecommendStand" resultType="com.adc.da.slrs.standardSplit.vo.RecommendVO"
+            parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select tmp_tb.* from
+        (select
+        if(
+        SAR_STANDARDS_INFO.STAND_YEAR='',
+        CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
+        CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
+        ) as numberShow,
+        SAR_STANDARDS_INFO.stand_name as nameShow,
+        SAR_STANDARDS_INFO.id,
+        concat(SAR_STANDARDS_INFO.stand_type,'_STAND') as typeShow
+        from SAR_STANDARDS_INFO
+        where SAR_STANDARDS_INFO.valid_flag = '0'
+        <if test="id != null">
+            and id != #{id}
+        </if>
+        <!--  标准种类-->
+        <if test="standSort != null">
+            and stand_sort = #{standSort}
+        </if>
+        <if test="standNumber != null">
+            or stand_number like concat(concat('%',#{standNumber}),'%')
+        </if>
+        <if test="standName != null">
+            or stand_name like concat(concat('%',#{standName}),'%')
+        </if>
+        order by modify_time desc
+        ) tmp_tb limit 0,5
+    </select>
+
+    <select id="countReplaceMsg" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT SAR_STANDARDS_INFO.stand_state
+        FROM SAR_STANDARDS_INFO
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        WHERE SAR_STAND_ATTR_INFO.DTBJH like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.valid_flag=0
+    </select>
+
+    <select id="selectStandToUpState" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>,
+        SAR_STAND_ATTR_INFO.XCXSSRQ as allPutTime
+        from SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME!=#{stateName}
+        and SAR_STAND_ATTR_INFO.XCXSSRQ != ''
+    </select>
+
+    <select id="selectStandToUpRepState" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>,dicstandState.DIC_TYPE_NAME as standStateShow,SAR_STAND_ATTR_INFO.DTBJH as replace_stand_num
+        from SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        where SAR_STANDARDS_INFO.valid_flag=0 and dicstandState.DIC_TYPE_NAME != ''
+        and SAR_STAND_ATTR_INFO.DTBJH != ''
+    </select>
+
+    <select id="selectStandToUpRepAndTime" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>,dicstandState.DIC_TYPE_NAME as standStateShow,
+        SAR_STAND_ATTR_INFO.DTBJH as replace_stand_num,
+        concat(SAR_STAND_ATTR_INFO.XCXSSRQ,',',SAR_STAND_ATTR_INFO.ZCCSSRQ) as allPutTime
+        from SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        where SAR_STANDARDS_INFO.valid_flag=0
+        and SAR_STAND_ATTR_INFO.DTBJH != ''
+        and (SAR_STAND_ATTR_INFO.XCXSSRQ != '' or SAR_STAND_ATTR_INFO.ZCCSSRQ != '')
+    </select>
+
+    <select id="selectIsExit" resultType="java.lang.Integer">
+        select count(*) from SAR_STANDARDS_INFO where id = #{id} and valid_flag != 0
+    </select>
+
+    <update id="updateStateById" parameterType="java.lang.String">
+        update SAR_STANDARDS_INFO set stand_state = #{state}
+         where id in
+        <foreach item="item" collection="list" open="(" separator="," close=")" index="index">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="selectStandardsInfoByIdAndRoleAll" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select SAR_STANDARDS_INFO.id
+        from SAR_STANDARDS_INFO
+        where
+        SAR_STANDARDS_INFO.valid_flag=1
+        <if test="id != null">
+            and SAR_STANDARDS_INFO.id = #{id}
+        </if>
+    </select>
+
+    <select id="selectStandardsInfoBynumber" resultMap="BaseResultMap"
+            parameterType="com.adc.da.slrs.standardSplit.entity.SarStandardsInfoEOPage">
+        select * from
+        (select tmp_tb.*  from
+        (select
+        <include refid="Base_Column_List_Show"/>,SAR_STAND_ATTR_INFO.CHJL AS CHJL
+        from SAR_STANDARDS_INFO
+        left join TS_DICTYPE dicountry on (dicountry.dic_type_code = SAR_STANDARDS_INFO.country and dicountry.dic_id is
+        not null and dicountry.valid_flag = 0)
+        left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        left join TS_DICTYPE dicstandState on (dicstandState.dic_type_code = SAR_STANDARDS_INFO.stand_state and
+        dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
+        left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
+        dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
+        left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+        left join SAR_MENU on SAR_STAND_MENU.menu_id = SAR_MENU.id
+        left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+        left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0)
+        where 1=1 AND  SAR_STANDARDS_INFO.valid_flag = 0
+        <if test="standNumber != null">
+            and
+            (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+            SAR_STANDARDS_INFO.STAND_YEAR) = #{standNumber} OR
+            concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = #{standNumber})
+        </if>
+        <if test="id != null">
+            and SAR_STANDARDS_INFO.id = #{id}
+        </if>
+        GROUP BY <include refid="Group_Column_List_Show"/>,CHJL
+        order by SAR_STANDARDS_INFO.issue_time is null, SAR_STANDARDS_INFO.issue_time desc,SAR_STANDARDS_INFO.id
+        ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
+    </select>
+</mapper>

adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java

@@ -157,11 +157,11 @@ public class PersonCollectEOController extends BaseController<PersonCollectEO> {
      **/
     @ApiOperation(value = "取消收藏")
     @PutMapping("/updateByUserId")
-//    @RequiresPermissions("person:personCollect:updateByUserId")
+//    @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO
     public ResponseMessage<PersonCollectEO> updateByUserId(PersonCollectEO personCollectEO) throws Exception {
         personCollectEO.setValidFlag(1);
-        boolean result = personCollectEOService.updateById(personCollectEO);
-        if(result){
+        int result = personCollectEOService.updateByPrimaryKeySelective(personCollectEO);
+        if(result == 1){
             return Result.success("0","取消成功",personCollectEO);
         } else {
             return Result.error("0","取消失败",personCollectEO);

adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java

@@ -34,4 +34,6 @@ public interface PersonCollectEODao extends BaseMapper<PersonCollectEO> {
 
     int deleteByResIdList(@Param("idList") List<String> idList);
 
+    int updateByPrimaryKeySelective(PersonCollectEO personCollectEO);
+
 }

adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java

@@ -20,4 +20,6 @@ public interface IPersonCollectEOService  extends IService<PersonCollectEO> {
 
     public int deleteByResId(String resId);
 
+    int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception;
+
 }

adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java

@@ -2,6 +2,7 @@ package com.adc.da.person.service.impl;
 
 import com.adc.da.base.page.BasePage;
 import com.adc.da.person.dao.PersonCollectEODao;
+import com.adc.da.person.dao.PersonConfEODao;
 import com.adc.da.person.dao.PersonNoteEODao;
 import com.adc.da.person.entity.PersonCollectEO;
 import com.adc.da.person.entity.PersonNoteEO;
@@ -33,6 +34,8 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
 
     @Autowired
     private PersonNoteEODao personNoteEODao;
+    @Autowired
+    private PersonCollectEODao personCollectEODao;
 
 
     @Override
@@ -96,4 +99,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
     public int deleteByResId(String resId) {
         return this.baseMapper.deleteByResId(resId);
     }
+
+    @Override
+    public int updateByPrimaryKeySelective(PersonCollectEO personCollectEO) throws Exception{
+        return personCollectEODao.updateByPrimaryKeySelective(personCollectEO);
+    }
 }

adc-da-sys/src/main/java/com/adc/da/sys/common/BasePage.java

@@ -0,0 +1,93 @@
+package com.adc.da.sys.common;
+
+import com.adc.da.base.page.Pager;
+
+public class BasePage extends com.adc.da.base.page.BasePage {
+    private Integer page = 1;
+    private Integer pageSize = 10;
+    private Integer startIndex;
+    private Integer endIndex;
+    private String orderBy;
+    private String order;
+    private String q;
+    private Pager pager = new Pager();
+
+    public BasePage() {
+    }
+
+    public Pager getPager() {
+        this.pager.setPageId(this.getPage());
+        this.pager.setPageSize(this.getPageSize());
+        String orderField = "";
+        if (this.orderBy != null && this.orderBy.trim().length() > 0) {
+            orderField = this.orderBy;
+        }
+
+        if (orderField.trim().length() > 0 && this.order != null && this.order.trim().length() > 0) {
+            orderField = orderField + " " + this.order;
+        }
+
+        this.pager.setOrderField(orderField);
+        return this.pager;
+    }
+
+    public void setPager(Pager pager) {
+        this.pager = pager;
+    }
+
+    public Integer getPage() {
+        return this.page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return this.pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getOrderBy() {
+        return this.orderBy;
+    }
+
+    public void setOrderBy(String orderBy) {
+        this.orderBy = orderBy;
+    }
+
+    public String getOrder() {
+        return this.order;
+    }
+
+    public void setOrder(String order) {
+        this.order = order;
+    }
+
+    public String getQ() {
+        return this.q;
+    }
+
+    public void setQ(String q) {
+        this.q = q;
+    }
+
+    public Integer getStartIndex() {
+        return this.startIndex;
+    }
+
+    public void setStartIndex(Integer startIndex) {
+        this.startIndex = (this.page - 1) * this.pageSize + 1;
+    }
+
+    public Integer getEndIndex() {
+        return this.endIndex;
+    }
+
+    public void setEndIndex(Integer endIndex) {
+        this.endIndex = this.page * this.pageSize;
+    }
+}