Merge branch 'fix_20230609'

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -1398,13 +1398,14 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 									}
 
 									String configData = configDataBuilderTemp.toString();
+									if(StringUtils.isNotEmpty(configData)){
 										if (configData.contains("#")) {
 											configData = configData.substring(0, configData.lastIndexOf("#"));
 										}
-
 										configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 									}
 								}
+							}
 
 
 							String configData = configDataBuilder.toString();
@@ -1423,7 +1424,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 					} else {
 						List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
 
-						StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+						List<String> configDataList = new ArrayList<>(); // 重新组合配置数据
 
 						for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
 							StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
@@ -1458,17 +1459,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							}
 
 							configData = configDataBuilderTemp.toString();
+							if(StringUtils.isNotEmpty(configData)){
 								if (configData.contains("#")) {
 									configData = configData.substring(0, configData.lastIndexOf("#"));
 								}
-
+								configDataList.add(configData);
-							configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
+							}
 						}
 
-						String configDataStr = configDataBuilder.toString();
+						String configDataStr = configDataList.stream().distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
-						if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
-							configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
-						}
 						record1.put("params_value", configDataStr);
 
 					}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java

@@ -98,10 +98,14 @@ public class LawsWarnService {
         //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
         String flag = String.valueOf(parameter.get("flag"));
         if(StringUtils.equals(flag,"0")){
+            if(ObjectUtils.isEmpty(parameter.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
                 parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
+            }
         } else if(StringUtils.equals(flag,"1")){
+            if(ObjectUtils.isEmpty(parameter.get("implement_time"))){
                 parameter.put("implement_time",parameter.get("WarnTime"));
             }
+        }
 //        parameter.remove("WarnTime");
 
         String cut = (String) parameter.get("cut");//中英文切换标识
@@ -249,7 +253,9 @@ public class LawsWarnService {
 
                 Date newCarModelDate = null;
                 try {
+                    if(ObjectUtils.isNotEmpty(data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"))){
                         newCarModelDate = DateUtils.parseDate((String) data.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"), "yyyy-MM-dd");
+                    }
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -269,7 +275,9 @@ public class LawsWarnService {
                 }).map(PhasedImplementationDetailsEO::getImplementationDate).collect(Collectors.toList());
                 Date implementTime = null;
                 try {
+                    if(ObjectUtils.isNotEmpty(data.get("implement_time"))){
                         implementTime = DateUtils.parseDate((String) data.get("implement_time"), "yyyy-MM-dd");
+                    }
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }

jero-web/src/common/lang/en-us.js

@@ -1849,4 +1849,6 @@ module.exports = {
   transittime:'Transit Time',
   returntime:'Return time',
   operationguide:'Project operation guide',
+  copyLink:'Copy link',
+  successfulReplication:'Successful replication',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1950,4 +1950,6 @@ module.exports = {
   transittime:'通过时间',
   returntime:'退回时间',
   operationguide:'项目操作指南',
+  copyLink:'复制链接',
+  successfulReplication:'复制成功',
 }

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

@@ -230,7 +230,12 @@
           //   this.queryParam['WarnTimeText'] = '2'
           // }
           let startTime = moment(new Date()).format('YYYY-MM-DD')
-          let endTime = this.getNowdate()
+          let endTime = ''
+          if (!this.queryParam['WarnTimeText']){
+            endTime = '2099-01-01'
+          }else{
+            endTime = this.getNowdate()
+          }
           if(this.queryParam['WarnTimeText'] == '5'){
             this.queryParam['WarnTime'] = [endTime, startTime]
           }else{

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -127,6 +127,10 @@
               </div>
             </div>
             <div class="content-box-button-right">
+              <div class="content-box-button-text" @click="copyLinkClick(item)">
+                <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+                {{$t('copyLink')}}
+              </div>
               <div class="content-box-button-text" @click="pushJump(item)">
                 <img src="~/@assets/feishu.png" alt="" class="jumpicon">
                 {{$t('contactTheFounder')}}
@@ -424,9 +428,9 @@
         this.queryForm = row
         this.$refs.SelectedByRef.getPush()
       },
-      pushJump(row){
+      pushJump(row) {
         let query = {
-          userName: row.createBy,
+          userName: row.createBy
         }
         postAction('/lark/getLarkApplinkByUserName', query).then((res) => {
           if (res.code === 200) {
@@ -465,6 +469,12 @@
       },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
+      },
+      copyLinkClick(item) {
+        let text = window.location.host + this.$route.path + '?id=' + item.id
+        navigator.clipboard.writeText(text).then((res) => {
+          this.$message.success(this.$t('successfulReplication'))
+        })
       }
     }
   }
@@ -476,10 +486,12 @@
     overflow: hidden;
     /*margin: 0 auto;*/
   }
-  .jumpicon{
+
+  .jumpicon {
     height: 13.72px;
     width: 15.44px;
   }
+
   .box-title-text {
     line-height: 1.4;
     width: 360px;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue

@@ -53,6 +53,10 @@
           </div>
         </div>
         <div class="content-box-button-right">
+          <div class="content-box-button-text" @click="copyLinkClick(queryForm)">
+            <img src="~/@assets/feishu.png" alt="" class="jumpicon">
+            {{$t('copyLink')}}
+          </div>
           <div class="content-box-button-text" @click="pushJump(queryForm)">
             <img src="~/@assets/feishu.png" alt="" class="jumpicon">
             {{$t('contactTheFounder')}}
@@ -493,6 +497,12 @@
             this.$refs.SelectedByRef.submitLoading = false
           }
         })
+      },
+      copyLinkClick(item) {
+        let text = window.location.host + this.$route.path + '?id=' + item.id
+        navigator.clipboard.writeText(text).then((res) => {
+          this.$message.success(this.$t('successfulReplication'))
+        })
       }
     }
   }

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -2802,6 +2802,7 @@
               if (this.updateFlowStatusList && this.updateFlowStatusList.length > 0) {
                 this.updateFlowStatusBatch()
               }
+              this.completeTaskList = []
               for (let i = 0; i < this.startProcessList.length; i++) {
                 if (this.startProcessList[i].type == 2) {
                   this.startProcessList[i].dataList.designDutyDueDate = this.formInline.designDutyDueDate
@@ -2829,6 +2830,7 @@
             Promise.all(this.completeTaskList).then((res) => {
               if (this.requestsNum == res.length) {
                 this.visible = false
+                this.formInline = {}
                 this.selectedRowKeys = []
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.confirmLoading = false

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -5,19 +5,19 @@
               :searchQueryList="searchQueryList"
               :flag="'1'"
               :isDefault="true"
-              :url="url"/>
+              :url="url" />
     </div>
     <div class="table-operator">
       <div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
            class="operator-text">
-        <a-icon type="share-alt"/>
+        <a-icon type="share-alt" />
-        {{$t('share')}}
+        {{ $t('share') }}
       </div>
       <div @click="handleExport"
            v-has="'regulatoryEarlyWarning:export'"
            class="operator-text">
-        <a-icon type="export" :rotate="-90"/>
+        <a-icon type="export" :rotate="-90" />
-        {{$t('export')}}
+        {{ $t('export') }}
       </div>
     </div>
     <div>
@@ -40,39 +40,39 @@
         :columns="columns"
       >
         <span slot="serial_number" slot-scope="text,result">
-            <a @click="standClick(result)" :title="text">{{text}}</a>
+            <a @click="standClick(result)" :title="text">{{ text }}</a>
         </span>
         <span slot="vehicleInProductionDate" slot-scope="text,result" :title="text">
               <span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'red'">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else>
-                   {{text}}
+                   {{ text }}
                </span>
         </span>
         <span slot="ImplementationDate" slot-scope="text,result" :title="text">
               <span v-if="result.new_colour == 'yellow'" style="color: #fdd835">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else-if="result.new_colour == 'red'" style="color: red">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else>
-                   {{text}}
+                   {{ text }}
                </span>
         </span>
         <span slot="vehicleInProductionDate" slot-scope="text,result" :title="text">
               <span v-if="result.implement_colour == 'yellow'" style="color: #fdd835">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else-if="result.implement_colour == 'red'" style="color: red">
-                   {{text}}
+                   {{ text }}
               </span>
                <span v-else>
-                   {{text}}
+                   {{ text }}
                </span>
         </span>
       </a-table>
@@ -98,20 +98,20 @@
 </template>
 
 <script>
-  import search from '@/components/search/index'
+import search from '@/components/search/index'
-  import libraryPush from '@/components/libraryPush/index'
+import libraryPush from '@/components/libraryPush/index'
-  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-  import moment from 'moment'
+import moment from 'moment'
-  import eventBUs from '../../common/event'
+import eventBUs from '../../common/event'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-  export default {
+export default {
   name: 'index',
   components: {
     search,
     libraryPush
   },
-    mixins: [ResizeColumnProvide,ResizeHeader],
+  mixins: [ResizeColumnProvide, ResizeHeader],
   data() {
     return {
       //url传参严格按照当前命名
@@ -137,7 +137,7 @@
           option: [
             {
               value: '1',
-                name:this.$t('inRecentMonths3')
+              name: this.$t('inRecentMonths3')
             },
             {
               value: '2',
@@ -158,7 +158,7 @@
             {
               value: '6',
               name: this.$t('inRecentYear3')
-              },
+            }
           ]
         }
       ],
@@ -258,7 +258,7 @@
     eventBUs.$off('searchQuery')
   },
   methods: {
-      standClick(val){
+    standClick(val) {
       let newUrl = this.$router.resolve({
         path: '/docManage/library/detail',
         query: {
@@ -316,11 +316,13 @@
       this.selectedRowKeys = []
     },
     clearSelected() {
+      let endTime = ''
       if (!this.searchParmes['WarnTimeText']) {
-          this.searchParmes['WarnTimeText'] = '2'
+        endTime = '2099-01-01'
+      } else {
+        endTime = this.getNowdate()
       }
       let startTime = moment(new Date()).format('YYYY-MM-DD')
-        let endTime = this.getNowdate()
       this.searchParmes['WarnTime'] = [startTime, endTime]
       this.searchParmes = { ...this.searchParmes }
       this.pageNo = 1
@@ -341,10 +343,47 @@
       } else if (this.searchParmes['WarnTimeText'] == '4') {
         monthData = 25
         yearData = 2
-        }else if (this.queryParam['WarnTimeText'] == '6') {
+      } else if (this.searchParmes['WarnTimeText'] == '5') {
+        monthData = 7
+        yearData = -1
+      } else if (this.searchParmes['WarnTimeText'] == '6') {
         monthData = 37
         yearData = 3
       }
+      if (this.searchParmes['WarnTimeText'] == '5') {
+        var time = new Date()
+        time.setTime(time.getTime())
+        var s2 = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate()
+        var monthNum = 6 //要减的月数(6)自己定义
+        var dateArr = s2.split('-') //s2当前时间
+        var year = dateArr[0] //获取当前日期的年份
+        var month = dateArr[1] //获取当前日期的月份
+        var day = dateArr[2] //获取当前日期的日
+        var days = new Date(year, month, 0)
+        days = days.getDate() //获取当前日期中月的天数
+        var year2
+        if (month < 6) {
+          year2 = year - 1
+        } else {
+          year2 = year
+        }
+        var month2 = parseInt(month) - monthNum
+        if (month2 <= 0) {
+          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()//获取当前时间的月份
@@ -368,7 +407,10 @@
         }
         var time = year2 + '-' + month2 + '-' + day2
         return time
+      }
+
     },
+
     pageOnChange(page) {
       this.pageNo = page
       this.getList()
@@ -405,27 +447,27 @@
       })
     }
   }
-  }
+}
 </script>
 
 <style scoped lang="less">
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 
-  .page {
+.page {
   text-align: right;
   margin-top: 20px;
-  }
+}
 
-  ::v-deep .ant-table-row:first-child {
+::v-deep .ant-table-row:first-child {
   background: #fff !important;
   opacity: 0.9;
-  }
+}
 
-  ::v-deep .ant-table-body {
+::v-deep .ant-table-body {
   background: transparent !important;
-  }
+}
 
-  /deep/ .ant-table-placeholder{
+/deep/ .ant-table-placeholder {
   margin-top: 8px !important;
-  }
+}
 </style>