From aa2b155ad8560951da3079e35bc025452a69bcd5 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 27 Jun 2022 18:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F-=E5=9D=87=E6=8C=89nio=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8D=87=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/mapper/xml/ParamsCollectManifestEOMapper.xml   | 2 +-
 .../mapper/xml/ParamsCollectManifestHistoryEOMapper.xml    | 2 +-
 .../cert/collect/mapper/xml/ParamsManifestEOMapper.xml     | 3 ++-
 .../service/impl/ParamsCollectManifestEOServiceImpl.java   | 2 +-
 .../cert/report/mapper/xml/ParamsReportDetailEOMapper.xml  | 2 +-
 .../cert/template/controller/ParamsInfoEOController.java   | 7 +++++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 9802182e9..462ac4cd3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -75,7 +75,7 @@
         select *
         from params_collect_manifest
         <include refid="BaseQuerySql"/>
-        order by change_flag desc, create_time asc
+        order by del_flag desc, change_flag desc, nio_number asc
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
index 65d85a714..8d45c4a10 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
@@ -57,6 +57,6 @@
         select *
         from params_collect_manifest_history
         <include refid="BaseQuerySql"/>
-        order by create_time asc
+        order by nio_number asc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 7d1a1e3a1..be1ffc81c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -74,7 +74,7 @@
             pm.title as title,
             pm.project_id as project_id,
             pm.state as state,
-            pni.project_name as project_name,
+            concat(pni.project_name,'-',pyni.year_name) as project_name,
             pm.params_template_id as params_template_id,
             pt.params_template_name as params_template_name,
             pm.params_template_publish_version as params_template_publish_version,
@@ -83,6 +83,7 @@
         left join params_template pt on pm.params_template_id = pt.id
         left join project_library_base as plb on plb.id = pm.project_id
         left join project_name_info as pni on plb.project_name_id = pni.id
+        left join project_year_name_info as pyni on plb.year_name_id=pyni.id
         ) tmp_tb
         where 1=1 and state = #{state}
           <if test="projectName !=null and projectName !=''">
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 957d0cb9a..67e8e1235 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -728,7 +728,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber()), ParamsInfoPublishEO::getNioNumber, paramsCollectManifestVO.getNioNumber())
 				.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName()), ParamsInfoPublishEO::getParamsName, paramsCollectManifestVO.getParamsName())
 				.eq(StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory()), ParamsInfoPublishEO::getDutyTerritory, paramsCollectManifestVO.getDutyTerritory())
-				.orderByDesc(ParamsInfoPublishEO::getCreateTime);
+				.orderByAsc(ParamsInfoPublishEO::getNioNumber);
 
 		List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.list(queryWrapper);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 084de679a..b575d920c 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -85,7 +85,7 @@
         select *
         from params_report_detail
         <include refid="BaseQuerySql"/>
-        order by sync_time asc
+        order by nio_number asc, sync_time asc
     </select>
 
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index 9dad10dce..3476407dd 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -74,14 +74,17 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 		if (StringUtils.isNotEmpty(paramsInfoEO.getParamsName())) {
 			paramsInfoEO.setParamsName(paramsInfoEO.getParamsName().replace("%","\\%"));
 		}
+		if (StringUtils.isEmpty(orderBy)) {
+			orderBy = "asc"; // 默认排序 nio编号升序
+		}
+
 
 		LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsInfoEO::getParamsTemplateId, paramsInfoEO.getParamsTemplateId())
 				.like(StringUtils.isNotEmpty(paramsInfoEO.getNioNumber()), ParamsInfoEO::getNioNumber, paramsInfoEO.getNioNumber())
 				.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), ParamsInfoEO::getParamsName, paramsInfoEO.getParamsName())
 				.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), ParamsInfoEO::getDutyTerritory, paramsInfoEO.getDutyTerritory())
-				.orderBy(StringUtils.isNotBlank(orderByField), "asc".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber)
-				.orderByDesc(ParamsInfoEO::getCreateTime);
+				.orderBy(true, "asc".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber);
 		Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
 		IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
 //		List<ParamsInfoEO> rows = pageList.getRecords();