瀏覽代碼

项目编号排序调整

user5 1 年之前
父節點
當前提交
00e5c9dcd1

+ 2 - 2
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -1229,7 +1229,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 continue;
             }
             consultantFlag ++;
-            if(1 == consultantFlag){
+            /*if(1 == consultantFlag){
                 //第一个有效数据为负责人信息,同步到项目表信息中
                 //将项目表中的项目负责人信息修改
                 RuralProjectRecords ruralProjectRecords1 = new RuralProjectRecords();
@@ -1244,7 +1244,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 projectReportData.setId(projectcontentinfo.getProjectReportData().getId());
                 projectReportData.setBzshbUserId(info.getZixunyuan());
                 projectReportDataService.updateProjectBzshUserId(projectReportData);
-            }
+            }*/
             //添加项目id
             info.setProjectId(projectcontentinfo.getProjectOnRural().getId());
             info.preInsert();

+ 2 - 2
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -792,7 +792,7 @@ END) as projectScale*/
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-10) DESC
+				ORDER BY SUBSTRING(a.project_id,6,4) DESC,cast( SUBSTRING(a.project_id,11) as UNSIGNED) DESC
 			</otherwise>
 		</choose>
 		) temporarydb
@@ -1257,7 +1257,7 @@ END) as projectScale*/
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-10) DESC
+				ORDER BY SUBSTRING(a.project_id,6,4) DESC,cast( SUBSTRING(a.project_id,11) as UNSIGNED) DESC
 			</otherwise>
 		</choose>
 		) temporarydb

+ 1 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -707,7 +707,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-10) DESC
+				ORDER BY SUBSTRING(a.project_id,6,4) DESC,cast( SUBSTRING(a.project_id,11) as UNSIGNED) DESC
 			</otherwise>
 		</choose>
 		) temporarydb

+ 1 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -716,7 +716,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-10) DESC
+				ORDER BY SUBSTRING(a.project_id,6,4) DESC,cast( SUBSTRING(a.project_id,11) as UNSIGNED) DESC
 			</otherwise>
 		</choose>
 		) temporarydb