版本页面

游瑞烽
1 parent 23b305af
Showing 5 changed files with 7 additions and 4 deletions
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/base/stationroute/doublename_road.html
@@ -142,7 +142,7 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	 *
 	 * @return int <sectionCode路段编码>
 	 */
-	@RequestMapping(value="doubleName" , method = RequestMethod.GET)
+	@RequestMapping(value="doubleName" , method = RequestMethod.POST)
 	public Map<String, Object> doubleName(@RequestParam Map<String, Object> map) {
 		return service.doubleName(map);
 	}
@@ -70,7 +70,7 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	/**
 	 * 获取线路版本的上一个版本
 	 */
-	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1 and lv.versions = (?2 - "+1+")")
+	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1 and lv.versions = (SELECT MAX(v.versions)  FROM LineVersions v where v.line.id = ?1 and v.versions < ?2)")
 	public LineVersions findBylineIdAndVersions(Integer id, Integer versions);
@@ -96,6 +96,9 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 			int statu = repository.update(id,line,lineCode,new java.sql.Date(startDate.getTime()),
 					new java.sql.Date(endDate.getTime()),versions,status,remark);
+			LineVersions upLineVersions = repository.findBylineIdAndVersions(line.getId(),versions);
+			upLineVersions.setEndDate(new java.sql.Date(startDate.getTime()));
+			repository.save(upLineVersions);
 			if (statu==1) {
 				resultMap.put("status", ResponseCode.SUCCESS);
 			} else {
@@ -10,7 +10,7 @@ spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= panzhao
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -127,7 +127,7 @@
                 $.get("/lineVersions/findCurrentVersion", {"lineId" : lineId}, function (versions) {
                     params.versions = versions;
                     // 生成路段
-                    $.get('/section/doubleName',params,function (resuntDate) {
+                    $.post('/section/doubleName',params,function (resuntDate) {
                         if(resuntDate.status=='SUCCESS') {
                             // 弹出添加成功提示消息
                             layer.msg('生成成功...');