From c9e08a1fb557691d4b5cfbed0ab801d931b89983 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 22 Dec 2021 20:34:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2=20=E6=80=BB=E6=95=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandardsInfoDao.java | 2 +- .../SarStandardsInfoMapper.xml | 127 +++++++++++------- 2 files changed, 80 insertions(+), 49 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index fafcea69..0b9dfd4b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -23,7 +23,7 @@ public interface SarStandardsInfoDao extends BaseMapper { List getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark); - int getSarStandardsInfoCount(SarStandardsInfoEOPage page); + int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page); int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page); 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 062c1cba..7d6da394 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 @@ -886,67 +886,81 @@ left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id + 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 SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0) where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 - - and stand_type = #{standType} + + and stand_type = #{page.standType} - - and country = #{country} + + and country = #{page.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}),'%'),' ','')) + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.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('%',#{page.standNumber}),'%'),' ','')) + + or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) ) + ) + + ) - - and stand_name like concat(concat('%',#{standName}),'%') + + and stand_name like concat(concat('%',#{page.standName}),'%') + + + - - and stand_en_name like concat(concat('%',#{standEnName}),'%') + + and stand_en_name like concat(concat('%',#{page.standEnName}),'%') - - and stand_state = #{standState} + + and stand_state = #{page.standState} - - and stand_nature = #{standNature} + + and stand_nature = #{page.standNature} - - and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + and SAR_STAND_ATTR_INFO.DTBJH like concat(concat('%',#{page.replaceStandNum}),'%') - - and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') + + and replaced_stand_num like concat(concat('%',#{page.replacedStandNum}),'%') - - and is_relate_access = #{isRelateAccess} + + and is_relate_access = #{page.isRelateAccess} - + and SAR_STAND_MENU.MENU_ID in - + #{item} - + and SAR_STAND_MENU.MENU_ID in - + #{item} @@ -958,52 +972,68 @@ - + and SAR_STANDARDS_INFO.id in - + #{item} - - and SAR_STANDARDS_INFO.stand_sort = #{standSort} + + and SAR_STANDARDS_INFO.stand_sort = #{page.standSort} - - and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear} + + and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear} - - and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime} + + + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{page.issueTime} - - + + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') between - DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + DATE_FORMAT(#{page.startIssueTime} ,'%Y-%m-%d') and - DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + DATE_FORMAT(#{page.endIssueTime} ,'%Y-%m-%d') - - AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 + + AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0 - - and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus} + + and SAR_STANDARDS_INFO.TEXT_STATUS = #{page.textStatus} - - and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{page.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 TS_PERSON_COLLECT.user_id=#{page.userId} ) + + + + and SAR_STAND_ATTR_INFO.GXHBQ is not null + + + and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{page.labelMenuId}),'%') + + + + and SAR_STAND_ATTR_INFO.CLLX = #{page.applyArctic} + + + and (${page.advanceSearchStr}) + @@ -1148,8 +1178,9 @@ From d4120362805fea41851b6eb8eb7308c6589dd204 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 23 Dec 2021 14:02:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=20dataExplain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index 6533651e..a3207127 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -50,6 +50,10 @@ public class FileMaterial extends BaseEntity { @TableField("attach_file_id") private String attachFileId; + @ApiModelProperty(value = "资料说明") + @TableField("data_explain") + private String dataExplain; + @ApiModelProperty(value = "点击量") @TableField("click_count") From 5c0756fcbf314c45f1cf6d79c15c2be321beafc3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 23 Dec 2021 14:23:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java index 670b4fc7..b8e69de7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -36,6 +36,8 @@ public class SarModelTree extends BaseEntity { @TableField("PID") private String pid; + + @ApiModelProperty(value = "查询子节点时,使用model与结果对比,筛选出与父节点不同的数据") @TableField("MODEL") private String model; From 2bd9e7f323406167a63ff46432e3ad0236c6e924 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 23 Dec 2021 16:11:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 5 ----- 1 file changed, 5 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 7d6da394..478171c9 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 @@ -910,11 +910,6 @@ and ( (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.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('%',#{page.standNumber}),'%'),' ','')) - - or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) ) - - ) )