认证-参数项排序-均按nio编号升序

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>

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>

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 !=''">

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);
 

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">

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)
+				.orderBy(true, "asc".equals(orderBy)?true:false, ParamsInfoEO::getNioNumber);
-				.orderByDesc(ParamsInfoEO::getCreateTime);
 		Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);
 		IPage<ParamsInfoEO> pageList = paramsInfoEOService.page(page, queryWrapper);
 //		List<ParamsInfoEO> rows = pageList.getRecords();