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 1/2] =?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<SarStandItemsDao, SarS
         //分页查询的总数
         Integer count=dao.sarItemCount(page);
         page.getPager().setRowCount(count);
+
+        //排序
+        if (page.getOrderBy()!=null && page.getOrder()!=null){
+
+            switch (page.getOrderBy()){
+                case "itemsNum" : page.setOrderBy("ITEMS_NUM"); break;
+                default:page.setOrderBy("ITEMS_NUM"); page.setOrder("DESC");
+            }
+
+            switch (page.getOrder()){
+                case "descending":page.setOrder("DESC");break;
+                default:page.setOrder("ASC");
+            }
+        }
+
+
         List<SarStandItems> 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
         <include refid="sarItemWhere"/>
+
+        <if test="orderBy !=null and orderBy!=''">
+            order by ${orderBy} ${order}
+        </if>
         LIMIT #{page},#{pageSize}
 
     </select>

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 2/2] =?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<SarStandardsInfoDao
         return resultMap;
     }
 
+
+
     public void attrInfoShowDetails(List<SarStandardsInfo> sarlist) throws Exception {
         for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);
             Map<String, Object> getAttrMap = row.getAttrInfoMap();
             if (getAttrMap != null && getAttrMap.size() > 0) {
+                //存在的分解单文本名称列表
+                LinkedList<String> itemExistList = new LinkedList<>();
+                getAttrMap.put("itemExistList",itemExistList);
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
                     String name = entry.getKey();
                     String value = "";
@@ -452,6 +457,15 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         if (StringUtils.isNotBlank(value)) {
                             List<AttFileEO> 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();