From 057ce691d682e6047ec366ecb46678348a425a7b Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 25 Dec 2021 13:40:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E5=AD=97=E5=85=B8=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SarStandardsInfoMapper.xml | 231 +++++++++++++++++-
.../java/com/adc/da/sys/dao/DicTypeEODao.java | 8 +
.../mybatis/mapper/sys/DicTypeEOMapper.xml | 12 +
3 files changed, 248 insertions(+), 3 deletions(-)
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 478171c9..cc542bc4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -106,6 +106,47 @@
dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
+
+ SAR_STANDARDS_INFO.id,
+ SAR_STANDARDS_INFO.stand_type,
+ SAR_STANDARDS_INFO.country,
+ SAR_STANDARDS_INFO.stand_sort,
+ SAR_STANDARDS_INFO.stand_number,
+ SAR_STANDARDS_INFO.stand_year,
+ SAR_STANDARDS_INFO.stand_name,
+ SAR_STANDARDS_INFO.stand_en_name,
+ SAR_STANDARDS_INFO.stand_state,
+ SAR_STANDARDS_INFO.stand_nature,
+ SAR_STANDARDS_INFO.issue_time,
+ SAR_STANDARDS_INFO.put_time,
+ concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis,
+ concat(replace_stand_num, '') as replace_stand_num,
+ replaced_stand_num,
+ SAR_STANDARDS_INFO.creation_user,
+ SAR_STANDARDS_INFO.valid_flag,
+ SAR_STANDARDS_INFO.creation_time,
+ SAR_STANDARDS_INFO.modify_time,
+ dicstandSort.DIC_TYPE_NAME as standSortShow,
+ dicstandNature.DIC_TYPE_NAME as standNatureShow,
+ dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,
+ is_relate_access,
+ cite_stand,
+ cited_stand,
+ SAR_STANDARDS_INFO.text_status,
+ SAR_STANDARDS_INFO.STAND_SYSTEM
+
+
+
+
+ SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort,
+ SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
+ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
+ concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
+ SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time, dicstandSort.DIC_TYPE_NAME,
+ dicstandNature.DIC_TYPE_NAME,
+ dicstandTextStatus.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
+
+
SAR_STANDARDS_INFO.id, SAR_STANDARDS_INFO.stand_type, SAR_STANDARDS_INFO.country, SAR_STANDARDS_INFO.stand_sort,
SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name,
@@ -587,6 +628,190 @@
+
+
+
+
+ left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = SAR_STANDARDS_INFO.stand_sort and
+ dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null)
+
+ LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+ dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+ AND dicstandTextStatus.dic_id IS NOT NULL
+ AND dicstandTextStatus.valid_flag = 0
+ )
+
+ LEFT JOIN TS_DICTYPE dicstandNature ON (
+ dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature
+ AND dicstandNature.dic_id IS NOT NULL
+ AND dicstandNature.valid_flag = 0
+ )
+
+
+ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
+ left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
+ left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
+ left join TS_PERSON_COLLECT on (TS_PERSON_COLLECT.COLLECT_RES_ID = SAR_STANDARDS_INFO.id and TS_PERSON_COLLECT.VALID_FLAG=0)
+ where 1=1 and SAR_STANDARDS_INFO.valid_flag=0
+
+
+
+ and stand_type = #{standType}
+
+
+
+
+ and country = #{country}
+
+
+
+ and (
+ (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+ SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+ or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+ )
+
+ or (stand_name like concat(concat('%',#{standNumber}),'%'))
+ )
+
+
+
+ and stand_name like concat(concat('%',#{standName}),'%')
+ or STAND_NUMBER like concat(concat('%',#{standName}),'%')
+ or STAND_YEAR like concat(concat('%',#{standName}),'%')
+ or STAND_SORT like concat(concat('%',#{standName}),'%')
+
+
+ and stand_en_name like concat(concat('%',#{standEnName}),'%')
+
+
+
+ and stand_state = #{standState}
+
+
+
+
+ and stand_nature = #{standNature}
+
+
+
+ and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%')
+
+
+
+ and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%')
+
+
+ and is_relate_access = #{isRelateAccess}
+
+
+
+ and SAR_STAND_MENU.MENU_ID in
+
+ #{item}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and SAR_STAND_MENU.MENU_ID in
+
+ #{item}
+
+
+
+
+
+
+
+
+
+
+
+ and SAR_STANDARDS_INFO.id in
+
+ #{item}
+
+
+
+ and SAR_STANDARDS_INFO.stand_sort = #{standSort}
+
+
+
+ and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear}
+
+
+ and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime}
+
+
+
+ AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0
+
+
+
+
+ and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus}
+
+
+
+ and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess}
+
+
+
+ and SAR_STANDARDS_INFO.id in (
+ select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
+ and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+ and TS_PERSON_COLLECT.user_id=#{userId}
+ )
+
+
+
+ and SAR_STAND_ATTR_INFO.GXHBQ is not null
+
+
+ and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%')
+
+
+
+ and SAR_STAND_ATTR_INFO.CLLX = #{applyArctic}
+
+
+
+ and (${advanceSearchStr})
+
+
+
+
ORDER BY
@@ -1323,10 +1548,10 @@
+
+
+
+
From cdffdad6ad6c0ae5127a52067484110a760efdcd Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 27 Dec 2021 16:07:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E5=AD=97=E5=85=B8=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/SarStandardsInfoServiceImpl.java | 34 ++++++++++++++++++-
1 file changed, 33 insertions(+), 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 95671ab9..aab3ee7c 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
@@ -714,7 +714,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception {
+ public void attrInfoShowExport(List sarlist) throws Exception {
+
+ List dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name");
+ Map dicMap =
+ dicInfo.stream()
+ .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2));
+
+
for (SarStandardsInfo row : sarlist) {
attrInfoDetailsExport(row);
Map getAttrMap = row.getAttrInfoMap();
@@ -724,6 +731,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl entry : getAttrMap.entrySet()) {
String name = entry.getKey();
String value = "";
+
+ /**
+ *============================ 对getAttrMap的value赋值中文名称===============================
+ */
+ if(entry.getValue()!=null) {
+ StringBuilder builder = new StringBuilder("");
+ for (String s : entry.getValue().toString().split(",")) {
+
+ if (dicMap.containsKey(s)) {
+ builder.append(dicMap.get(s)+" ");
+ } else {
+ builder.append(entry.getValue().toString());
+ }
+
+ getAttrMap.put(name, builder.toString());
+
+ }
+ }
+ /**
+ *============================ 对getAttrMap的value赋值中文名称===============================
+ */
+
if ("SVPPS".equals(name)) {
Object svpps = entry.getValue();
if (svpps != null && StringUtils.isNotBlank(svpps.toString())) {
@@ -760,6 +789,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl