diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
index ad240f40..2229e53e 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java
@@ -30,43 +30,68 @@ public class TableToExcel {
 
                 Set<String> keys=columnMap.keySet();
                 //第一行（标题行）合并并设置标题
-
-
-                //创建表头行
-                Row headRow=sheet.createRow(0);
+                //创建表头行(合并单元格)
+                Row headRow = sheet.createRow(0);
+                Row neckRow = sheet.createRow(1);
+                sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,1,1));
+                sheet.addMergedRegion(new CellRangeAddress(0,0,2,4));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,5,5));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,6,6));
+                sheet.addMergedRegion(new CellRangeAddress(0,1,7,7));
                 //生成表头行
                 int j=0;
+
                 for(String key:keys) {
                     Cell hCell=headRow.createCell(j++);
-                    hCell.setCellValue(columnMap.get(key));
+                    if (j<3)
+                        hCell.setCellValue(columnMap.get(key));
                 }
-                //从第二行开始填充数据
-                int c=1;
+                Cell hCellh = headRow.createCell(2);
+                hCellh.setCellValue("修改意见内容");
+                Cell hCell = headRow.createCell(5);
+                hCell.setCellValue("提出部门");
+                Cell hCell1 = headRow.createCell(6);
+                hCell1.setCellValue("提出人");
+                Cell hCell2 = headRow.createCell(7);
+                hCell2.setCellValue("处理意见");
+                Cell nCell = neckRow.createCell(2);
+                nCell.setCellValue("修改前");
+                Cell nCell1 = neckRow.createCell(3);
+                nCell1.setCellValue("修改后");
+                Cell nCell2 = neckRow.createCell(4);
+                nCell2.setCellValue("修改理由");
+
+
+                //从第三行开始填充数据
+                int c=2;
                 for(int k=i*sheetRow;k<dataList.size()&&k<(i+1)*sheetRow;k++) {
                     T t=dataList.get(k);
                     Row dataRow=sheet.createRow(c++);
                     //循环取值进行数据填充
                     int v=0;
                     for(String key:keys) {
-                        try {
-                            Object val= BeanUtils.getProperty(t, key);
-                            if(val instanceof Long) {
-                                dataRow.createCell(v++).setCellValue((Long)val);
-                            }else if(val instanceof Double){
-                                dataRow.createCell(v++).setCellValue((Double)val);
-                            }else if(val instanceof Date) {
-                                dataRow.createCell(v++).setCellValue((Date)val);
-                            }else if(val instanceof Calendar) {
-                                dataRow.createCell(v++).setCellValue((Calendar)val);
-                            }else if(val instanceof Boolean) {
-                                dataRow.createCell(v++).setCellValue((Boolean)val);
-                            }else if(val==null) {
-                                dataRow.createCell(v++).setCellValue("");
-                            }else {
-                                dataRow.createCell(v++).setCellValue((String)val);
+                        if (!"commentText".equals(key)) {
+                            try {
+                                Object val = BeanUtils.getProperty(t, key);
+                                if (val instanceof Long) {
+                                    dataRow.createCell(v++).setCellValue((Long) val);
+                                } else if (val instanceof Double) {
+                                    dataRow.createCell(v++).setCellValue((Double) val);
+                                } else if (val instanceof Date) {
+                                    dataRow.createCell(v++).setCellValue((Date) val);
+                                } else if (val instanceof Calendar) {
+                                    dataRow.createCell(v++).setCellValue((Calendar) val);
+                                } else if (val instanceof Boolean) {
+                                    dataRow.createCell(v++).setCellValue((Boolean) val);
+                                } else if (val == null) {
+                                    dataRow.createCell(v++).setCellValue("");
+                                } else {
+                                    dataRow.createCell(v++).setCellValue((String) val);
+                                }
+                            } catch (Exception e) {
+                                System.out.println("导出Excel-表格赋值异常");
                             }
-                        } catch (Exception e) {
-                            System.out.println("导出Excel-表格赋值异常");
                         }
                     }
                 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
index 81ee5c0f..cd14b2b6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
@@ -5,6 +5,7 @@ import com.adc.da.scheduled.dao.SarStandardItemDao;
 import com.adc.da.scheduled.dao.SarStandardWarningDao;
 import com.adc.da.scheduled.entity.DataDTO;
 import com.adc.da.scheduled.entity.WarningEO;
+import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
 import com.adc.da.util.UUIDUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,8 +56,7 @@ public class ScheduledJob {
     @Autowired
     private SarStandardInfoDao sarStandardInfoDao;
 
-
-     @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
 //    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void schedulingTasks() {
@@ -109,7 +109,8 @@ public class ScheduledJob {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("3")
-                    .setPutTime(warningEO.getXCXSSRQ());
+                    .setPutTime(warningEO.getXCXSSRQ())
+                    .setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear());
         }
         warningList.addAll(standInfoXCXSSRQ);
 
@@ -120,12 +121,14 @@ public class ScheduledJob {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("4")
-                    .setPutTime(warningEO.getZCCSSRQ());
+                    .setPutTime(warningEO.getZCCSSRQ())
+                    .setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear());
         }
         warningList.addAll(standInfoZCCSSRQ);
 
         //持久化至预警表 忽略标准id和标志位都一样的数据
         if (warningList.size()!=0){
+            //此表的STAND_CODE和MARK字段需建立唯一性约束
             int count = sarStandardWarningDao.ignoreInsert(warningList);
             System.out.println("已预警 " + count + " 条标准或条款!!");
         }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java
index dcfa2df3..cf8f1a4d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java
@@ -19,4 +19,9 @@ public class WarningEO extends EarlyWarningEO {
 
     private Date ZCCSSRQ;
 
+    private String standNum;
+
+    private String standSort;
+
+    private String standYear;
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index c5064cbb..ccf77fd3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -50,7 +50,8 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         list.like(StringUtils.isNotEmpty(category),"category",category)
                 .like(StringUtils.isNotEmpty(cname),"cname",cname)
                 .ge(start!=null,"start_time",start)
-                .le(end!=null,"end_time",end);
+                .le(end!=null,"end_time",end)
+                .orderByDesc("start_time");
         Page<SarPublicIdea> page = new Page<>(p,size);
         IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
         System.out.println("总条数"+userIPage.getTotal());
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
index d9d268cb..06cd41a3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
@@ -193,5 +193,8 @@ public class SarStandItems extends BaseEntity {
     @TableField("read_content")
     private String readContent;
 
+    @ApiModelProperty(value = "编辑关联标识")
+    @TableField("edit_flag")
+    private String editFlag;
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
index 5d7791d0..c456d737 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -20,5 +22,8 @@ import org.apache.ibatis.annotations.Mapper;
 public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified> {
     IPage<SarStandUnqualified> getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
 
+    List<SarStandUnqualified> getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
+
+    Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
index d6e29253..9f5e772e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
@@ -166,5 +166,9 @@ public class SarStandUnqualified extends BaseEntity {
     @TableField(exist=false)
     private String dutyEngineerName;
 
+    @ApiModelProperty(value = "国内OR海外")
+    @TableField(exist=false)
+    private String standType;
+
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index 599e5517..aaaff4f2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -47,7 +47,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
     @Override
     public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR");
+        wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_TYPE");
         wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE  sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'");
         Page<SarStandardsInfo> page1 = new Page<>();
         IPage<SarStandardsInfo> userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1);
@@ -66,33 +66,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
             }
         }
 
-        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandId()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
-        }
-        //仅查询未关闭的
-        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-        //根据 项目名称 进行查询
-        if(sarStandUnqualifiedPage.getProductName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
-        }
-        //根据 责任部门 进行查询
-        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
-            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
-        }
-        //根据 标准号/标准名称 进行查询
-        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
-//            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
-            sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
-                    "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
-        }
+//        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+//        if(sarStandUnqualifiedPage.getStandId()!=null){
+//            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
+//        }
+//        //仅查询未关闭的
+//        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
+//        //根据 项目名称 进行查询
+//        if(sarStandUnqualifiedPage.getProductName()!=null){
+//            sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
+//        }
+//        //根据 责任部门 进行查询
+//        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
+//            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
+//        }
+//        //根据 标准号/标准名称 进行查询
+//        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
+////            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
+//            sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
+//                    "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
+//        }
         Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
         //判断前端是否提供页码和每页条数
-        if(sarStandUnqualifiedPage.getCurrent()!=null
-                && sarStandUnqualifiedPage.getSize()!=null){
-            standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
-        }
-        return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
+        List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
+        Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
+        standUnqualifiedPage.setRecords(sarStandUnqualifieds);
+        standUnqualifiedPage.setTotal(total);
+        standUnqualifiedPage.setCurrent(sarStandUnqualifiedPage.getCurrent());
+        standUnqualifiedPage.setSize(sarStandUnqualifiedPage.getSize());
+        return standUnqualifiedPage;
     }
 
     /**
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
index e7cffdeb..e33134a9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
@@ -24,6 +24,9 @@ public class EarlyWarningEO extends BaseEntity {
     @TableId("ID")
     private String id;
 
+    @TableField("STAND_ID")
+    private String standId;
+
     @TableField("STAND_TYPE")
     private String standType;
 
@@ -45,6 +48,9 @@ public class EarlyWarningEO extends BaseEntity {
     @TableField("ITEMS_ID")
     private String itemsId;
 
+    @TableField("ITEMS_NUM")
+    private String itemsNum;
+
     @TableField("ITEMS_NAME")
     private String itemsName;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 421bf4f0..3528e41d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -2174,7 +2174,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 String txt = extractor.getText();
                                 content.append(txt);
                             }
-                       } else {
+                        } else {
                             PDDocument document = PDDocument.load(new File(readFilePath));
                             document.getClass();
                             if (!document.isEncrypted()) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
index fc593344..98287330 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java
@@ -133,9 +133,9 @@ public class SarFileSplitItemsEOController extends BaseController<SarFileSplitIt
 
     @ApiOperation(value = "|SarFileSplitItemsEO|批量删除")
     @PostMapping("/batchDeleteItems")
-    public ResponseMessage batchDeleteItems(String ids) throws Exception {
+    public ResponseMessage batchDeleteItems(String ids,String editFlag) throws Exception {
         if (StringUtils.isNotEmpty(ids)) {
-            int result = sarFileSplitItemsEOService.batchDeleteItems(ids);
+            int result = sarFileSplitItemsEOService.batchDeleteItems(ids,editFlag);
             if (result > 0) {
                 return Result.success("0","删除成功",null);
             } else {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
index 71442b26..722ae9d0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.standardSplit.dto.FileSplitItemsExportDto;
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage;
+import com.adc.da.slrs.standardSplit.entity.SarStandItemsEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -32,6 +33,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
 
    int deleteByItemsIdList(@Param("idList") List<String> idList);
 
+   int deleteByItemsIdList1(@Param("idList") List<String> idList);
+
    List<SarFileSplitItemsEO> queryItemsByMenuId(@Param("menuId") String menuId);
 
    List<SarFileSplitItemsEO> queryByItemsIds(@Param("idList") List<String> idList);
@@ -52,6 +55,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
 
    int updateByPrimaryKeySelective(SarFileSplitItemsEO page);
 
+   int updateByPrimaryKeySelective1(SarFileSplitItemsEO page);
+
    int deleteByPrimaryKey(String id);
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java
index ebcad944..3156b55c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * <b>日期：</b> 2020-01-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@Data
 public class SarFileSplitItemsEO extends BaseEntity {
 
     private String id;
@@ -64,6 +66,9 @@ public class SarFileSplitItemsEO extends BaseEntity {
 
     private String responsibleUnit;//责任部门
     private String responsibleUnitShow;
+
+    private String editFlag;
+    private String workFlowShow;
     /**
      * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
      * <p>字段列表：</p>
@@ -520,4 +525,12 @@ public class SarFileSplitItemsEO extends BaseEntity {
     public void setResponsibleUnitShow(String responsibleUnitShow) {
         this.responsibleUnitShow = responsibleUnitShow;
     }
+
+    public String getEditFlag() {
+        return editFlag;
+    }
+
+    public void setEditFlag(String editFlag) {
+        this.editFlag = editFlag;
+    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java
index b6d6d46c..d7a9e58c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEOPage.java
@@ -61,10 +61,19 @@ public class SarFileSplitItemsEOPage extends BasePage {
     private String sMenuId;
     private List<String> idList;
     private List<String> menuIdList;
+    private String edirFlag;
 
     private int tableIndex = 1;
     private int imgIndex = 1;
 
+    public String getEdirFlag() {
+        return edirFlag;
+    }
+
+    public void setEdirFlag(String edirFlag) {
+        this.edirFlag = edirFlag;
+    }
+
     public String getId() {
         return this.id;
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java
index 5d924914..2c481568 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandItemsEO.java
@@ -58,6 +58,7 @@ public class SarStandItemsEO extends BaseEntity {
     private SarCompStatusInfoEO pgForm;
 
     private String menuId;
+    private String editFlag;
     /**
      * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
      * <p>字段列表：</p>
@@ -483,4 +484,12 @@ public class SarStandItemsEO extends BaseEntity {
     public void setMenuId(String menuId) {
         this.menuId = menuId;
     }
+
+    public String getEditFlag() {
+        return editFlag;
+    }
+
+    public void setEditFlag(String editFlag) {
+        this.editFlag = editFlag;
+    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
index bad1b3d0..be30efc7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsEOService.java
@@ -28,7 +28,7 @@ public interface SarFileSplitItemsEOService {
 
     int deleteByPrimaryKey(String id);
 
-    int batchDeleteItems(String ids);
+    int batchDeleteItems(String ids,String editFlag);
 
     boolean judgeContaintChilds(String ids);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
index fa1d0986..91b02664 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
@@ -330,6 +330,25 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             return -1;
         }
         if(treeList.size()>0 && messageList.size() > 0){
+            //判断流程是否需要显示！！
+            List<SarFileSplitItemsEO> middle = new ArrayList<>();
+            middle=messageList;
+            for (SarFileSplitItemsEO mis:messageList) {
+                mis.setWorkFlowShow("1");
+                if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){
+                    mis.setWorkFlowShow("0");
+                }
+                else {
+                    for (SarFileSplitItemsEO itemsEO : middle) {
+                        if (itemsEO.getItemsNum().length() > mis.getItemsNum().length() && itemsEO.getItemsNum().contains(mis.getItemsNum())) {
+                            if (itemsEO.getItemsNum().startsWith(mis.getItemsNum())) {
+                                mis.setWorkFlowShow("0");
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
             sarFileSplitMenuEODao.insertForeach(treeList);
             sarFileSplitItemsEODao.insertForeach(messageList);
             sarFileSplitItemsValEODao.insertForeach(itemValList);
@@ -345,7 +364,9 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
                         .setStandId(sarFileSplitInfoEO.getStandId())
                         .setItemsNum(item.getItemsNum())
                         .setItemsName(item.getItemsName())
-                        .setTermsConditions(item.getItermsConditions());
+                        .setTermsConditions(item.getItermsConditions())
+                        .setEditFlag(item.getEditFlag());
+
                 standList.add(standItems1);
             });
             sarFileSplitItemsEODao.insertStandSplitForeach(standList);
@@ -370,6 +391,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
         sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setModifyTime(new Date());
         sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
+        sarFileSplitItemsEO.setEditFlag(UUIDUtils.randomUUID(32));
         return sarFileSplitItemsEO;
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
index 06d92dfa..5ec05134 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java
@@ -74,23 +74,36 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
 
     @Override
     public Map<String, Object> getByPage(SarFileSplitItemsEOPage page) {
+        //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效
         page.setValidFlag("0");
+        //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列
         page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc");
+        //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空
         if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) {
+            //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里
             List<SarFileSplitMenuEO> sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage());
+            //把这个sarFileSplitMenuEOList转换成树的形式
             Tree tree = new Tree<>(sarFileSplitMenuEOList);
+            //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId
             TreeNode treeNode = tree.getTreeNode(page.getMenuId());
 
             List<String> menuIds = new ArrayList<>();
+            //然后把刚刚的treeNode的nodeId放到menuIds数组里
             menuIds.add(treeNode.getNodeId());
             for (TreeNode node : treeNode.getAllChildren()) {
+                //把所有的treeNode的nodeId放到menuIds数组里
                 menuIds.add(node.getNodeId());
             }
+            //把它放到MenuIdList里
             page.setMenuIdList(menuIds);
         }
+        //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据）
         int count = dao.queryByCount(page);
+        //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表
         List<SarFileSplitItemsEO> rows = dao.queryByPage(page);
+        //如果查询出来的结果不为空
         if (rows != null && !rows.isEmpty()) {
+            //遍历rows
             for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) {
                 //查询svpps
                 String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps());
@@ -137,6 +150,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
         String itemConditions = "";
         String userId = UserUtils.getUserId();
         int resultCount = 0;
+        int resultCount1 = 0;
         //修改特殊参数要求信息
         updateParamsContent(sarFileSplitItemsEO);
         //修改条款要求内容
@@ -200,13 +214,18 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
             }
             sarFileSplitItemsEO.setItermsConditions(itemConditions);
             resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
+            resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO);
         } else {
             sarFileSplitItemsEO.setItermsConditions("");
             resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO);
+            resultCount1 = dao.updateByPrimaryKeySelective1(sarFileSplitItemsEO);
             // 删除val表全部信息
             sarFileSplitItemsValEODao.deleteByitemId(sarFileSplitItemsEO.getId());
         }
-        return resultCount;
+        Map resultCountMap = new HashMap();
+        resultCountMap.put("拆分",resultCount);
+        resultCountMap.put("标准分解单",resultCount1);
+        return resultCountMap.size();
     }
 
     /**
@@ -240,9 +259,11 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
     }
 
     @Override
-    public int batchDeleteItems(String ids) {
+    public int batchDeleteItems(String ids,String editFlag) {
         String[] itemIds = ids.split(",");
+        String[] itemIds1 = editFlag.split(",");
         List<String> idList = Arrays.asList(itemIds);
+        List<String> idList1 = Arrays.asList(itemIds1);
         // 查到对应menu
         List<SarFileSplitItemsEO> getMenuList = dao.queryByItemsIds(idList);
         List<SarFileSplitItemsEO> getAllItemList = new ArrayList<>();
@@ -280,6 +301,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
                 //删除file表数据
 //                sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList);
                 result = dao.deleteByItemsIdList(allItemIdList);
+                 dao.deleteByItemsIdList1(idList1);
             }else if(!idList.isEmpty()){//菜单被删掉了，数据当时被保留下来的
                 allItemIdList.clear();
                 allItemIdList.addAll(idList);
@@ -290,9 +312,12 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic
                 //删除特殊参数要求params表数据
                 sarFileSplitItemsParamsEODao.deleteByItemIds(allItemIdList);
                 result = dao.deleteByItemsIdList(allItemIdList);
+                dao.deleteByItemsIdList1(idList1);
             }
         }
-        return result;
+        Map resultMap = new HashMap();
+        resultMap.put("拆分单删除",result);
+        return resultMap.size();
     }
 
     @Override
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
index da1eb9a9..117b6e2c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -29,4 +29,50 @@
             and a.stand_id = #{standId}
         </if>
     </select>
+
+
+    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+        SELECT
+        sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType
+        from
+        sar_stand_unqualified
+        left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
+        WHERE
+        close_state = 1
+        <if test="sar.standId != null and sar.standId != '' ">
+            and STAND_ID = #{standId}
+        </if>
+        <if test="sar.productName != null and sar.productName != '' ">
+            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+        </if>
+        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+        </if>
+        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
+        </if>
+        limit #{start},#{end}
+    </select>
+
+    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+        SELECT
+         count(sar_stand_unqualified.ID)
+        from
+        sar_stand_unqualified
+        left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
+        WHERE
+        close_state = 1
+        <if test="sar.standId != null and sar.standId != '' ">
+            and STAND_ID = #{standId}
+        </if>
+        <if test="sar.productName != null and sar.productName != '' ">
+            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+        </if>
+        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+        </if>
+        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
+        </if>
+    </select>
 </mapper>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml
index 3d82bdd6..d90455ed 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml
@@ -4,9 +4,11 @@
 
     <!-- Result Map-->
     <resultMap id="resultMap" type="com.adc.da.scheduled.entity.WarningEO" >
-        <id column="ID" property="id" />
-        <result column="STAND_NUMBER" property="standCode" />
+        <id column="ID" property="standId" />
+        <result column="STAND_NUMBER" property="standNum" />
         <result column="STAND_NAME" property="standName" />
+        <result column="STAND_SORT" property="standSort"/>
+        <result column="STAND_YEAR" property="standYear"/>
         <result column="XCXSSRQ" property="XCXSSRQ"/>
         <result column="ZCCSSRQ" property="ZCCSSRQ"/>
         <result column="CLLX" property="applyType" />
@@ -18,6 +20,8 @@
     <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
         SELECT
         info.ID,
+        info.STAND_SORT,
+        info.STAND_YEAR,
         info.STAND_NUMBER,
         info.STAND_NAME,
         info.STAND_TYPE,
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
index 58a4b8eb..01a5167a 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
@@ -4,7 +4,10 @@
 
     <!-- Result Map-->
     <resultMap id="resultMap" type="com.adc.da.scheduled.entity.WarningEO">
-        <id column="ID" property="id"/>
+        <id column="ID" property="itemsId"/>
+        <result column="STAND_ID" property="standId"/>
+        <result column="ITEMS_NAME" property="itemsName"/>
+        <result column="ITEMS_NUM" property="itemsNum"/>
         <result column="STAND_NUMBER" property="standCode"/>
         <result column="STAND_NAME" property="standName"/>
         <result column="XCXSSRQ" property="XCXSSRQ"/>
@@ -16,12 +19,15 @@
     <!-- 查询条件 -->
     <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
         SELECT
+            items.ID,
             STAND_ID,
             ITEMS_NUM,
+            ITEMS_NAME,
             TERMS_CONDITIONS,
             DUTY_ENGINEER,
             APPLY_ARCTIC,
             info.STAND_TYPE,
+            info.STAND_NUMBER,
 
             ${str}
         FROM
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
index 95d5ca67..12daa750 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml
@@ -4,12 +4,13 @@
 
     <insert id="ignoreInsert" parameterType="java.util.LinkedList">
 
-        INSERT IGNORE INTO sar_stand_warning (ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER)
+        INSERT IGNORE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER)
         VALUES
         <if test="warningEOS !=null and warningEOS.size()!=0">
             <foreach collection="warningEOS" item="item" index="index"  separator=",">
                (
                 #{item.id}
+                ,#{item.standId}
                 ,#{item.standType}
                 ,#{item.standCode}
                 ,#{item.standName}
@@ -17,6 +18,7 @@
                 ,#{item.applyType}
                 ,#{item.dutyEngineer}
                 ,#{item.itemsId}
+                ,#{item.itemsNum}
                 ,#{item.itemsName}
                 ,#{item.policyId}
                 ,#{item.policyName}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
index b44506a8..528db8c1 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml
@@ -71,6 +71,17 @@
      dutyEngineerShow,tsFo.NAME as foShow
   </sql>
 
+  <sql id="Base_Column_List2" >
+     SAR_FILE_SPLIT_ITEMS.id, SAR_FILE_SPLIT_ITEMS.info_id, SAR_FILE_SPLIT_ITEMS.items_num, items_name, iterms_conditions,
+     newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file,
+     SAR_FILE_SPLIT_ITEMS.remarks, SAR_FILE_SPLIT_ITEMS.valid_flag, SAR_FILE_SPLIT_ITEMS.creation_user,
+     SAR_FILE_SPLIT_ITEMS.creation_time, SAR_FILE_SPLIT_ITEMS.modify_time, SAR_FILE_SPLIT_ITEMS.modify_user,
+     SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type,
+     SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit,
+     TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as
+     dutyEngineerShow,tsFo.NAME as foShow, SAR_FILE_SPLIT_ITEMS.edit_flag ,SAR_FILE_SPLIT_ITEMS.work_flow_show as workFlowShow
+  </sql>
+
   <!-- 查询条件 -->
   <sql id="Base_Where_Clause">
     where 1=1
@@ -343,6 +354,28 @@
      where id = #{id}
   </update>
 
+    <update id="updateByPrimaryKeySelective1" parameterType="com.adc.da.slrs.standardSplit.entity.SarStandItemsEO">
+        update SAR_STAND_ITEMS
+        <set >
+            <if test="itemsNum != null" >
+                items_num = #{itemsNum},
+            </if>
+
+            <if test="itemsName != null" >
+                items_name = #{itemsName},
+            </if>
+
+            <if test="itermsConditions != null" >
+                TERMS_CONDITIONS = #{itermsConditions},
+            </if>
+
+            <if test="validFlag != null" >
+                valid_flag = #{validFlag},
+            </if>
+        </set>
+        where edit_flag = #{editFlag}
+    </update>
+
   <!-- 根据id查询 SAR_FILE_SPLIT_ITEMS -->
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
     select <include refid="Base_Column_List" />
@@ -386,7 +419,7 @@
   <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage">
 	select * from
 		(select tmp_tb.* from
-			(select <include refid="Base_Column_List" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
+			(select <include refid="Base_Column_List2" /> from SAR_FILE_SPLIT_ITEMS left join SAR_FILE_SPLIT_MENU on SAR_FILE_SPLIT_ITEMS.MENU_ID = SAR_FILE_SPLIT_MENU.id
                 left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_FILE_SPLIT_ITEMS.claim_type and dicClaimType.dic_id is
                 not null and dicClaimType.valid_flag = 0)
                 left join TS_ORG on (SAR_FILE_SPLIT_ITEMS.responsible_unit =TS_ORG.id)
@@ -454,7 +487,7 @@
      <insert id="insertForeach" parameterType="java.util.List">
         insert into SAR_FILE_SPLIT_ITEMS
         (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time,
-        modify_user, iterms_conditions)
+        modify_user, iterms_conditions, edit_flag , work_flow_show)
          values
          <foreach collection="list" item="item" index="index" separator=",">
              (
@@ -466,7 +499,8 @@
              #{item.relevanceFile, jdbcType=VARCHAR}, #{item.remarks, jdbcType=VARCHAR},
              #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR},
              #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
-             #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}
+             #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB},
+             #{item.editFlag, jdbcType=VARCHAR} ,#{item.workFlowShow, jdbcType=VARCHAR}
          )
          </foreach>
     </insert>
@@ -474,13 +508,14 @@
     <!--   用来往标准分解单插入数据   -->
     <insert id="insertStandSplitForeach" parameterType="java.util.List">
         insert into SAR_STAND_ITEMS
-        (id, STAND_ID, items_num, items_name,  TERMS_CONDITIONS,FILE_TYPE)
+        (id, STAND_ID, items_num, items_name,TERMS_CONDITIONS,FILE_TYPE,edit_flag)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (
             #{item.id, jdbcType=VARCHAR}, #{item.standId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR},
             #{item.itemsName, jdbcType=VARCHAR}, #{item.termsConditions, jdbcType=CLOB},
-            #{item.fileType, jdbcType=VARCHAR}
+            #{item.fileType, jdbcType=VARCHAR},
+            #{item.editFlag, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>
@@ -550,6 +585,14 @@
         </foreach>
     </delete>
 
+    <delete id="deleteByItemsIdList1" parameterType="java.util.List">
+        delete from SAR_STAND_ITEMS
+        where edit_flag in
+        <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
     <select id="queryByOrdersForExport" resultMap="BaseResultMapExport" parameterType="com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEOPage">
         select SAR_FILE_SPLIT_ITEMS.id,SAR_FILE_SPLIT_ITEMS.items_num,SAR_FILE_SPLIT_ITEMS.items_name,
         newcar_put_time,product_put_time,svpps,apply_arctic,reference_stand,SAR_FILE_SPLIT_ITEMS.remarks,