法规预警搜索条件修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -2216,7 +2216,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //文档动态,  文档库中新增了标准XXXX  homeDocumentDynamicEOService
         //The standard GB 7258-2017 Technical specifications  has been added to the document library.
         String msgContentCn = "文档库中新增了"+categoryCn+" "+serialNumber+" "+title;
-        String msgContentInfoCn = "文档中库新增了"+hrefCn;
+        String msgContentInfoCn = "文档库中新增了"+hrefCn;
         HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
         homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library.");
         homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library.");

jero-web/src/components/search/index.vue

@@ -231,7 +231,11 @@
           // }
           let startTime = moment(new Date()).format('YYYY-MM-DD')
           let endTime = this.getNowdate()
-          this.queryParam['WarnTime'] = [startTime, endTime]
+          if(this.queryParam['WarnTimeText'] == '5'){
+            this.queryParam['WarnTime'] = [endTime, startTime]
+          }else{
+            this.queryParam['WarnTime'] = [startTime, endTime]
+          }
           this.queryParam = { ...this.queryParam }
         }
         eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
@@ -288,30 +292,69 @@
         } else if (this.queryParam['WarnTimeText'] == '4') {
           monthData = 25
           yearData = 2
+        }else if (this.queryParam['WarnTimeText'] == '5') {
+          monthData = 7
+          yearData = -1
         }
-        var date_now = new Date()//获取当前时间
+        if(this.queryParam['WarnTimeText'] == '5'){
-        var year = date_now.getFullYear()//获取当前时间的年份
+          var time = new Date();
-        var month = date_now.getMonth()//获取当前时间的月份
+          time.setTime(time.getTime());
-        var day = date_now.getDate()//获取当前时间的日
+          var s2 = time.getFullYear()+"-" + (time.getMonth()+1) + "-" + time.getDate();
-        var days = new Date(year, month, 0)//将获取到的年月赋值给days
+          var monthNum=6; //要减的月数(6)自己定义
-        days = days.getDate()//获取当前年月的日
+          var dateArr = s2.split('-'); //s2当前时间
-        var year2 = year
+          var year = dateArr[0]; //获取当前日期的年份
-        var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份
+          var month = dateArr[1]; //获取当前日期的月份
-        if (month2 > 12) {
+          var day = dateArr[2]; //获取当前日期的日
-          year2 = parseInt(year2) + yearData
+          var days = new Date(year, month, 0);
-          month2 = parseInt(month2) % 12
+          days = days.getDate(); //获取当前日期中月的天数
-        }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
+          var year2;
-        var day2 = day
+          if(month <6){
-        var days2 = new Date(year2, month2, 0)
+            year2 = year -1;
-        days2 = days2.getDate()
+          }else{
-        if (day2 > days2) {
+            year2 = year;
-          day2 = days2
+          }
-        }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
+          var month2 = parseInt(month) - monthNum;
-        if (month2 < 10) {
+          if (month2 <=0) {
-          month2 = '0' + month2
+            year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12);
+            month2 = 12 - (Math.abs(month2) % 12);
+          }
+          var day2 = day;
+          var days2 = new Date(year2, month2, 0);
+          days2 = days2.getDate();
+          if (day2 > days2) {
+            day2 = days2;
+          }
+          if (month2 < 10) {
+            month2 = '0' + month2;
+          }
+          var t2 = year2 + '-' + month2 + '-' + day2;
+          return t2
+        }else{
+          var date_now = new Date()//获取当前时间
+          var year = date_now.getFullYear()//获取当前时间的年份
+          var month = date_now.getMonth()//获取当前时间的月份
+          var day = date_now.getDate()//获取当前时间的日
+          var days = new Date(year, month, 0)//将获取到的年月赋值给days
+          days = days.getDate()//获取当前年月的日
+          var year2 = year
+          var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份
+          if (month2 > 12) {
+            year2 = parseInt(year2) + yearData
+            month2 = parseInt(month2) % 12
+          }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
+          var day2 = day
+          var days2 = new Date(year2, month2, 0)
+          days2 = days2.getDate()
+          if (day2 > days2) {
+            day2 = days2
+          }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
+          if (month2 < 10) {
+            month2 = '0' + month2
+          }
+          var time = year2 + '-' + month2 + '-' + day2
+          return time
         }
-        var time = year2 + '-' + month2 + '-' + day2
+
-        return time
       },
       dateChange(item) {
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')