update:修改DAIMA

adcbs-check/src/main/java/com/adc/da/system/controller/CheckMenuManagementController.java

@@ -45,11 +45,12 @@ public class CheckMenuManagementController extends BaseController {
      */
     @ApiOperation(value = "获取所有公告参数")
     @GetMapping(value = "/getNoticeParameter")
-    public ResponseMessage getNoticeParameter(String obdId, String parameterCode,String parameterName) {
+    public ResponseMessage getNoticeParameter(String obdId, String parameterCode,String parameterName,
+                                              String isParameter) {
         if (StringUtils.isNotEmpty(parameterCode)){
             parameterCode = parameterCode.toUpperCase();
         }
-        return iCheckBulletinDataParameterService.getNoticeParameter(obdId,parameterCode,parameterName);
+        return iCheckBulletinDataParameterService.getNoticeParameter(obdId,parameterCode,parameterName,isParameter);
     }
 
     /**

adcbs-check/src/main/java/com/adc/da/system/service/ICheckBulletinDataParameterService.java

@@ -34,9 +34,10 @@ public interface ICheckBulletinDataParameterService extends IService<CheckBullet
      *
      * @param parameterCode 参数编号
      * @param parameterName 参数名称
+     * @param isParameter
      * @return
      */
-    ResponseMessage getNoticeParameter(String obdId, String parameterCode, String parameterName);
+    ResponseMessage getNoticeParameter(String obdId, String parameterCode, String parameterName, String isParameter);
 
     /**
      * 根据批次删除公告参数

adcbs-check/src/main/java/com/adc/da/system/service/impl/CheckBulletinDataParameterServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -54,7 +55,7 @@ public class CheckBulletinDataParameterServiceImpl
     }
 
     @Override
-    public ResponseMessage getNoticeParameter(String obdId,String parameterCode, String parameterName) {
+    public ResponseMessage getNoticeParameter(String obdId, String parameterCode, String parameterName, String isParameter) {
         List<CheckMenuManagementResDTO> list = baseMapper.getNoticeParameter(parameterCode, parameterName);
         List<CheckCheckMenuManagement> trueList = iCheckCheckMenuManagementService.queryMenuInfoByObdid(obdId);
         trueList.removeAll(Collections.singleton(null));
@@ -72,6 +73,12 @@ public class CheckBulletinDataParameterServiceImpl
                 checkMenuManagementResDTO.setParameterState("1");
             }
         }
+        if ("1".equals(isParameter)) {
+            list = list.stream().filter(item->"0".equals(item.getParameterState())).collect(Collectors.toList());
+        }
+        if ("2".equals(isParameter)) {
+            list = list.stream().filter(item->"1".equals(item.getParameterState())).collect(Collectors.toList());
+        }
         return Result.success(list);
     }
 

adcbs-check/src/main/resources/mybatis/mapper/system/CheckEnterpriseDataDao.xml

@@ -70,7 +70,7 @@
             order by ${vehicleList.orderBy} ${vehicleList.order},t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
         </if>
         <if test="vehicleList.orderBy == null or vehicleList.orderBy == ''">
-            order by t.VEHICLE_GROUP desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
+            order by to_number(t.VEHICLE_GROUP) desc,t.VEHICLE_MODEL desc,t.PRODUCT_NO desc
         </if>
     </select>
     <select id="queryInfoByCheckstatus" resultType="com.adc.da.system.entity.CheckEnterpriseData">