From 08c28df2271ae4ec135766918b4ed10347c4e675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 30 Mar 2023 16:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/ota/controller/OtaBaCxListController.java    | 4 +++-
 .../jero/modules/ota/controller/OtaBaSjListController.java    | 4 +++-
 .../main/java/com/jero/modules/ota/enums/OtaTitleEnum.java    | 2 +-
 .../modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java    | 3 ---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
index 3cf8577c8..5e080b288 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
@@ -106,7 +106,9 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
     @ApiOperation(value = "车型及功能备案列表-列表查询", notes = "车型及功能备案列表-列表查询")
     @GetMapping(value = "/list")
     public Result<List<OtaBaCxList>> queryList() {
-        List<OtaBaCxList> list = otaBaCxListService.queryList();
+        LambdaQueryWrapper<OtaBaCxList> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(OtaBaCxList::getCreateTime);
+        List<OtaBaCxList> list = otaBaCxListService.list(queryWrapper);
         return Result.OK(list);
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
index c527fc18f..51bd9d829 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
@@ -102,7 +102,9 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
     @ApiOperation(value = "升级备案-升级活动备案列表-列表查询", notes = "升级备案-升级活动备案列表-列表查询")
     @GetMapping(value = "/list")
     public Result<List<OtaBaSjList>> queryList() {
-        List<OtaBaSjList> list = otaBaSjListService.queryList();
+        LambdaQueryWrapper<OtaBaSjList> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(OtaBaSjList::getCreateTime);
+        List<OtaBaSjList> list = otaBaSjListService.list(queryWrapper);
         return Result.OK(list);
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
index 194b039e6..7145c18d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
@@ -14,7 +14,7 @@ public enum OtaTitleEnum {
     BZ("bz", "备注", "0"),
 
     CXMB("cxmb", "车型模板", "0"),
-    QYMC("qymc", "企业名称", "0"),
+//    QYMC("qymc", "企业名称", "0"),
     DJBH("djbh", "产品登记编号", "0"),
     CPLB("cplb", "产品类别", "product_category"),
     DLLX1("dllx1", "车辆动力类型", "0"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
index 45349c897..dc098de37 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
@@ -93,9 +93,6 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
         otaBaSjSjmbcx.setUpdateTime(now);
         ComparisonUtil cu = new ComparisonUtil();
         List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService);
-        if (StringUtils.isEmpty(otaBaSjSjmbcx.getQymc())) {
-            otaBaSjSjmbcx.setQymc("安徽江淮汽车集团股份有限公司");
-        }
         saveOrUpdate(otaBaSjSjmbcx);
         otaBaCxTxjlService.saveBatch(reList);
         return otaBaSjSjmbcx;