From ba7dd3317602beb11b35063a5aacfff3ed2266ba Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Tue, 14 Sep 2021 17:40:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93=E6=A0=87=E5=87=86=E5=8F=B7/?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml | 2 ++ 1 file changed, 2 insertions(+) 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 117b6e2c..305cb1c0 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 @@ -50,6 +50,7 @@ and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') limit #{start},#{end} @@ -73,6 +74,7 @@ and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') From bcf47c93e1390d6c10cd6f76abb70b490767771d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Sep 2021 16:34:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E4=BA=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarInstitution/TsInstitutionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index 600754b7..ba3d2104 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -50,7 +50,7 @@ - where u.uname like concat('%','${userName}','%') + where u.uname like concat('%','${userName}','%') or u.account like concat('%','${userName}','%') From 180b755beca6bc053ea1b781124fc732e189cfe5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Sep 2021 17:07:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 16 ++++++++++++++++ .../mapper/SarStandItems/SarStandItemsMapper.xml | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 056c111f..a0fbafa7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -201,6 +201,22 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems = dao.querySarItemAndInterpretation(page); return sarStandItems; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 748bf902..0482c52c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -412,6 +412,10 @@ FROM sar_stand_items + + + order by ${orderBy} ${order} + LIMIT #{page},#{pageSize} From d6331ab155748668e1017577ecf4b1a118a3618a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Sep 2021 18:01:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85,?= =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E5=88=86=E8=A7=A3=E7=9A=84=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=89=8D=E6=9C=89=E5=88=86=E8=A7=A3=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 3528e41d..31c274c3 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 @@ -439,11 +439,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { + //存在的分解单文本名称列表 + LinkedList itemExistList = new LinkedList<>(); + getAttrMap.put("itemExistList",itemExistList); for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -452,6 +457,15 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); + //以标准id和文本类型查询分解单表 有数据设标记为为 1 + FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); + sarItemCount.setStandId(row.getId()); + sarItemCount.setFileType(name); + Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount); + if (sarItemsCount>0){ + //存在分解单的文本名称存入列表 + itemExistList.add(name); + } } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { value = entry.getValue().toString(); From 6e88f37c28f9874bc189bfde162adfd431e702c5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Sep 2021 15:00:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/SarPublicIdeaServiceImpl.java | 3 +- .../impl/SarStandItemsServiceImpl.java | 33 +++++++++++++++++-- .../SarStandItems/SarStandItemsMapper.xml | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) 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 9c2466f9..f5c6e163 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 @@ -55,8 +55,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl page = new Page<>(p, size); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index a0fbafa7..cc30e365 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -19,8 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; /** *

@@ -193,7 +192,35 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ - return dao.selectAllItemsByIds(type,ids); + List list=dao.selectAllItemsByIds(type,ids); + List res=new ArrayList<>(); + if (null == list || list.isEmpty()){ + return list; + }else { + List integerList=new ArrayList<>(); + Map> map=new HashMap<>(); + list.forEach(sarStandItemsDto -> { + int a= sarStandItemsDto.getItemsNum().indexOf("."); + String mark=sarStandItemsDto.getItemsNum(); + if (a>0){ + mark=mark.substring(0,a); + } + if (null != map.get(Integer.valueOf(mark))){ + map.get(Integer.valueOf(mark)).add(sarStandItemsDto); + }else { + integerList.add(Integer.valueOf(mark)); + List middle=new ArrayList<>(); + middle.add(sarStandItemsDto); + map.put(Integer.valueOf(mark),middle); + } + }); + Collections.sort(integerList); + integerList.forEach(integer -> { + res.addAll(map.get(integer)); + }); + + return res; + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 0482c52c..64aa146f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -742,6 +742,7 @@ #{item} + order by ITEMS_NUM