From a8544607de42c7a0ca0f74ec503750ae236c45f6 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 10:55:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardsInfoEOPage.java | 12 +++++++++++- .../sarStandardsInfo/SarStandardsInfoMapper.xml | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 6b48976e..b9dd21e3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -88,8 +88,18 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = ""; -// zhaokaiyao + /** + * zhaokaiyao + */ private String textStatus;//文本状态 + /** + * 日期范围查询发布日期开始 + */ + private String startIssueTime; + /** + * 日期范围查询发布日期结束 + */ + private String endIssueTime; } 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 7c8e4c57..b1312c4c 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 @@ -832,8 +832,12 @@ and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear} + - 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 #(page.startIssueTime) + and #(page.endIssueTime) From 904d7a993db6f8fd72ec152a942695fb416d9014 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 14:50:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84excel=20=E8=AE=A1=E5=88=92=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=97=B6=E9=97=B4=E5=8E=BB=E6=8E=89=E6=97=B6=E5=88=86?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandUnqualified.java | 10 +++++++++- .../impl/SarStandUnqualifiedServiceImpl.java | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 5018002c..69ad5b1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -146,13 +146,21 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ExcelProperty("计划关闭时间") + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") private Date planCloseTime; + + @ExcelProperty("计划关闭时间") + @ApiModelProperty(value = "计划关闭时间excel导出") + + @TableField(exist = false) + private String planCloseTimeExport; + + @ExcelIgnore @ApiModelProperty(value = "主键") @TableId(type = IdType.UUID) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index aaaff4f2..1e8c240c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -165,6 +167,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + // 去掉日期时分秒 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + + stand.forEach(item->{ + + Optional.ofNullable(item.getPlanCloseTime()) + .ifPresent(time ->{ + item.setPlanCloseTimeExport(sdf.format(time)); + }); + + }); + List a = stand; return a; } From e491589af995bfa3b4658163180c6ef3f0f166bc Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 15:12:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=BA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84excel=20=E5=BF=BD=E7=95=A5productId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 69ad5b1c..65dfec0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -51,6 +51,7 @@ public class SarStandUnqualified extends BaseEntity { @TableField("STAND_NAME") private String standName; + @ExcelIgnore @ApiModelProperty(value = "项目编号") @TableField("product_id") private String productId; From 20877855aaa92578fee8a42adf0a52918f68bd6c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Fri, 17 Dec 2021 16:11:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=20=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandardsInfoEOPage.java | 3 ++- .../SarStandardsInfoMapper.xml | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index b9dd21e3..62203ee5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -90,8 +90,9 @@ public class SarStandardsInfoEOPage extends BasePage { /** * zhaokaiyao + * 文本状态 */ - private String textStatus;//文本状态 + private String textStatus; /** * 日期范围查询发布日期开始 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 b1312c4c..36647eeb 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 @@ -834,10 +834,16 @@ + 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 #(page.startIssueTime) - and #(page.endIssueTime) + between + DATE_FORMAT(#{page.startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT(#{page.endIssueTime} ,'%Y-%m-%d') @@ -968,6 +974,15 @@ and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime} + + + and + DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') + between + DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 From 09e7e2ffeef3b5e644948ced268316d08b20a6b5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 20 Dec 2021 13:51:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89total=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandardsInfoDao.java | 2 + .../impl/SarStandardsInfoServiceImpl.java | 2 +- .../SarStandardsInfoMapper.xml | 123 ++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) 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 e3d4b902..fafcea69 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 @@ -25,6 +25,8 @@ public interface SarStandardsInfoDao extends BaseMapper { int getSarStandardsInfoCount(SarStandardsInfoEOPage page); + int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page); + int insertSelective(SarStandardsInfo page); SarStandardsInfo selectByPrimaryKeyAndModifyTime(SarStandardsInfo page); 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 48b557dc..c4a0878c 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 @@ -342,7 +342,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page,"996"); attrInfoCollect(sarlist); 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 7c8e4c57..c0fa932b 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 @@ -987,6 +987,121 @@ + + + left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id + 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 (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) ) + ) + + + + and stand_name 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} + ) + + + @@ -1019,6 +1134,14 @@ GROUP BY SAR_STANDARDS_INFO.id) a + +