diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 3b76d119..6b8980ed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -159,7 +159,13 @@ public class QualityEvaluationServiceImpl extends ServiceImpl{ Double score; - switch (item.getProcessNode()){ + String value; + if (item.getProcessNode()==null){ + value=""; + }else { + value=item.getProcessNode(); + } + switch (value){ case "会签征求意见": score=Double.valueOf(item.getScore()) * 0.3; break; @@ -172,6 +178,7 @@ public class QualityEvaluationServiceImpl 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; } 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..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 @@ -88,8 +88,19 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = ""; -// zhaokaiyao - private String textStatus;//文本状态 + /** + * 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 c0fa932b..1e6d26f7 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,9 +832,19 @@ 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 + DATE_FORMAT(#{page.startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT(#{page.endIssueTime} ,'%Y-%m-%d') + AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0 @@ -964,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