diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index fb33ca82..7d7a8e18 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -6,18 +6,18 @@ import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; -import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.FindFileNameDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; -import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.*; import com.adc.da.slrs.sarLawsDetailedList.service.impl.SarLawsDetailedListServiceImpl; import com.adc.da.util.utils.CollectionUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -156,4 +156,11 @@ public class SarLawsDetailedListController extends BaseController0){ + if ("-".equals(putTime[a]) || null == putTime[a]) { + dto.setSsrq(null); + } else { + dto.setSsrq(putTime[a]); + } + if ("-".equals(putTime[a]) || null == xcx[a]) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("-".equals(putTime[a]) || null == zcc[a]) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } } timeDto.add(dto); } @@ -314,7 +320,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1 : arr) { if (map1.get("value").equals(s)) { - s = map1.get("label"); + s = map1.get("value"); builder.append(s + ","); break; } @@ -328,7 +334,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl map1 : arr) { if (map1.get("value").equals(list1.getCountryArea())) { - list1.setCountryArea(map1.get("label")); + list1.setCountryArea(map1.get("value")); break; } } @@ -343,14 +349,159 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.select("DISTINCT country_area,car_type"); + List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); + + //list是数据库里根据id查出来的数据;detailedUpDto是页面传回来的数据 + SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId()); + System.out.println("数据库里存的当前数据"+list.getCountryArea()); + System.out.println("页面现在的数据"+detailedUpDto.getCountryArea()); + + //国家/地区清单 多选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean multiEditFlag = true; + //国家/地区清单 单选是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean singleEditFlag = true; + //车型类别是否可以添加的标识，true表示可以添加，false表示不许添加 + boolean carEditFlag = true; + + if (detailedUpDto.getCountryArea() == null && detailedUpDto.getCarType() == null) { + //下面放修改的具体方法 + //国家或地区 + //如果页面的国家地区为空，就把数据库里的国家地区字段也设为空 + updateListMethod(detailedUpDto); + return "其他清单添加成功"; + } + //如果是车辆修改 + else if (detailedUpDto.getCarType() != null) { + //就判断页面的值和数据库里的值是否相等 + for (int i = 0; i < sarLawsDetailedLists.size(); i++) { + //判断数据库里的数据的车型类别字段是否为空 + if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCarType()){ + System.out.println("数据库里第" + (i + 1) + "条的车型类别字段长度为空，不重复，目前可以添加"); + } + else if (Objects.equals(detailedUpDto.getCarType(), list.getCarType())){ + System.out.println("页面的数据和数据库里存的当前数据相同，说明没有做更改，允许提交"); + } + //相等就不许添加 + else if (!Objects.equals(detailedUpDto.getCarType(), list.getCarType()) && Objects.equals(detailedUpDto.getCarType(), sarLawsDetailedLists.get(i).getCarType())) { + System.out.println("数据库里第" + (i + 1) + "条的车型类别字段和页面一样，重复，不许添加"); + carEditFlag = false; + } + } + } + //如果是国家修改 + else if (detailedUpDto.getCountryArea() != null) { + for (int i = 0; i < sarLawsDetailedLists.size(); i++) { + //就先判断数据库里的数据的国家/地区字段是否为空 + if (null == sarLawsDetailedLists.get(i) || null == sarLawsDetailedLists.get(i).getCountryArea()) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度为空，不重复，目前可以添加"); + } + else if (Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea())){ + System.out.println("页面的数据和数据库里存的当前数据相同，说明没有做更改，允许提交"); + } + //再判断页面字段长度是否与数据库里的长度一样，如果长度不一样，允许新增 + else if (detailedUpDto.getCountryArea().length() != sarLawsDetailedLists.get(i).getCountryArea().length()) { + System.out.println("数据库里第" + (i + 1) + "条的国家地区字段长度和页面的国家地区字段长度不一样，不重复，目前可以添加"); + } + //如果不为空且长度一样 + else { + //判断页面的国家地区是单选还是多选（判断能不能拆） + if (detailedUpDto.getCountryArea().contains(",")) { + System.out.println("页面是多选"); + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，目前不许添加"); + System.out.println("页面字段为" + detailedUpDto.getCountryArea()); + //页面字段以“，”为分隔符拆分后的结果 + String[] frontCountryArea = detailedUpDto.getCountryArea().split(","); + //数据库字段以“，”为分隔符拆分后的结果 + String[] databaseCountryArea = sarLawsDetailedLists.get(i).getCountryArea().split(","); + + //如果页面字段拆分之后都包含于数据库字段拆分之后，则说明重复，不许添加 + for (int j = 0; j < frontCountryArea.length; j++) { + //如果数据库包含了页面字段的所有值，说明这俩完全相同，重复，不许添加 + List databaseCountryAreaList = Arrays.asList(databaseCountryArea); + if (!Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea()) && databaseCountryAreaList.contains(frontCountryArea[j])) { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段包含页面里的字段，可能重复，目前不许修改"); + multiEditFlag = false; + } else { + System.out.println("数据库" + databaseCountryAreaList); + System.out.println("页面" + frontCountryArea[j]); + System.out.println("数据库里的字段和页面字段虽然长度相同，但是里面有不一样的元素，可以修改"); + multiEditFlag = true; + } + } + if (multiEditFlag == true) { + System.out.println("长度相同，只要有一个不重复，就可以添加"); + } else { + System.out.println("长度相同，整个循环下来都重复，说明两个字段重复，不许添加"); + break; + } + } + } else { + System.out.println("页面是单选"); + + //如果数据库里的国家地区字段存在",",说明是多选，如果不存在说明是单选 + if (sarLawsDetailedLists.get(i).getCountryArea().contains(",")) { + System.out.println("数据库是多选，肯定不重复，目前可以添加"); + } else { + System.out.println("数据库是单选，如果数据库里的字段和页面的字段相等，重复，不许添加"); + //如果数据库里的字段和页面的字段相等，重复，不许添加 + if (!Objects.equals(detailedUpDto.getCountryArea(), list.getCountryArea()) && Objects.equals(sarLawsDetailedLists.get(i).getCountryArea(), detailedUpDto.getCountryArea())) { + System.out.println("数据库里的字段和页面的字段相等，重复，不许添加"); + singleEditFlag = false; + break; + } else { + System.out.println("数据库里的字段和页面的字段不相等，不重复，允许添加"); + } + } + } + } + } + } + + //如果整个循环下来都没有重复，则可以添加，不然就说明有重复，不能添加 + if (carEditFlag == true && multiEditFlag == true && singleEditFlag == true) { + //下面放添加的具体方法 + //国家或地区 + //如果页面的国家地区为空，就把数据库里的国家地区字段也设为空 + updateListMethod(detailedUpDto); + return "车型类别清单修改成功"; + //添加方法结束 + } else if (carEditFlag == false){ + //0表示添加成功，1表示添加失败 + return "车型类别清单修改失败"; + } + + //如果循环完整个数据库，都没有重复使当前数据无法添加，则添加 + if (multiEditFlag == true && singleEditFlag == true && carEditFlag == true) { + //下面放添加的具体方法 + //国家或地区 + //如果页面的国家地区为空，就把数据库里的国家地区字段也设为空 + updateListMethod(detailedUpDto); + //0表示添加成功，1表示添加失败 + return "国家/地区清单修改成功"; + //添加方法结束 + } else { + //0表示添加成功，1表示添加失败 + return "国家/地区清单修改失败"; + } + + + + } + + private void updateListMethod(DetailedUpDto detailedUpDto) { //list是数据库里根据id查出来的数据;detailedUpDto是页面传回来的数据 SarLawsDetailedList list = sarLawsDetailedListDao.selectById(detailedUpDto.getId()); - //国家或地区 - //如果页面的国家地区为空，就把数据库里的国家地区字段也设为空 if (StringUtils.isBlank(detailedUpDto.getCountryArea())) list.setCountryArea(null); else if ("null".equals(detailedUpDto.getCountryArea())) ; - //把数据库里的国家地区字段设为页面的国家地区 + //把数据库里的国家地区字段设为页面的国家地区 else list.setCountryArea(detailedUpDto.getCountryArea()); //车型类别 if (StringUtils.isBlank(detailedUpDto.getCarType())) list.setCarType(null); @@ -432,11 +583,68 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.select("country_area","id"); + //查询清单中的国家地区和清单id + List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); + //2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理 + String[] split = countryArea.split(","); //拆分标准中的国家地区 + + + + //遍历清单 对比国家地区 + for (SarLawsDetailedList lawsDetailed : sarLawsDetailedLists) { + if (lawsDetailed.getCountryArea()==null){ + continue; + } + String[] sarLawsCounties = lawsDetailed.getCountryArea().split(",");//拆分清单中的国家地区 + // 对比清单列表中的国家地区,是否一致 + Arrays.sort(split); + Arrays.sort(sarLawsCounties); + if ( Arrays.equals(split,sarLawsCounties)){ + + //一致时插入表并关联detailedListId和standId + ArrayList timeDtos = new ArrayList<>(); + timeDtos.add(timeDto); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stand_id",timeDto.getStandId()); + + + //如果目标清单中已存标准在则更新 懒得写更新(⓿_⓿) 直接删掉,再重新插入 + if (sarLawsAttrDetailedListDao.selectCount(queryWrapper)>0) { + sarLawsAttrDetailedListDao.delete(queryWrapper); + } + + sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(),timeDtos); + break; + } + } + + } + + } 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 2d6c75cb..71442b26 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 @@ -1,5 +1,6 @@ package com.adc.da.slrs.standardSplit.dao; +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; @@ -21,6 +22,8 @@ public interface SarFileSplitItemsEODao extends BaseMapper int insertForeach(List list); + int insertStandSplitForeach(@Param(value = "list") List list); + int deleteByIds(SarFileSplitItemsEO sarFileSplitItemsEO); int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO); 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 9b0b7dc6..fa1d0986 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.service.impl; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.standardSplit.dao.*; import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; import com.adc.da.att.entity.AttFileEO; @@ -31,10 +32,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import com.adc.da.common.SplitFilePragraTypeEnum; + import java.io.*; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; + import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.dao.PersonCollectEODao; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -105,7 +108,12 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService @Override @Transactional - public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){ + public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO) { + + //用来往标准分解单里添加数据 + List standList = new ArrayList<>(); + + // 拆分文件主表中插入数据 sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); sarFileSplitInfoEO.setValidFlag(0); @@ -244,8 +252,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText()); } } - } - else if (messageNumber>=3){ + } else if (messageNumber >= 3) { ptest = Pattern.compile("^[\\d.]*$"); boolean hasGoIf = false; for (int i=0;i { + //new一个对象 + SarStandItems standItems1 = new SarStandItems(); + //standItems1里的这个值为messageList里的ItermsConditions + standItems1.setId(UUIDUtils.randomUUID20()) + .setFileType(sarFileSplitInfoEO.getFileType()) + .setStandId(sarFileSplitInfoEO.getStandId()) + .setItemsNum(item.getItemsNum()) + .setItemsName(item.getItemsName()) + .setTermsConditions(item.getItermsConditions()); + standList.add(standItems1); + }); + sarFileSplitItemsEODao.insertStandSplitForeach(standList); + + } else { return -1; } @@ -368,7 +393,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if (o instanceof CTDrawing) { CTDrawing drawing = (CTDrawing) o; CTInline[] ctInlines = drawing.getInlineArray(); - CTAnchor[] ctAnchors = drawing.getAnchorArray(); + CTAnchor[] ctAnchors = drawing.getAnchorArray(); for (CTInline ctInline : ctInlines) { CTGraphicalObject graphic = ctInline.getGraphic(); // @@ -398,7 +423,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } } - } else if (o instanceof CTLevelText){ + } else if (o instanceof CTLevelText) { logger.info(((CTLevelText) o).getVal()); } } @@ -407,14 +432,14 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } // 像每个条款中依次插入每一段的内容 - private void addItermsConditionsImage(SarFileSplitItemsEO message,List itemsValList,XWPFParagraph p,List imageBundleList) { + private void addItermsConditionsImage(SarFileSplitItemsEO message, List itemsValList, XWPFParagraph p, List imageBundleList) { for (String pictureId : imageBundleList) { XWPFPictureData pictureData = p.getDocument().getPictureDataByID(pictureId); String imageName = UUIDUtils.randomUUID10() + pictureData.getFileName(); byte[] bytev = pictureData.getData(); String outPath = filePath + "/img/"; File file1 = new File(outPath); - if(!file1.exists()){ + if (!file1.exists()) { file1.mkdirs(); } String filepathandname = filePath + "/img/" + imageName; @@ -425,14 +450,14 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService String imgCon = ""; message.getItemsCondi().add(imgCon); message.setItermsConditions(message.getItermsConditions() + imgCon); - itemsValList.add(getSplitItemsValObject(message.getId(),SplitFilePragraTypeEnum.IMG.getValue(),imgCon,message.getItemsCondi().size(),null)); + itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.IMG.getValue(), imgCon, message.getItemsCondi().size(), null)); } catch (IOException e) { e.printStackTrace(); } } } - private SarFileSplitItemsValEO getSplitItemsValObject (String itemId,String type,String itemContent,int disPlaySql,List tableList) { + private SarFileSplitItemsValEO getSplitItemsValObject(String itemId, String type, String itemContent, int disPlaySql, List tableList) { SarFileSplitItemsValEO sarFileSplitItemsValEO = new SarFileSplitItemsValEO(); sarFileSplitItemsValEO.setId(UUIDUtils.randomUUID20()); sarFileSplitItemsValEO.setValidFlag(0); @@ -444,13 +469,13 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsValEO.setType(type); sarFileSplitItemsValEO.setDisplaySeq(disPlaySql); sarFileSplitItemsValEO.setItemContent(itemContent); - return sarFileSplitItemsValEO; + return sarFileSplitItemsValEO; } // 像每个条款中依次插入每一段的内容 - private void addItermsConditionsText(SarFileSplitItemsEO message,List itemsValList,String p) { + private void addItermsConditionsText(SarFileSplitItemsEO message, List itemsValList, String p) { message.getItemsCondi().add(p); - message.setItermsConditions(message.getItermsConditions() + "

"+p+ "

"); + message.setItermsConditions(message.getItermsConditions() + "

" + p + "

"); // 判断message中是否引用到其他标准 // String testString = p; // Pattern ptest = Pattern.compile("[A-Z]{1,}/{0,1}[A-Z]{1,}\\s{0,1}[0-9]\\d*\\.?\\d*"); @@ -473,51 +498,52 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService // message.setReferenceStand(matcher.group()); // } // } - itemsValList.add(getSplitItemsValObject(message.getId(),SplitFilePragraTypeEnum.TEXT.getValue(),p,message.getItemsCondi().size(),null)); + itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.TEXT.getValue(), p, message.getItemsCondi().size(), null)); } - private SarFileSplitMenuEO getTreeList(String name, List treeList,String generalCatalogueId,SarFileSplitInfoEO sarFileSplitInfoEO ,Long treeListDisplay,String itemName){ - SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(),name,sarFileSplitInfoEO.getId(),treeListDisplay,itemName); + private SarFileSplitMenuEO getTreeList(String name, List treeList, String generalCatalogueId, SarFileSplitInfoEO sarFileSplitInfoEO, Long treeListDisplay, String itemName) { + SarFileSplitMenuEO documentTreeEO = new SarFileSplitMenuEO(UUIDUtils.randomUUID20(), name, sarFileSplitInfoEO.getId(), treeListDisplay, itemName); // 用现在得name 和之前得name 做比较，确定，parentId - if (name.indexOf(".")>=0) { + if (name.indexOf(".") >= 0) { for (SarFileSplitMenuEO forDocumentTree : treeList) { if (name.substring(0, name.lastIndexOf(".")).equals(forDocumentTree.getName())) { documentTreeEO.setPId(forDocumentTree.getId()); break; } } - }else { + } else { documentTreeEO.setPId(generalCatalogueId); } - return documentTreeEO; + return documentTreeEO; } /** * 通过传递过来的编号，得出下次可能出现的编号 + * * @param nowStart * @return */ - private List getNewNowStart(String nowStart){ + private List getNewNowStart(String nowStart) { List nowStartList = new ArrayList<>(); List nowResultStartList = new ArrayList<>(); String[] numberStr = nowStart.split("\\."); String startnumber = ""; - for(int i=0;i itemsValList,XWPFTable table) throws IOException { + private void addItermsConditionsOfTable(SarFileSplitItemsEO message, List itemsValList, XWPFTable table) throws IOException { StringBuilder tabaleStringNew = new StringBuilder(""); //将表格转为html字符串 ReadWordTable readWordTable = new ReadWordTable(); @@ -525,25 +551,25 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService tabaleStringNew.append(tableStr); message.getItemsCondi().add(table.getText()); message.setItermsConditions(message.getItermsConditions() + tabaleStringNew); - itemsValList.add(getSplitItemsValObject(message.getId(),SplitFilePragraTypeEnum.TABLE.getValue(),tabaleStringNew.toString(),message.getItemsCondi().size(),null)); + itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.TABLE.getValue(), tabaleStringNew.toString(), message.getItemsCondi().size(), null)); } @Override - public List queryByPageOwn(SarFileSplitInfoEOPage page){ + public List queryByPageOwn(SarFileSplitInfoEOPage page) { int rowCount = sarFileSplitInfoEODao.queryByCountOwn(page); page.getPager().setRowCount(rowCount); List rows = sarFileSplitInfoEODao.queryByPageOwn(page); - Map map = new HashMap<>(); - map.put("CA","草稿"); - map.put("ZQYJG","征求意见稿"); - map.put("BPG","报批稿"); - map.put("SSG","送审稿"); - map.put("FBGBJBD","发布稿（必读）"); + Map map = new HashMap<>(); + map.put("CA", "草稿"); + map.put("ZQYJG", "征求意见稿"); + map.put("BPG", "报批稿"); + map.put("SSG", "送审稿"); + map.put("FBGBJBD", "发布稿（必读）"); if (rows != null && !rows.isEmpty()) { for (SarFileSplitInfoEO infoEO : rows) { - infoEO.setFileTypeShow(String.valueOf(map.get(infoEO.getFileType()))); + infoEO.setFileTypeShow(String.valueOf(map.get(infoEO.getFileType()))); // if (!infoEO.getSplitStatus().equals("0") && infoEO.getShowNumber() == null){ // SarLawsInfoEOPage sarLawsInfoEOPage = new SarLawsInfoEOPage(); // sarLawsInfoEOPage.setId(infoEO.getStandId()); @@ -571,7 +597,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } @Override - public int deleteByIds(String ids){ + public int deleteByIds(String ids) { String[] infoIds = ids.split(","); // 删除info表数据 SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO(); 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 c63d3936..b44506a8 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 @@ -471,6 +471,20 @@ + + + insert into SAR_STAND_ITEMS + (id, STAND_ID, items_num, items_name, TERMS_CONDITIONS,FILE_TYPE) + values + + ( + #{item.id, jdbcType=VARCHAR}, #{item.standId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, + #{item.itemsName, jdbcType=VARCHAR}, #{item.termsConditions, jdbcType=CLOB}, + #{item.fileType, jdbcType=VARCHAR} + ) + + + delete from SAR_FILE_SPLIT_ITEMS where info_id in