Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -33,6 +33,7 @@ import com.jero.modules.utils.HanYuPinYinUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -186,6 +187,17 @@ public class SysDictController {
 				ls = sysDictService.queryDictItemsByCode(dictCode);
 			}
 
+			// 将结果集进行排序
+			if (CollectionUtils.isNotEmpty(ls)) {
+				// 匿名比较器排序
+				Collections.sort(ls, new Comparator<DictModel>() {
+					@Override
+					public int compare(DictModel p1, DictModel p2) {
+						return p1.getText().compareTo(p2.getText());
+					}
+				});
+			}
+
 			result.setSuccess(true);
 			result.setResult(ls);
 			log.debug(result.toString());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java

@@ -338,7 +338,7 @@ public class CertificationInventoryJob implements Job {
             // 只要早于当前日期都算逾期
             boolean flag = false;
             if(data.getEndTime() != null){
-                flag = (data.getEndTime().before(currentDate));
+                flag = (data.getEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getEndTime())));
             }
             return flag;
         }).collect(Collectors.toList());

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -338,9 +338,6 @@ import ImportFile from '@/components/ImportFileData/index'
               {
                 gnmc:'自适应巡航控制(ACC)'
               },
-              {
-                gnmc:'自适应巡航控制(ACC)'
-              },
               {
                 gnmc:'智能泊车辅助(IPA)'
               },

jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue

@@ -49,7 +49,7 @@
           <span class='text-text' style='height: 450px;line-height: 450px' :title="$t('positioningandnavigationsystem')">
             &nbsp;&nbsp;{{$t('positioningandnavigationsystem')}}
           </span>
-          <span class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
+          <span style="padding: 5px" class='text-text-three' :title="$t('vehiclesatellitepositioningequipment')">
             &nbsp;&nbsp;{{$t('vehiclesatellitepositioningequipment')}}
           </span>
           <span class='text-text-three' :title="$t('inertialnavigationsystem')">
@@ -69,7 +69,7 @@
           &nbsp;&nbsp;{{$t('vehiclecommunicationsystem')}}
         </span>
         <span class='text-box-four'>
-          <span class='four-text-text' :title="$t('signalingdevices')">
+          <span style="padding: 10px" class='four-text-text' :title="$t('signalingdevices')">
             &nbsp;&nbsp;{{$t('signalingdevices')}}
           </span>
           <span class='four-text' :title="$t('driverassistancefunctioncontrols')">
@@ -307,7 +307,7 @@ export default {
           fillincontent:this.$t('yesisselected'),
         },
         {
-          key: 'jgldBzwz', 
+          key: 'jgldBzwz',
           val:'',
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
@@ -887,7 +887,7 @@ export default {
                 })
                 this.dataSourceList=res.result.kzq
               }
-             
+
               this.dataSource.forEach(item=>{
                  for(let key in res.result.bj){
                   if(item.key==key){
@@ -895,7 +895,7 @@ export default {
                   }
                  }
               })
-              
+
 
               // res.result.bj.forEach(item=>{
               //   if(Number(item) !=NaN){
@@ -905,7 +905,7 @@ export default {
               this.query=res.result.bj
           }
         })
-        
+
       },
     click(value){
       this.fileList = value
@@ -1060,6 +1060,7 @@ button{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 200px;
   line-height: 200px;
@@ -1068,6 +1069,7 @@ button{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 100px;
   line-height: 100px;
@@ -1076,6 +1078,7 @@ button{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 50px;
   line-height: 50px;
@@ -1084,6 +1087,7 @@ button{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 250px;
   line-height: 250px;
@@ -1092,6 +1096,7 @@ button{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 150px;
   line-height: 150px;
@@ -1099,55 +1104,73 @@ button{
 .text-box{
   display: inline-block;
   float: left;
-  border: #e8e8e8 solid 1px;
+  /*border: #e8e8e8 solid 1px;*/
   width: 100%;
   height: 400px;
-  line-height: 400px;
+  line-height: 20px;
 }
 .text-box-two{
   display: inline-block;
   float: left;
-  border: #e8e8e8 solid 1px;
+  /*border: #e8e8e8 solid 1px;*/
   width: 100%;
   height: 450px;
-  line-height: 450px;
+  line-height: 20px;
 }
 .text-text{
-  display: inline-block;
+  /*display: inline-block;*/
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 50%;
   height: 400px;
-  line-height: 400px;
+  line-height: 20px;
+  display: flex;
+  justify-content: left;
+  align-items: center;
 }
 .text-text-two{
-  display: inline-block;
+  /*display: inline-block;*/
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 50%;
   height: 200px;
-  line-height: 200px;
+  padding: 10px;
+  line-height: 20px;
+  display: flex;
+  justify-content: left;
+  align-items: center;
 }
 .text-text-three{
-  display: inline-block;
+  /*display: inline-block;*/
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 50%;
   height: 100px;
-  line-height: 100px;
+  line-height: 20px;
+  display: flex;
+  justify-content: left;
+  align-items: center;
 }
 .text-text-five{
-  display: inline-block;
+  /*display: inline-block;*/
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 50%;
   height: 50px;
   line-height: 50px;
+  display: flex;
+  justify-content: left;
+  align-items: center;
 }
 .text-box-three{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 250px;
   line-height: 250px;
@@ -1155,15 +1178,16 @@ button{
 .text-box-four{
   display: inline-block;
   float: left;
-  border: #e8e8e8 solid 1px;
+  /*border: #e8e8e8 solid 1px;*/
   width: 100%;
   height: 600px;
   line-height: 600px;
 }
 .four-text-text{
-  display: inline-block;
+  /*display: inline-block;*/
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 50%;
   height: 600px;
   line-height: 20px;
@@ -1172,17 +1196,23 @@ button{
   align-items: center;
 }
 .four-text{
-  display: inline-block;
+  /*display: inline-block;*/
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 50%;
   height: 150px;
-  line-height: 150px;
+  display: flex;
+  line-height: 20px;
+  justify-content: left;
+  align-items: center;
+  padding: 10px;
 }
 .text-box-five{
   display: inline-block;
   float: left;
   border: #e8e8e8 solid 1px;
+  border-right: none;
   width: 100%;
   height: 100px;
   line-height: 100px;
@@ -1190,7 +1220,7 @@ button{
 span{
   /* overflow: hidden; /*超出部分隐藏*/
   /* text-overflow: ellipsis; 超出部分省略号表示 */
-  white-space: wrap; 
+  white-space: normal;
   /* word-wrap: normal; */
 }
 .item-input{