From 3523afae94fde56b1188501520b28416f1bf6d81 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 15 Dec 2022 13:40:20 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=AE=B5=E8=90=BD=E4=B8=AD=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E8=A7=92=E6=A0=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarFileSplitInfoEOServiceImpl.java | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) 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 40bc2020..5e4460d5 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 @@ -161,7 +161,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); - String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); + //String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); + String readFilePath = "F:\\合众未来\\项目\\福田汽车全球法规标准管理系统\\GB 1589-2016 汽车、挂车及汽车列车外廓尺寸、轴荷及质量限值.docx"; InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is); @@ -240,7 +241,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if(CollectionUtils.isNotEmpty(imageBundleList)) { addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); } else { - addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText()); + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p,0); } } } @@ -265,7 +266,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if(CollectionUtils.isNotEmpty(imageBundleList)) { addItermsConditionsImage(messageList.get(messageList.size()-1),itemValList, p,imageBundleList); } else { - addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p.getText()); + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList, p,0); } } } else if (messageNumber >= 3) { @@ -287,7 +288,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i),treeList,generalCatalogueId,sarFileSplitInfoEO ,treeListDisplay++,itemName); treeList.add(sarFileSplitMenuEO) ; message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message,itemValList,paragraphString.substring(nowStart.get(i).length())); + addItermsConditionsText(message,itemValList,p,nowStart.get(i).length()); messageList.add(message); nowStart = getNewNowStart(nowStart.get(i)); menuCanAdd = true; @@ -310,7 +311,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService SarFileSplitItemsEO message = getSarFileSplitItemsEO(sarFileSplitInfoEO.getId(),"附录",itemName,clauseContent); // 增加一条数据，需要在数结构中加一条数据 SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList("附录",treeList,generalCatalogueId,sarFileSplitInfoEO ,treeListDisplay++,""); - addItermsConditionsText(message,itemValList,paragraphString); + addItermsConditionsText(message,itemValList,p,0); treeList.add(sarFileSplitMenuEO) ; message.setMenuId(sarFileSplitMenuEO.getId()); messageList.add(message); @@ -320,7 +321,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } else { if (!p.getText().equals("") ){ - addItermsConditionsText(messageList.get(messageList.size()-1),itemValList,p.getText()); + addItermsConditionsText(messageList.get(messageList.size()-1),itemValList,p,0); } List imageBundleList = readImageInParagraph((XWPFParagraph)p); if(CollectionUtils.isNotEmpty(imageBundleList)) { @@ -517,9 +518,29 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } // 像每个条款中依次插入每一段的内容 - private void addItermsConditionsText(SarFileSplitItemsEO message, List itemsValList, String p) { - message.getItemsCondi().add(p); - message.setItermsConditions(message.getItermsConditions() + "

" + p + "

"); + private void addItermsConditionsText(SarFileSplitItemsEO message, List itemsValList, XWPFParagraph p,Integer length) { + StringBuffer buffer = new StringBuffer(); + for (XWPFRun xwrun : p.getRuns()) { + VerticalAlign subscript = xwrun.getSubscript(); + String smalltext = xwrun.getText(0); + switch (subscript) { + case BASELINE: + buffer.append(smalltext); + break; + case SUBSCRIPT: + buffer.append("" + smalltext + ""); + break; + case SUPERSCRIPT: + buffer.append("" + smalltext + ""); + break; + } + } + String text = buffer.toString(); + if (length > 0) { + text = text.substring(length); + } + message.getItemsCondi().add(text); + message.setItermsConditions(message.getItermsConditions() + "

" + text + "

"); // 判断message中是否引用到其他标准 // String testString = p; // Pattern ptest = Pattern.compile("[A-Z]{1,}/{0,1}[A-Z]{1,}\\s{0,1}[0-9]\\d*\\.?\\d*"); @@ -542,7 +563,7 @@ 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(), text, message.getItemsCondi().size(), null)); } private SarFileSplitMenuEO getTreeList(String name, List treeList, String generalCatalogueId, SarFileSplitInfoEO sarFileSplitInfoEO, Long treeListDisplay, String itemName) { From 268e8cff15a1a11ad30179d711d701463363e158 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 15 Dec 2022 13:42:14 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E7=9A=84=E6=96=87=E4=BB=B6=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitInfoEOServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 5e4460d5..5d8c03be 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 @@ -161,8 +161,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); - //String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); - String readFilePath = "F:\\合众未来\\项目\\福田汽车全球法规标准管理系统\\GB 1589-2016 汽车、挂车及汽车列车外廓尺寸、轴荷及质量限值.docx"; + String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is); From 26f87c21ac1a3529379cb9be43ca18941f7177b2 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 15 Dec 2022 14:04:13 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarFileSplitInfoEOServiceImpl.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) 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 5d8c03be..811b2a52 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 @@ -20,6 +20,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.xwpf.usermodel.*; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlObject; @@ -522,16 +523,18 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService for (XWPFRun xwrun : p.getRuns()) { VerticalAlign subscript = xwrun.getSubscript(); String smalltext = xwrun.getText(0); - switch (subscript) { - case BASELINE: - buffer.append(smalltext); - break; - case SUBSCRIPT: - buffer.append("" + smalltext + ""); - break; - case SUPERSCRIPT: - buffer.append("" + smalltext + ""); - break; + if (ObjectUtils.isNotEmpty(smalltext)) { + switch (subscript) { + case BASELINE: + buffer.append(smalltext); + break; + case SUBSCRIPT: + buffer.append("" + smalltext + ""); + break; + case SUPERSCRIPT: + buffer.append("" + smalltext + ""); + break; + } } } String text = buffer.toString(); From 83b38e8d3b10cdbf9845aa8dbae4ff7729f4b795 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 22 Dec 2022 16:49:00 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=B9=E5=BA=94=E4=B8=8A=E4=B8=8B=E8=A7=92?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitItemsEOController.java | 56 ++++++++++++++++++- .../slrs/standardSplit/entity/SplitFont.java | 9 +++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SplitFont.java 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 112b4ca0..a7ee5512 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 @@ -270,6 +270,41 @@ public class SarFileSplitItemsEOController extends BaseController subList = new ArrayList<>(); + List supList = new ArrayList<>(); + boolean handleCorner = false; + if (content.contains("")) { + handleCornerMarkers(content, supList, "",""); + } + if (content.contains("")) { + handleCornerMarkers(content, subList, "",""); + } + if (subList.size() > 0 || supList.size() > 0) { + content = content.replaceAll("", ""); + content = content.replaceAll("", ""); + content = content.replaceAll("", ""); + //设置角标font + HSSFFont fontSub = workbook.createFont(); + fontSub.setTypeOffset(HSSFFont.SS_SUB); + HSSFFont fontSup = workbook.createFont(); + fontSup.setTypeOffset(HSSFFont.SS_SUPER); + + RichTextString richTextString = new HSSFRichTextString(content); + if (subList.size() > 0) { + for (SplitFont splitFont : subList) { + richTextString.applyFont(splitFont.getStartIndex(),splitFont.getEndIndex(),fontSub); + } + } + if (supList.size() > 0) { + for (SplitFont splitFont : supList) { + richTextString.applyFont(splitFont.getStartIndex(),splitFont.getEndIndex(),fontSup); + } + } + cell2.setCellValue(richTextString); + handleCorner = true; + } + if("TABLE".equals(valList.get(valRow).getValType())){ /* 连接跳转*/ CreationHelper createHelper = workbook.getCreationHelper(); @@ -287,7 +322,9 @@ public class SarFileSplitItemsEOController extends BaseController splitFontList, String label,String remove) { + content = content.replaceAll(remove, ""); + String[] split = content.split(label); + split[0] = split[0].replaceAll("", ""); + int index = split[0].length(); + for (int i = 1; i < split.length; i++) { + SplitFont splitFont = new SplitFont(); + String text = split[i]; + String cornerLabel = text.substring(0, text.indexOf("")); + splitFont.setStartIndex(index); + splitFont.setEndIndex(index + cornerLabel.length()); + splitFontList.add(splitFont); + text = text.replaceAll("", ""); + index = index + text.length(); + } + } + @ApiOperation(value = "|SarFileSplitItemsEO|导入") @PostMapping(value = "/importSplitItemsZip") public ResponseMessage importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file, diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SplitFont.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SplitFont.java new file mode 100644 index 00000000..6d032a21 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SplitFont.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.standardSplit.entity; + +import lombok.Data; + +@Data +public class SplitFont { + Integer startIndex; + Integer endIndex; +} From a6664e7e5846129b4a0e9971510cbc0c1fda6163 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 29 Dec 2022 11:50:51 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E6=A0=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8F=8A=E5=AD=90=E8=8A=82=E7=82=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FileMaterialServiceImpl.java | 20 +++++++++++++++++-- .../slrs/zlTree/service/IZlTreeService.java | 3 +++ .../service/impl/ZlTreeServiceImpl.java | 19 ++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index 93f40f34..a77beb1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -10,18 +10,21 @@ import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.tsRoleMeunData.entity.TsRoleMenuData; import com.adc.da.slrs.tsRoleMeunData.service.ITsRoleMenuDataService; +import com.adc.da.slrs.zlTree.service.IZlTreeService; import com.adc.da.util.LoginUserUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.management.Query; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -44,6 +47,8 @@ public class FileMaterialServiceImpl extends ServiceImpl treeIds = new ArrayList<>(); + zlTreeService.subordinateTreeNodes(treeIds, queryPage.getTreeId()); + if (ObjectUtils.isEmpty(treeIds)) { return null; } + // 查看菜单是否有数据权限 + treeIds = treeIds.stream().filter(treeId -> treeIdList.contains(treeId)).collect(Collectors.toList()); + if (ObjectUtils.isEmpty(treeIds)) { + return null; + } + queryPage.setTreeIdList(treeIds); } + //dataType制空，不然节点重名会有bug + queryPage.setDataType(null); + queryPage.setTreeId(null); return fileMaterialDao.getFileMaterialPage(page,queryPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index 1ed663b7..e37b374c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.zlTree.entity.ZlTree; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Arrays; import java.util.List; /** @@ -51,4 +52,6 @@ public interface IZlTreeService extends IService { * @return */ ZlTree queryTree(String treeId); + + void subordinateTreeNodes(List treeIds,String parentTreeId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 98caaac2..4d9a6e88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -154,4 +154,23 @@ public class ZlTreeServiceImpl extends ServiceImpl implements } return null; } + + /** + * 根据树的父节点查询所有子节点id + * + * @param parentTreeId + * @return + */ + @Override + public void subordinateTreeNodes(List treeIds, String parentTreeId) { + treeIds.add(parentTreeId); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("p_id", parentTreeId); + List list = list(queryWrapper); + if (ObjectUtils.isNotEmpty(list)) { + for (ZlTree zlTree : list) { + subordinateTreeNodes(treeIds,zlTree.getId()); + } + } + } } From e9cc5528d9749b93d5a9d8e61c8400a67d40b7cf Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 29 Dec 2022 14:15:33 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FileMaterialServiceImpl.java | 10 +++++++--- .../mapper/fileMaterialCenter/FileMaterialMapper.xml | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index a77beb1e..49f72ee1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -88,10 +88,14 @@ public class FileMaterialServiceImpl extends ServiceImpl fileMaterialPage = fileMaterialDao.getFileMaterialPage(page, queryPage); + if (ObjectUtils.isNotEmpty(queryPage.getDataType())) { + List fileMaterials = fileMaterialPage.getRecords().stream().filter(fileMaterial -> fileMaterial.getDataType().equals(queryPage.getDataType())).collect(Collectors.toList()); + fileMaterialPage.setRecords(fileMaterials); + fileMaterialPage.setTotal(fileMaterials.size()); + } + return fileMaterialPage; } @Override diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index 9642feb1..886a9f25 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -38,9 +38,6 @@ and fm.id=#{flieM.id} - - AND fm.data_type like concat('%',#{flieM.dataType},'%') - AND fm.data_title like concat('%',#{flieM.dataTitle},'%') From 8bacb5befea5d48f944ba909a8bf7a8123182682 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Thu, 29 Dec 2022 14:32:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?disableFlag=E4=B8=BA1=E7=9A=84=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=9C=A8=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BA=BA=E5=91=98=E4=B8=AD=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/sarUser/TsUserMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml index 012d967b..bb1bae1c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml @@ -155,7 +155,7 @@ LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id WHERE ts_user_position.position_id in ( SELECT ts_position_role.position_id from ts_position_role - WHERE ts_position_role.role_id = #{role.roleId} ) + WHERE ts_position_role.role_id = #{role.roleId} ) and ts_user.DISABLE_FLAG = '0' and ts_user.USID like concat(concat('%',#{role.userId}),'%') @@ -177,7 +177,7 @@ LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id WHERE ts_user_position.position_id in ( SELECT ts_position_role.position_id from ts_position_role - WHERE ts_position_role.role_id = #{role.roleId} ) + WHERE ts_position_role.role_id = #{role.roleId} ) and ts_user.DISABLE_FLAG = '0' and ts_user.USID like concat(concat('%',#{role.userId}),'%') From 45c3d99ec4678aeb80013b8f6bf8962fd3057fad Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 4 Jan 2023 16:54:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9=E6=9B=BF=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E4=BD=93=E7=B3=BB=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca1a179e..d3cad04c 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 @@ -3042,7 +3042,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl wrapper=new QueryWrapper<>(); wrapper.in("MENU_NAME",sarStandardsInfoEO.getStandSystem()); - wrapper.eq("DIC_ID","wnt12e6n258qkqgcl742"); + wrapper.eq("DIC_ID","9m4qqqaansxmox5e82zm"); wrapper.orderByDesc("length(PARENT_IDS)"); List standards=iSarMenuStandardService.list(wrapper); if (null!=standards && standards.size() == 1) { From 28725ddfd8852f7e5434af224e6c2fec50142890 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Fri, 6 Jan 2023 10:31:46 +0800 Subject: [PATCH 9/9] bug64762 --- .../sarBussionessStand/SarBussionessStandMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index ecf551f9..b43f68ff 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -482,7 +482,9 @@ ) where 1=1 - + + and SAR_BUSS_STAND_ATTR_INFO.QCDW like concat(concat('%',#{QCDW}),'%') + and put_time=#{putTime} @@ -649,7 +651,9 @@ and (SAR_BUSSIONESS_STAND.STAND_CODE = #{standCode} or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') = REPLACE( #{standCode},' ','')) - + + and SAR_BUSS_STAND_ATTR_INFO.QCDW like concat(concat('%',#{QCDW}),'%') +