youxiw2000 / bsthLineProfiles · Commits

Commit 829f99f1147914b0add410ea3d695281f7af3d56

Authored by yiming
1 parent 1ec5bfb6
build: skipped

bf

Inline Side-by-side
Showing 15 changed files with 151 additions and 455 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
  View file @829f99f
@@ -102,14 +102,22 @@ public class BsthTLineAddController extends BaseController @@ -102,14 +102,22 @@ public class BsthTLineAddController extends BaseController
102 { 102 {
103 User loginUser = ShiroUtils.getSysUser(); 103 User loginUser = ShiroUtils.getSysUser();
104 bsthTLine.setCreateBy(loginUser.getUserName()); 104 bsthTLine.setCreateBy(loginUser.getUserName());
105 - if(!bsthTLineService.lineNameIsExist(bsthTLine.getLineName())){ 105 + if(!bsthTLineService.lineNameIsExistInBsthTLine(bsthTLine.getLineName())){
106 AjaxResult ajaxResult=new AjaxResult(); 106 AjaxResult ajaxResult=new AjaxResult();
107 ajaxResult.put("code","96"); 107 ajaxResult.put("code","96");
108 - ajaxResult.put("msg","线路已存在或提交申请"); 108 + ajaxResult.put("msg","线路已存");
109 return ajaxResult; 109 return ajaxResult;
110 } 110 }
111 - bsthTLine.setLineUpdateType("3");  
112 - return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine)); 111 + //不存在新增
  112 + BsthTLine bl=bsthTLineService.selectBsthTLineExamineByLineName(bsthTLine.getLineName());
  113 + if(bl==null){
  114 + bsthTLine.setLineUpdateType("3");
  115 + return toAjax(bsthTLineService.insertBsthTLineExamine(bsthTLine));
  116 + }else {
  117 + bsthTLine.setId(bl.getId());
  118 + return toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
  119 + }
  120 +
113 } 121 }
114 122
115 /** 123 /**
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
  View file @829f99f
@@ -75,7 +75,7 @@ public class BsthTLineHistoryController extends BaseController @@ -75,7 +75,7 @@ public class BsthTLineHistoryController extends BaseController
75 public TableDataInfo list(BsthTLine bsthTLine) 75 public TableDataInfo list(BsthTLine bsthTLine)
76 { 76 {
77 startPage(); 77 startPage();
78 - List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine); 78 + List<BsthTLine> list = bsthTLineService.selectBsthTLineListAndExamine(bsthTLine);
79 return getDataTable(list); 79 return getDataTable(list);
80 } 80 }
81 81
@@ -115,7 +115,6 @@ public class BsthTLineHistoryController extends BaseController @@ -115,7 +115,6 @@ public class BsthTLineHistoryController extends BaseController
115 BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName); 115 BsthTLine bsthTLineExamine=bsthTLineService.selectBsthTLineExamineByLineName(lineName);
116 if(bsthTLineExamine!=null){//有没审核的直接覆盖 116 if(bsthTLineExamine!=null){//有没审核的直接覆盖
117 bsthTLine.setId(bsthTLineExamine.getId()); 117 bsthTLine.setId(bsthTLineExamine.getId());
118 - bsthTLine.setExamineStatus("0");  
119 ajaxResult= toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine)); 118 ajaxResult= toAjax(bsthTLineService.updateBsthTLineExamine(bsthTLine));
120 }else {//没有新增 119 }else {//没有新增
121 bsthTLine.setExamineType("1"); 120 bsthTLine.setExamineType("1");
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
  View file @829f99f
@@ -75,7 +75,7 @@ public interface BsthTLineMapper @@ -75,7 +75,7 @@ public interface BsthTLineMapper
75 75
76 List<Map> selectCompany(); 76 List<Map> selectCompany();
77 77
78 - 78 + List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine);
79 79
80 80
81 81
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
  View file @829f99f
@@ -63,5 +63,9 @@ public interface IBsthTLineService @@ -63,5 +63,9 @@ public interface IBsthTLineService
63 int deleteBsthTLineHistoryById(Long id); 63 int deleteBsthTLineHistoryById(Long id);
64 64
65 List<Map> selectCompany(); 65 List<Map> selectCompany();
  66 +
  67 + boolean lineNameIsExistInBsthTLine(String lineName);
  68 +
  69 + List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine);
66 /*int createLineMonthReport();*/ 70 /*int createLineMonthReport();*/
67 } 71 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
  View file @829f99f
@@ -454,4 +454,20 @@ public class BsthTLineServiceImpl implements IBsthTLineService @@ -454,4 +454,20 @@ public class BsthTLineServiceImpl implements IBsthTLineService
454 return calendar.getTime(); 454 return calendar.getTime();
455 } 455 }
456 456
  457 + @Override
  458 + public boolean lineNameIsExistInBsthTLine(String lineName) {
  459 + boolean flag=true;
  460 + if(bsthTLineMapper.selectBsthTLineByLineName(lineName)!=null){
  461 + flag=false;
  462 + }
  463 + return flag;
  464 + }
  465 +
  466 +
  467 + @Override
  468 + public List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine)
  469 + {
  470 + return bsthTLineMapper.selectBsthTLineListAndExamine(bsthTLine);
  471 + }
  472 +
457 } 473 }
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
  View file @829f99f
@@ -94,7 +94,7 @@ public class LoginController extends BaseController @@ -94,7 +94,7 @@ public class LoginController extends BaseController
94 94
95 String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token); 95 String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
96 96
97 - 97 + //dataJsonStr="{\"code\":200,\"msg\":\"成功\",\"data\":{\"userId\":\"50aa4eea655d42c49bef086e68a789ad\",\"userName\":\"拓华\",\"userType\":null,\"photoPath\":\"\",\"sex\":\"01\",\"idCard\":\"\",\"telephoneNumber\":\"1\",\"mailbox\":\"1\",\"account\":\"100005\",\"status\":\"01\",\"remark\":\"\",\"sort\":\"\",\"orgId\":\"7E1EAC2C-AE4D-42B3-A8ED-B0AF6929B889\",\"companyInfo\":{\"organizationId\":\"578ECB10-9859-47CC-A6D5-CEE09536243D\",\"parentId\":\"7AE0A3FB-2D6C-4E51-8B10-71EAFA2D269A\",\"number\":\"KD01.0115\",\"simpleNameCn\":\"PJ\",\"simpleName\":\"浦交本部\",\"name\":\"上海浦东新区公交本部\",\"fullName\":\"上海浦东新区公共交通有限公司/上海浦东新区公交本部\",\"status\":\"01\",\"remark\":null,\"type\":\"01\",\"attributes\":\"01\",\"sort\":\"KD01.0101\"},\"orgInfo\":{\"organizationId\":\"7E1EAC2C-AE4D-42B3-A8ED-B0AF6929B889\",\"parentId\":\"EB26BC7B-D6BA-49BE-83A2-661E6D1E1825\",\"number\":\"KD01.0115.0013.0010\",\"simpleNameCn\":\"XXGLB\",\"simpleName\":\"信息管理部\",\"name\":\"信息管理部\",\"fullName\":\"上海浦东新区公共交通有限公司/上海浦东新区公交本部/浦交本部/信息管理部\",\"status\":\"01\",\"remark\":null,\"type\":\"02\",\"attributes\":\"\",\"sort\":\"KD01.0101.0001.0012\"},\"userAuthList\":[{\"pjtId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"pjtName\":\"线路档案系统\",\"pjtCode\":\"SYS0015\",\"sort\":\"15\",\"roleList\":[{\"roleId\":\"5e7bcde5554b470ab3a1324703cfed6e\",\"roleName\":\"拓华测试角色\",\"roleCode\":\"thcsjs\",\"sort\":\"1\",\"resourceList\":[{\"resourceId\":\"1c382ca2da92468ab53c205daed27286\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息月报表\",\"resourceCode\":\"lineReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"3\",\"menuId\":\"2009\",\"menuParentId\":\"2006\"},{\"resourceId\":\"a937d70ad81d415294ae226a8acc711a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"历史信息管理\",\"resourceCode\":\"历史信息管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2033\",\"menuParentId\":\"\"},{\"resourceId\":\"09e645f5086a465bbd6992adecfbba7e\",\"parentId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"resourceName\":\"地图\",\"resourceCode\":\"地图\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2011\",\"menuParentId\":\"2032\"},{\"resourceId\":\"d3f86b2cb7004cfdb0fcde3cd7c63db8\",\"parentId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"resourceName\":\"定时任务\",\"resourceCode\":\"定时任务\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"110\",\"menuParentId\":\"2\"},{\"resourceId\":\"1206d2b8eab64861a7eb01ed048ca520\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"菜单管理\",\"resourceCode\":\"菜单管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\"},{\"resourceId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统监控\",\"resourceCode\":\"系统监控\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"2\",\"menuParentId\":\"\"},{\"resourceId\":\"54087ffab360444680066475d2c745da\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路档案\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2006\",\"menuParentId\":\"\"},{\"resourceId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"报表管理\",\"resourceCode\":\"报表管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2034\",\"menuParentId\":\"\"},{\"resourceId\":\"fa687ea4d5494e0c80f08269bf8ebcea\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"沿革\",\"resourceCode\":\"historyCompare\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"6\",\"menuId\":\"2012\",\"menuParentId\":\"2006\"},{\"resourceId\":\"50bc627ecc1841f786ae011fda227561\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"地图查询\",\"resourceCode\":\"map\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"5\",\"menuId\":\"2011\",\"menuParentId\":\"2006\"},{\"resourceId\":\"fe9efa556357482cacbcc95010275589\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"岗位管理\",\"resourceCode\":\"岗位管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"104\",\"menuParentId\":\"1\"},{\"resourceId\":\"49611a31bea943b6bdb855a2d4d2dcf1\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"部门管理\",\"resourceCode\":\"部门管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\"},{\"resourceId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"地图维度查询\",\"resourceCode\":\"地图维度查询\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2032\",\"menuParentId\":\"\"},{\"resourceId\":\"5f5f6fb757894661bd005a74327cc6df\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"字典管理\",\"resourceCode\":\"字典管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"105\",\"menuParentId\":\"1\"},{\"resourceId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统管理\",\"resourceCode\":\"system\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"1\",\"menuParentId\":\"\"},{\"resourceId\":\"eb239b91709a48d4b9e2d27d72258154\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"线路变更月报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2010\",\"menuParentId\":\"2034\"},{\"resourceId\":\"7145d027c875466291722a9c5abeb368\",\"parentId\":\"a937d70ad81d415294ae226a8acc711a\",\"resourceName\":\"线路历史沿革\",\"resourceCode\":\"线路历史沿革\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2012\",\"menuParentId\":\"2033\"},{\"resourceId\":\"c168cb7d7f0b44ed8279371086993137\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"用户管理\",\"resourceCode\":\"/system/user\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"0\",\"menuId\":\"100\",\"menuParentId\":\"1\"},{\"resourceId\":\"625b5ad8ed284b8fa2946109332ee240\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2007\",\"menuParentId\":\"2006\"},{\"resourceId\":\"f25d5506f9224c6c9fac72219dff8f8a\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"角色管理\",\"resourceCode\":\"角色管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"101\",\"menuParentId\":\"1\"},{\"resourceId\":\"2e9a714cdf984da38e0c6a74e452e3b0\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"historyReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"4\",\"menuId\":\"2010\",\"menuParentId\":\"2006\"},{\"resourceId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路变更管理\",\"resourceCode\":\"线路变更管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2031\",\"menuParentId\":\"\"},{\"resourceId\":\"6308d837f5574216816c40a94c327d9d\",\"parentId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"resourceName\":\"线路变更信息\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"lineHistory\",\"sort\":\"\",\"menuId\":\"2008\",\"menuParentId\":\"2031\"},{\"resourceId\":\"2a0bea23ab554586a563e1ff8b8ef8cf\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路审核\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2030\",\"menuParentId\":\"2006\"}]}],\"globalResourceList\":[{\"resourceId\":\"09e645f5086a465bbd6992adecfbba7e\",\"parentId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"resourceName\":\"地图\",\"resourceCode\":\"地图\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2011\",\"menuParentId\":\"2032\"},{\"resourceId\":\"1206d2b8eab64861a7eb01ed048ca520\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"菜单管理\",\"resourceCode\":\"菜单管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\"},{\"resourceId\":\"1c382ca2da92468ab53c205daed27286\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息月报表\",\"resourceCode\":\"lineReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"3\",\"menuId\":\"2009\",\"menuParentId\":\"2006\"},{\"resourceId\":\"2a0bea23ab554586a563e1ff8b8ef8cf\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路审核\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2030\",\"menuParentId\":\"2006\"},{\"resourceId\":\"2e9a714cdf984da38e0c6a74e452e3b0\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"historyReport\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"4\",\"menuId\":\"2010\",\"menuParentId\":\"2006\"},{\"resourceId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统监控\",\"resourceCode\":\"系统监控\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"2\",\"menuParentId\":\"\"},{\"resourceId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"报表管理\",\"resourceCode\":\"报表管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2034\",\"menuParentId\":\"\"},{\"resourceId\":\"49611a31bea943b6bdb855a2d4d2dcf1\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"部门管理\",\"resourceCode\":\"部门管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"103\",\"menuParentId\":\"1\"},{\"resourceId\":\"50bc627ecc1841f786ae011fda227561\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"地图查询\",\"resourceCode\":\"map\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"5\",\"menuId\":\"2011\",\"menuParentId\":\"2006\"},{\"resourceId\":\"54087ffab360444680066475d2c745da\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路档案\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2006\",\"menuParentId\":\"\"},{\"resourceId\":\"5f5f6fb757894661bd005a74327cc6df\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"字典管理\",\"resourceCode\":\"字典管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"105\",\"menuParentId\":\"1\"},{\"resourceId\":\"625b5ad8ed284b8fa2946109332ee240\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"线路基本信息\",\"resourceCode\":\"lineinfo\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2007\",\"menuParentId\":\"2006\"},{\"resourceId\":\"6308d837f5574216816c40a94c327d9d\",\"parentId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"resourceName\":\"线路变更信息\",\"resourceCode\":\"lineExamine\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"lineHistory\",\"sort\":\"\",\"menuId\":\"2008\",\"menuParentId\":\"2031\"},{\"resourceId\":\"7145d027c875466291722a9c5abeb368\",\"parentId\":\"a937d70ad81d415294ae226a8acc711a\",\"resourceName\":\"线路历史沿革\",\"resourceCode\":\"线路历史沿革\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2012\",\"menuParentId\":\"2033\"},{\"resourceId\":\"a937d70ad81d415294ae226a8acc711a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"历史信息管理\",\"resourceCode\":\"历史信息管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2033\",\"menuParentId\":\"\"},{\"resourceId\":\"aacd5a3c958c41dabb1b169eec78f5ad\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"线路变更管理\",\"resourceCode\":\"线路变更管理\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2031\",\"menuParentId\":\"\"},{\"resourceId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"系统管理\",\"resourceCode\":\"system\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"2\",\"menuId\":\"1\",\"menuParentId\":\"\"},{\"resourceId\":\"c168cb7d7f0b44ed8279371086993137\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"用户管理\",\"resourceCode\":\"/system/user\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"0\",\"menuId\":\"100\",\"menuParentId\":\"1\"},{\"resourceId\":\"d3f86b2cb7004cfdb0fcde3cd7c63db8\",\"parentId\":\"3196ffbd51fb4a1fb0197e5c78b7cf47\",\"resourceName\":\"定时任务\",\"resourceCode\":\"定时任务\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"110\",\"menuParentId\":\"2\"},{\"resourceId\":\"eb239b91709a48d4b9e2d27d72258154\",\"parentId\":\"3f0ca7150a824cd09bdbdda92f9dee6b\",\"resourceName\":\"线路变更月报表\",\"resourceCode\":\"线路变更月报表\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2010\",\"menuParentId\":\"2034\"},{\"resourceId\":\"f25d5506f9224c6c9fac72219dff8f8a\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"角色管理\",\"resourceCode\":\"角色管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"101\",\"menuParentId\":\"1\"},{\"resourceId\":\"f2a0bdbb1a284f1d999c2512bd48878a\",\"parentId\":\"6dc39f7782d94f45aecda6075b92cecd\",\"resourceName\":\"地图维度查询\",\"resourceCode\":\"地图维度查询\",\"resourceIcon\":\"\",\"type\":\"03\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"2032\",\"menuParentId\":\"\"},{\"resourceId\":\"fa687ea4d5494e0c80f08269bf8ebcea\",\"parentId\":\"54087ffab360444680066475d2c745da\",\"resourceName\":\"沿革\",\"resourceCode\":\"historyCompare\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"6\",\"menuId\":\"2012\",\"menuParentId\":\"2006\"},{\"resourceId\":\"fe9efa556357482cacbcc95010275589\",\"parentId\":\"b564cfa4f8eb46d78b9d8255ede6696e\",\"resourceName\":\"岗位管理\",\"resourceCode\":\"岗位管理\",\"resourceIcon\":\"\",\"type\":\"01\",\"vuePath\":\"\",\"vueComponent\":\"\",\"sort\":\"\",\"menuId\":\"104\",\"menuParentId\":\"1\"}]}]}}";
98 JSONObject jsonObject = JSON.parseObject(dataJsonStr); 98 JSONObject jsonObject = JSON.parseObject(dataJsonStr);
99 99
100 100
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
  View file @829f99f
@@ -134,8 +134,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -134,8 +134,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
134 select * from bsth_t_line_history_report 134 select * from bsth_t_line_history_report
135 </sql> 135 </sql>
136 136
137 - <select id="selectBsthTLineList" parameterType="BsthTLine"  
138 - resultMap="BsthTLineResult"> 137 + <select id="selectBsthTLineList" parameterType="BsthTLine" resultMap="BsthTLineResult">
139 <include refid="selectBsthTLineVo" /> 138 <include refid="selectBsthTLineVo" />
140 <where> 139 <where>
141 <if test="eventId != null "> and event_id = #{eventId}</if> 140 <if test="eventId != null "> and event_id = #{eventId}</if>
@@ -777,6 +776,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -777,6 +776,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
777 <if test="examineType != null">examine_type,</if> 776 <if test="examineType != null">examine_type,</if>
778 <if test="startReason != null">start_reason,</if> 777 <if test="startReason != null">start_reason,</if>
779 <if test="lineUpdateType != null">line_update_type,</if> 778 <if test="lineUpdateType != null">line_update_type,</if>
  779 + <if test="examineStatus != null">examine_status,</if>
780 create_time, 780 create_time,
781 </trim> 781 </trim>
782 <trim prefix="values (" suffix=")" suffixOverrides=","> 782 <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -863,6 +863,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -863,6 +863,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
863 <if test="examineType != null">#{examineType},</if> 863 <if test="examineType != null">#{examineType},</if>
864 <if test="startReason != null">#{startReason},</if> 864 <if test="startReason != null">#{startReason},</if>
865 <if test="lineUpdateType != null">#{lineUpdateType},</if> 865 <if test="lineUpdateType != null">#{lineUpdateType},</if>
  866 + <if test="examineStatus != null">#{examineStatus},</if>
866 sysdate(), 867 sysdate(),
867 </trim> 868 </trim>
868 </insert> 869 </insert>
@@ -1704,168 +1705,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -1704,168 +1705,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
1704 </select> 1705 </select>
1705 1706
1706 1707
1707 -<!--  
1708 - <insert id="createLineMonthReport" parameterType="BsthTLine"  
1709 - useGeneratedKeys="true" keyProperty="id">  
1710 - insert into bsth_t_line_report  
1711 - <trim prefix="(" suffix=")" suffixOverrides=",">  
1712 - <if test="eventId != null">event_id,</if>  
1713 - <if test="lineId != null">line_id,</if>  
1714 - <if test="lineName != null">line_name,</if>  
1715 - <if test="company != null">company,</if>  
1716 - <if test="fCompany != null">f_company,</if>  
1717 - <if test="pLineId != null">p_line_id,</if>  
1718 - <if test="serviceType != null">service_type,</if>  
1719 - <if test="lineLevel != null">line_level,</if>  
1720 - <if test="lineType != null">line_type,</if>  
1721 - <if test="district != null">district,</if>  
1722 - <if test="inoutDistrict != null">inout_district,</if>  
1723 - <if test="serviceState != null">service_state,</if>  
1724 - <if test="busType != null">bus_type,</if>  
1725 - <if test="airConditionerType != null">air_conditioner_type,</if>  
1726 - <if test="sellTicketType != null">sell_ticket_type,</if>  
1727 - <if test="serviceTime != null">service_time,</if>  
1728 - <if test="lineDistance != null">line_distance,</if>  
1729 - <if test="lineCode != null">line_code,</if>  
1730 - <if test="warrantYear != null">warrant_year,</if>  
1731 - <if test="warrantStartTime != null">warrant_start_time,</if>  
1732 - <if test="warrantEndTime != null">warrant_end_time,</if>  
1733 - <if test="planCancelTime != null">plan_cancel_time,</if>  
1734 - <if test="cancelTime != null">cancel_time,</if>  
1735 - <if test="cancelReason != null">cancel_reason,</if>  
1736 - <if test="remark != null">remark,</if>  
1737 - <if test="isLogicDelete != null">is_logic_delete,</if>  
1738 - <if test="createBy != null">create_by,</if>  
1739 - <if test="timeSchedule != null">time_schedule,</if>  
1740 - <if test="park != null">park,</if>  
1741 - <if test="isWarrant != null">is_warrant,</if>  
1742 - <if test="roadType != null">road_type,</if>  
1743 - <if test="ticketPrice != null">ticket_price,</if>  
1744 - <if test="firstStation != null">first_station,</if>  
1745 - <if test="startEnd != null">start_end,</if>  
1746 - <if test="firstTime != null">first_time,</if>  
1747 - <if test="lastStation != null">last_station,</if>  
1748 - <if test="lastTime != null">last_time,</if>  
1749 - <if test="mileageUp != null">mileage_up,</if>  
1750 - <if test="mileageDown != null">mileage_down,</if>  
1751 - <if test="averageMileage != null">average_mileage,</if>  
1752 - <if test="stationUp != null">station_up,</if>  
1753 - <if test="stationDown != null">station_down,</if>  
1754 - <if test="travelTimeUp != null">travel_time_up,</if>  
1755 - <if test="travelTimeDown != null">travel_time_down,</if>  
1756 - <if test="travelIntervalUp != null">travel_interval_up,</if>  
1757 - <if test="travelIntervalDown != null">travel_interval_down,</if>  
1758 - <if test="warrantVehiclesLarge != null">warrant_vehicles_large,</if>  
1759 - <if test="warrantVehiclesMiddle != null">warrant_vehicles_middle,</if>  
1760 - <if test="vehiclesNumber != null">vehicles_number,</if>  
1761 - <if test="numberVehiclesLarge != null">number_vehicles_large,</if>  
1762 - <if test="numberVehiclesMiddle != null">number_vehicles_middle,</if>  
1763 - <if test="carPlate != null">car_plate,</if>  
1764 - <if test="numberPerson != null">number_person,</if>  
1765 - <if test="numberPersonDriver != null">number_person_driver,</if>  
1766 - <if test="numberPersonSales != null">number_person_sales,</if>  
1767 - <if test="busEvNumber != null">bus_ev_number,</if>  
1768 - <if test="directions != null">directions,</if>  
1769 - <if test="numberOfManage != null">number_of_manage,</if>  
1770 - <if test="halfwayStation != null">halfway_station,</if>  
1771 - <if test="fullCustomerPercent != null">full_customer_percent,</if>  
1772 - <if test="lowCustomerPercent != null">low_customer_percent,</if>  
1773 - <if test="divideLevel != null">divide_level,</if>  
1774 - <if test="hasTimelists != null">has_timelists,</if>  
1775 - <if test="isMetro != null">is_metro,</if>  
1776 - <if test="metroTime != null">metro_time,</if>  
1777 - <if test="coldBonusType != null">cold_bonus_type,</if>  
1778 - <if test="revenuesMonth != null">revenues_month,</if>  
1779 - <if test="personMonth != null">person_month,</if>  
1780 - <if test="mileageMonth != null">mileage_month,</if>  
1781 - <if test="personMonthAvg != null">person_month_avg,</if>  
1782 - <if test="revenues != null">revenues,</if>  
1783 - <if test="persons != null">persons,</if>  
1784 - <if test="mileages != null">mileages,</if>  
1785 - <if test="personAvg != null">person_avg,</if>  
1786 - <if test="nightParking != null">night_parking,</if>  
1787 - <if test="createTime != null">create_time,</if>  
1788 - </trim>  
1789 - <trim prefix="values (" suffix=")" suffixOverrides=",">  
1790 - <if test="eventId != null">#{eventId},</if>  
1791 - <if test="lineId != null">#{lineId},</if>  
1792 - <if test="lineName != null">#{lineName},</if>  
1793 - <if test="company != null">#{company},</if>  
1794 - <if test="fCompany != null">#{fCompany},</if>  
1795 - <if test="pLineId != null">#{pLineId},</if>  
1796 - <if test="serviceType != null">#{serviceType},</if>  
1797 - <if test="lineLevel != null">#{lineLevel},</if>  
1798 - <if test="lineType != null">#{lineType},</if>  
1799 - <if test="district != null">#{district},</if>  
1800 - <if test="inoutDistrict != null">#{inoutDistrict},</if>  
1801 - <if test="serviceState != null">#{serviceState},</if>  
1802 - <if test="busType != null">#{busType},</if>  
1803 - <if test="airConditionerType != null">#{airConditionerType},</if>  
1804 - <if test="sellTicketType != null">#{sellTicketType},</if>  
1805 - <if test="serviceTime != null">#{serviceTime},</if>  
1806 - <if test="lineDistance != null">#{lineDistance},</if>  
1807 - <if test="lineCode != null">#{lineCode},</if>  
1808 - <if test="warrantYear != null">#{warrantYear},</if>  
1809 - <if test="warrantStartTime != null">#{warrantStartTime},</if>  
1810 - <if test="warrantEndTime != null">#{warrantEndTime},</if>  
1811 - <if test="planCancelTime != null">#{planCancelTime},</if>  
1812 - <if test="cancelTime != null">#{cancelTime},</if>  
1813 - <if test="cancelReason != null">#{cancelReason},</if>  
1814 - <if test="remark != null">#{remark},</if>  
1815 - <if test="isLogicDelete != null">#{isLogicDelete},</if>  
1816 - <if test="createBy != null">#{createBy},</if>  
1817 - <if test="timeSchedule != null">#{timeSchedule},</if>  
1818 - <if test="park != null">#{park},</if>  
1819 - <if test="isWarrant != null">#{isWarrant},</if>  
1820 - <if test="roadType != null">#{roadType},</if>  
1821 - <if test="ticketPrice != null">#{ticketPrice},</if>  
1822 - <if test="firstStation != null">#{firstStation},</if>  
1823 - <if test="startEnd != null">#{startEnd},</if>  
1824 - <if test="firstTime != null">#{firstTime},</if>  
1825 - <if test="lastStation != null">#{lastStation},</if>  
1826 - <if test="lastTime != null">#{lastTime},</if>  
1827 - <if test="mileageUp != null">#{mileageUp},</if>  
1828 - <if test="mileageDown != null">#{mileageDown},</if>  
1829 - <if test="averageMileage != null">#{averageMileage},</if>  
1830 - <if test="stationUp != null">#{stationUp},</if>  
1831 - <if test="stationDown != null">#{stationDown},</if>  
1832 - <if test="travelTimeUp != null">#{travelTimeUp},</if>  
1833 - <if test="travelTimeDown != null">#{travelTimeDown},</if>  
1834 - <if test="travelIntervalUp != null">#{travelIntervalUp},</if>  
1835 - <if test="travelIntervalDown != null">#{travelIntervalDown},</if>  
1836 - <if test="warrantVehiclesLarge != null">#{warrantVehiclesLarge},</if>  
1837 - <if test="warrantVehiclesMiddle != null">#{warrantVehiclesMiddle},</if>  
1838 - <if test="vehiclesNumber != null">#{vehiclesNumber},</if>  
1839 - <if test="numberVehiclesLarge != null">#{numberVehiclesLarge},</if>  
1840 - <if test="numberVehiclesMiddle != null">#{numberVehiclesMiddle},</if>  
1841 - <if test="carPlate != null">#{carPlate},</if>  
1842 - <if test="numberPerson != null">#{numberPerson},</if>  
1843 - <if test="numberPersonDriver != null">#{numberPersonDriver},</if>  
1844 - <if test="numberPersonSales != null">#{numberPersonSales},</if>  
1845 - <if test="busEvNumber != null">#{busEvNumber},</if>  
1846 - <if test="directions != null">#{directions},</if>  
1847 - <if test="numberOfManage != null">#{numberOfManage},</if>  
1848 - <if test="halfwayStation != null">#{halfwayStation},</if>  
1849 - <if test="fullCustomerPercent != null">#{fullCustomerPercent},</if>  
1850 - <if test="lowCustomerPercent != null">#{lowCustomerPercent},</if>  
1851 - <if test="divideLevel != null">#{divideLevel},</if>  
1852 - <if test="hasTimelists != null">#{hasTimelists},</if>  
1853 - <if test="isMetro != null">#{isMetro},</if>  
1854 - <if test="metroTime != null">#{metroTime},</if>  
1855 - <if test="coldBonusType != null">#{coldBonusType},</if>  
1856 - <if test="revenuesMonth != null">#{revenuesMonth},</if>  
1857 - <if test="personMonth != null">#{personMonth},</if>  
1858 - <if test="mileageMonth != null">#{mileageMonth},</if>  
1859 - <if test="personMonthAvg != null">#{personMonthAvg},</if>  
1860 - <if test="revenues != null">#{revenues},</if>  
1861 - <if test="persons != null">#{persons},</if>  
1862 - <if test="mileages != null">#{mileages},</if>  
1863 - <if test="personAvg != null">#{personAvg},</if>  
1864 - <if test="nightParking != null">#{nightParking},</if>  
1865 - <if test="createTime != null">#{createTime},</if>  
1866 - </trim>  
1867 - </insert>-->  
1868 - 1708 + <select id="selectBsthTLineListAndExamine" parameterType="BsthTLine" resultMap="BsthTLineResult">
  1709 + select bsth_t_line.*,bsth_t_line_examine.examine_status from bsth_t_line,bsth_t_line_examine
  1710 + where bsth_t_line.line_name=bsth_t_line_examine.line_name
  1711 + <if test="lineName != null and lineName != ''"> and bsth_t_line.line_name like concat('%', #{lineName}, '%')</if>
  1712 + <if test="company != null and company != ''"> and bsth_t_line.company = #{company}</if>
  1713 + <if test="fCompany != null and fCompany != ''"> and bsth_t_line.f_company = #{fCompany}</if>
  1714 + </select>
1869 1715
1870 1716
1871 </mapper> 1717 </mapper>
1872 \ No newline at end of file 1718 \ No newline at end of file
bsthLineProfiles/src/main/resources/static/ajax/libs/layer/theme/moon/style.css
  View file @829f99f
@@ -115,10 +115,7 @@ body .layer-ext-moon .layui-layer-btn .layui-layer-btn0 { @@ -115,10 +115,7 @@ body .layer-ext-moon .layui-layer-btn .layui-layer-btn0 {
115 background: #0071ce; 115 background: #0071ce;
116 } 116 }
117 body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 { 117 body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 {
118 - background: #fff;  
119 - color: #404a58;  
120 - border: 1px solid #c0c4cd;  
121 - border-radius: 3px; 118 + background: #00cec7ab;
122 } 119 }
123 body .layer-ext-moon .layui-layer-btn .layui-layer-btn2 { 120 body .layer-ext-moon .layui-layer-btn .layui-layer-btn2 {
124 background: #f60; 121 background: #f60;
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @829f99f
@@ -482,6 +482,7 @@ @@ -482,6 +482,7 @@
482 </div> 482 </div>
483 </div> 483 </div>
484 </div> 484 </div>
  485 + <input type="hidden" id="examineStatus">
485 </form> 486 </form>
486 </div> 487 </div>
487 <th:block th:include="include :: footer" /> 488 <th:block th:include="include :: footer" />
@@ -545,6 +546,12 @@ @@ -545,6 +546,12 @@
545 } 546 }
546 } 547 }
547 548
  549 + function submitHandlerCommit() {
  550 + if ($.validate.form()) {
  551 + $.operate.save(prefix + "/add", $('#form-line-add').serialize()+'&examineStatus=1');
  552 + }
  553 + }
  554 +
548 $("input[name='warrantStartTime']").datetimepicker({ 555 $("input[name='warrantStartTime']").datetimepicker({
549 format: "yyyy-mm-dd", 556 format: "yyyy-mm-dd",
550 minView: "month", 557 minView: "month",
@@ -602,7 +609,7 @@ @@ -602,7 +609,7 @@
602 var data={'lineName':lineName}; 609 var data={'lineName':lineName};
603 $.post(prefix + "/isExist",data,function (result){ 610 $.post(prefix + "/isExist",data,function (result){
604 if(result.id!=null){ 611 if(result.id!=null){
605 - layer.confirm("是否修改上一次的申请记录",{ 612 + layer.confirm("是否修改上一次的记录",{
606 btn: ['是', '否'] 613 btn: ['是', '否']
607 },function (index, layero) { 614 },function (index, layero) {
608 var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引 615 var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @829f99f
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <div class="form-group"> 13 <div class="form-group">
14 <label class="col-sm-1 control-label">线路名称：</label> 14 <label class="col-sm-1 control-label">线路名称：</label>
15 <div class="col-sm-2"> 15 <div class="col-sm-2">
16 - <input name="lineName" th:field="*{lineName}" class="form-control" type="text"> 16 + <input name="lineName" th:field="*{lineName}" class="form-control" type="text" readonly>
17 </div> 17 </div>
18 <!----------------------------------> 18 <!---------------------------------->
19 <label class="col-sm-1 control-label">主线路id：</label> 19 <label class="col-sm-1 control-label">主线路id：</label>
@@ -643,9 +643,6 @@ @@ -643,9 +643,6 @@
643 }); 643 });
644 644
645 function submitHandler() { 645 function submitHandler() {
646 - console.log($("input[name='startDate']").val());  
647 - console.log($("select[name='lineUpdateType']").val());  
648 -  
649 if ($("input[name='startDate']").val() 646 if ($("input[name='startDate']").val()
650 && $("select[name='lineUpdateType']").val() == "") { 647 && $("select[name='lineUpdateType']").val() == "") {
651 $.modal.msg("未选择线路性质"); 648 $.modal.msg("未选择线路性质");
@@ -658,6 +655,12 @@ @@ -658,6 +655,12 @@
658 } 655 }
659 } 656 }
660 657
  658 + function submitHandlerCommit() {
  659 + if ($.validate.form()) {
  660 + $.operate.save(prefix + "/edit", $('#form-line-edit').serialize()+'&examineStatus=1');
  661 + }
  662 + }
  663 +
661 $("input[name='warrantStartTime']").datetimepicker({ 664 $("input[name='warrantStartTime']").datetimepicker({
662 format : "yyyy-mm-dd", 665 format : "yyyy-mm-dd",
663 minView : "month", 666 minView : "month",
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
  View file @829f99f
@@ -45,31 +45,6 @@ @@ -45,31 +45,6 @@
45 </div> 45 </div>
46 <th:block th:include="include :: footer" /> 46 <th:block th:include="include :: footer" />
47 <th:block th:include="include :: select2-js" /> 47 <th:block th:include="include :: select2-js" />
48 - <div class="modal fade" id="myModal" tabindex="-1" role="dialog"  
49 - aria-labelledby="myModalLabel" aria-hidden="true">  
50 - <div class="modal-dialog">  
51 - <div class="modal-content">  
52 - <div class="modal-header">  
53 - <button type="button" class="close" data-dismiss="modal"  
54 - aria-hidden="true">&times;</button>  
55 - <h4 class="modal-title" id="myModalLabel">选择显示的列</h4>  
56 - </div>  
57 - <div class="modal-body" id="cols" style="float: left;">  
58 - <input type="checkbox" onClick="checkAll(this);" id="checkboxForAll"/><label>全选</label><br />  
59 - <br />  
60 -  
61 - </div>  
62 - <div class="modal-footer">  
63 - <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>  
64 - <button type="button" class="btn btn-primary" data-dismiss="modal" onClick="initTable();">提交更改</button>  
65 - </div>  
66 - </div>  
67 - <!-- /.modal-content -->  
68 - </div>  
69 - <!-- /.modal -->  
70 - </div>  
71 -  
72 -  
73 48
74 <script th:inline="javascript"> 49 <script th:inline="javascript">
75 50
@@ -153,7 +128,7 @@ @@ -153,7 +128,7 @@
153 128
154 function add(obj){ 129 function add(obj){
155 if($(obj)[0].className.indexOf("disabled") == -1) 130 if($(obj)[0].className.indexOf("disabled") == -1)
156 - $.operate.addFull(); 131 + addFull();
157 } 132 }
158 133
159 new Vue({ 134 new Vue({
@@ -340,12 +315,13 @@ @@ -340,12 +315,13 @@
340 title: '末站' 315 title: '末站'
341 },{ 316 },{
342 field: 'examineStatus', 317 field: 'examineStatus',
343 - title: '审核状态' 318 + title: '状态'
344 }]; 319 }];
345 320
346 321
347 createTable(cols); 322 createTable(cols);
348 }); 323 });
  324 + //自定义修改弹层
349 function edit(id) { 325 function edit(id) {
350 table.set(); 326 table.set();
351 if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) { 327 if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
@@ -394,15 +370,70 @@ @@ -394,15 +370,70 @@
394 shade: 0.3, 370 shade: 0.3,
395 title: title, 371 title: title,
396 content: url, 372 content: url,
397 - btn: ['修改', '删除'], 373 + btn: ['保存','提交','删除'],
398 // 弹层外区域关闭 374 // 弹层外区域关闭
399 shadeClose: true, 375 shadeClose: true,
400 yes: callback, 376 yes: callback,
401 - btn2: function(index, layero){ 377 + btn2: function(index, layero) {
  378 + var iframeWin = layero.find('iframe')[0];
  379 + iframeWin.contentWindow.submitHandlerCommit(index, layero);
  380 + return false;
  381 + },
  382 + btn3: function(index, layero){
402 $.operate.remove(id) 383 $.operate.remove(id)
403 } 384 }
404 }); 385 });
405 layer.full(index); 386 layer.full(index);
  387 + };
  388 +
  389 + //自定义新增弹层
  390 + function addFull(id) {
  391 + table.set();
  392 + openFull("添加" + table.options.modalName, $.operate.addUrl(id));
  393 + };
  394 +
  395 + function openFull (title, url, width, height) {
  396 + // 如果是移动端，就使用自适应大小弹窗
  397 + if ($.common.isMobile()) {
  398 + width = 'auto';
  399 + height = 'auto';
  400 + }
  401 + if ($.common.isEmpty(title)) {
  402 + title = false;
  403 + }
  404 + if ($.common.isEmpty(url)) {
  405 + url = "/404.html";
  406 + }
  407 + if ($.common.isEmpty(width)) {
  408 + width = 800;
  409 + }
  410 + if ($.common.isEmpty(height)) {
  411 + height = ($(window).height() - 50);
  412 + }
  413 + var index = layer.open({
  414 + type: 2,
  415 + area: [width + 'px', height + 'px'],
  416 + fix: false,
  417 + //不固定
  418 + maxmin: true,
  419 + shade: 0.3,
  420 + title: title,
  421 + content: url,
  422 + btn: ['保存', '提交'],
  423 + // 弹层外区域关闭
  424 + shadeClose: true,
  425 + yes: function(index, layero) {
  426 + var iframeWin = layero.find('iframe')[0];
  427 + iframeWin.contentWindow.submitHandler(index, layero);
  428 + return false;
  429 + },
  430 + btn2: function(index, layero) {
  431 + var iframeWin = layero.find('iframe')[0];
  432 + iframeWin.contentWindow.submitHandlerCommit(index, layero);
  433 + return false;
  434 + }
  435 + });
  436 + layer.full(index);
406 } 437 }
407 </script> 438 </script>
408 <style> 439 <style>
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
  View file @829f99f
@@ -165,7 +165,7 @@ @@ -165,7 +165,7 @@
165 165
166 function queryParams(params) { 166 function queryParams(params) {
167 var search = $.table.queryParams(params); 167 var search = $.table.queryParams(params);
168 - search.examineStatus='0'; 168 + search.examineStatus='1';
169 var createTimeStr=$('#createTimeStr').val(); 169 var createTimeStr=$('#createTimeStr').val();
170 var createTimeEnd=$('#createTimeEnd').val(); 170 var createTimeEnd=$('#createTimeEnd').val();
171 search.createTimeStr=createTimeStr; 171 search.createTimeStr=createTimeStr;
@@ -318,230 +318,7 @@ @@ -318,230 +318,7 @@
318 },{ 318 },{
319 field: 'examineType', 319 field: 'examineType',
320 title: '审核类型' 320 title: '审核类型'
321 - },{  
322 - field: 'examineStatus',  
323 - title: '审核状态'  
324 - }/*,  
325 - {  
326 - field: 'lineType',  
327 - title: '线路属性'  
328 - },  
329 - {  
330 - field: 'district',  
331 - title: '区属'  
332 - },  
333 - {  
334 - field: 'inoutDistrict',  
335 - title: '是否区内'  
336 - },  
337 - {  
338 - field: 'serviceState',  
339 - title: '营运状态'  
340 - },  
341 - {  
342 - field: 'busType',  
343 - title: '车辆类型'  
344 - },  
345 - {  
346 - field: 'airConditionerType',  
347 - title: '是否空调'  
348 - },  
349 - {  
350 - field: 'sellTicketType',  
351 - title: '售票类型'  
352 - },  
353 - {  
354 - field: 'serviceTime',  
355 - title: '运营时间'  
356 - },  
357 - {  
358 - field: 'lineDistance',  
359 - title: '线路长度'  
360 - },  
361 - {  
362 - field: 'lineCode',  
363 - title: '线路编码'  
364 - },  
365 - {  
366 - field: 'warrantYear',  
367 - title: '授权年限'  
368 - },  
369 - {  
370 - field: 'warrantStartTime',  
371 - title: '授权起始日期'  
372 - },  
373 - {  
374 - field: 'warrantEndTime',  
375 - title: '授权结束日期'  
376 - },  
377 - {  
378 - field: 'planCancelTime',  
379 - title: '撤销日期'  
380 - },  
381 - {  
382 - field: 'cancelTime',  
383 - title: '实际撤销日期'  
384 - },  
385 - {  
386 - field: 'cancelReason',  
387 - title: '撤销原因'  
388 - },  
389 - {  
390 - field: 'remark',  
391 - title: '备注'  
392 - },  
393 - {  
394 - field: 'isLogicDelete',  
395 - title: '是否逻辑删除'  
396 - },  
397 - {  
398 - field: 'updateBy',  
399 - title: '更新人'  
400 - },  
401 - {  
402 - field: 'updateTime',  
403 - title: '更新时间'  
404 - },  
405 - {  
406 - field: 'timeSchedule',  
407 - title: '行车作业计划表报备时间'  
408 - },  
409 - {  
410 - field: 'park',  
411 - title: '停车场'  
412 - },  
413 - {  
414 - field: 'isWarrant',  
415 - title: '是否权证'  
416 - },  
417 - {  
418 - field: 'isWarrantStartTime',  
419 - title: '权证开通日期'  
420 - },  
421 - {  
422 - field: 'isWarrantEndTime',  
423 - title: '权证到期日期'  
424 - },  
425 - {  
426 - field: 'roadType',  
427 - title: '道路类型'  
428 - },  
429 - {  
430 - field: 'ticketPrice',  
431 - title: '票价'  
432 - },  
433 - {  
434 - field: 'firstStation',  
435 - title: '首站'  
436 - },  
437 - {  
438 - field: 'startEnd',  
439 - title: '起讫站'  
440 - },  
441 - {  
442 - field: 'firstTime',  
443 - title: '首战时间'  
444 - },  
445 - {  
446 - field: 'lastStation',  
447 - title: '末站'  
448 - },  
449 - {  
450 - field: 'lastTime',  
451 - title: '末站首战时间'  
452 - },  
453 - {  
454 - field: 'mileageUp',  
455 - title: '上行里程数'  
456 - },  
457 - {  
458 - field: 'mileageDown',  
459 - title: '下行里程数'  
460 - },  
461 - {  
462 - field: 'averageMileage',  
463 - title: '平均里程数'  
464 - },  
465 - {  
466 - field: 'stationUp',  
467 - title: '站级数(上行)'  
468 - },  
469 - {  
470 - field: 'stationDown',  
471 - title: '站级数(下行)'  
472 - },{  
473 - field: 'travelTimeUp',  
474 - title: '行驶时间(上行)'  
475 - },{  
476 - field: 'travelTimeDown',  
477 - title: '行驶时间(下行)'  
478 - },{  
479 - field: 'travelIntervalUp',  
480 - title: '行驶间隔(高峰)'  
481 - },{  
482 - field: 'travelIntervalDown',  
483 - title: '行驶间隔(低谷)'  
484 - },{  
485 - field: 'warrantVehiclesLarge',  
486 - title: '经营权证(大巴)'  
487 - }, {  
488 - field: 'warrantVehiclesMiddle',  
489 - title: '经营权证(中巴)'  
490 - },{  
491 - field: 'vehiclesNumber',  
492 - title: '实际配车数'  
493 - }, {  
494 - field: 'numberVehiclesLarge',  
495 - title: '实际车辆数(大巴)'  
496 - }, {  
497 - field: 'numberVehiclesMiddle',  
498 - title: '实际车辆数(中巴)'  
499 - },{  
500 - field: 'carPlate',  
501 - title: '车辆自编号'  
502 - },{  
503 - field: 'numberPerson',  
504 - title: '线路总配人数'  
505 - },{  
506 - field: 'numberPersonDriver',  
507 - title: '人数司机'  
508 - }, {  
509 - field: 'numberPersonSales',  
510 - title: '售票员数'  
511 - },{  
512 - field: 'busEvNumber',  
513 - title: '新能源车数'  
514 - },{  
515 - field: 'directions',  
516 - title: '线路走向'  
517 - },{  
518 - field: 'numberOfManage',  
519 - title: '经营权证数'  
520 - },{  
521 - field: 'halfwayStation',  
522 - title: '站点名称'  
523 - },{  
524 - field: 'fullCustomerPercent',  
525 - title: '高峰系数'  
526 - },{  
527 - field: 'lowCustomerPercent',  
528 - title: '低谷系数'  
529 - }, {  
530 - field: 'divideLevel',  
531 - title: '间隔等级'  
532 - },{  
533 - field: 'hasTimelists',  
534 - title: '是否挂牌'  
535 - },{  
536 - field: 'isMetro',  
537 - title: '是否轨交末班车衔接'  
538 - },{  
539 - field: 'metroTime',  
540 - title: '轨交时间'  
541 - },{  
542 - field: 'coldBonusType',  
543 - title: '冷僻线路补贴类型'  
544 - }*/]; 321 + }];
545 322
546 323
547 createTable(cols); 324 createTable(cols);
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @829f99f
@@ -681,8 +681,12 @@ @@ -681,8 +681,12 @@
681 681
682 function submitHandler() { 682 function submitHandler() {
683 if ($.validate.form()) { 683 if ($.validate.form()) {
684 - $.operate.save(prefix + "/edit", $('#form-line-edit')  
685 - .serialize()); 684 + $.operate.save(prefix + "/edit", $('#form-line-edit').serialize());
  685 + }
  686 + }
  687 + function submitHandlerCommit() {
  688 + if ($.validate.form()) {
  689 + $.operate.save(prefix + "/edit", $('#form-line-edit').serialize()+'&examineStatus=1');
686 } 690 }
687 } 691 }
688 692
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @829f99f
@@ -27,7 +27,8 @@ @@ -27,7 +27,8 @@
27 type="primary" 27 type="primary"
28 size="large" 28 size="large"
29 :timestamp="line.startDate" @click.native="change(index);"> 29 :timestamp="line.startDate" @click.native="change(index);">
30 - {{line.lineUpdateType}} 30 + {{line.lineUpdateType}}(
  31 + {{line.startReason}})
31 </el-timeline-item> 32 </el-timeline-item>
32 </el-timeline> 33 </el-timeline>
33 </el-col> 34 </el-col>
@@ -74,10 +75,8 @@ @@ -74,10 +75,8 @@
74 </div> 75 </div>
75 <div class="col-sm-6"> 76 <div class="col-sm-6">
76 <label class="col-sm-3 control-label">线路类型：</label> 77 <label class="col-sm-3 control-label">线路类型：</label>
77 - <span class="col-sm-9">  
78 - 78 + <span class="col-sm-9">
79 {{line.lineType}} 79 {{line.lineType}}
80 -  
81 </span> 80 </span>
82 </div> 81 </div>
83 <div class="col-sm-6"> 82 <div class="col-sm-6">
@@ -211,7 +210,8 @@ @@ -211,7 +210,8 @@
211 </div> 210 </div>
212 <div class="col-sm-6"> 211 <div class="col-sm-6">
213 <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label> 212 <label class="col-sm-3 control-label">票价(多级票价用 - 隔开)：</label>
214 - <span class="col-sm-9"> 213 + <span class="col-sm-9" >
  214 + <input type="text" th:value="${line!=null?line:line}">
215 {{line.ticketPrice}} 215 {{line.ticketPrice}}
216 </span> 216 </span>
217 </div> 217 </div>
@@ -534,10 +534,8 @@ @@ -534,10 +534,8 @@
534 </div> 534 </div>
535 <div class="col-sm-6"> 535 <div class="col-sm-6">
536 <label class="col-sm-3 control-label">线路类型：</label> 536 <label class="col-sm-3 control-label">线路类型：</label>
537 - <span class="col-sm-9">  
538 - 537 + <span class="col-sm-9">
539 {{oldLine.lineType}} 538 {{oldLine.lineType}}
540 -  
541 </span> 539 </span>
542 </div> 540 </div>
543 <div class="col-sm-6"> 541 <div class="col-sm-6">
@@ -677,7 +675,6 @@ @@ -677,7 +675,6 @@
677 </div> 675 </div>
678 <div class="col-sm-6"> 676 <div class="col-sm-6">
679 <label class="col-sm-3 control-label">首站：</label> 677 <label class="col-sm-3 control-label">首站：</label>
680 - <span class="col-sm-9">  
681 {{oldLine.firstStation}} 678 {{oldLine.firstStation}}
682 </span> 679 </span>
683 </div> 680 </div>
@@ -1080,17 +1077,20 @@ @@ -1080,17 +1077,20 @@
1080 lines : null, 1077 lines : null,
1081 line:null, 1078 line:null,
1082 oldLine: null, 1079 oldLine: null,
1083 -  
1084 visible: false } 1080 visible: false }
1085 }, 1081 },
1086 methods:{ 1082 methods:{
1087 change(index){ 1083 change(index){
1088 console.log(index); 1084 console.log(index);
1089 -  
1090 this.line = this.lines[index]; 1085 this.line = this.lines[index];
1091 - 1086 + var l=this.line;
1092 this.oldLine = this.lines[index+1]; 1087 this.oldLine = this.lines[index+1];
1093 - 1088 + var ol=this.oldLine;
  1089 + /* for(let f in l){
  1090 + if(l[f]!=ol[f]){
  1091 + $('#ticketPrice').attr('style','color: red');
  1092 + }
  1093 + }*/
1094 }, 1094 },
1095 1095
1096 } 1096 }
bsthLineProfiles/src/main/resources/templates/system/lineHistory/line.html
  View file @829f99f
@@ -322,6 +322,9 @@ @@ -322,6 +322,9 @@
322 { 322 {
323 field: 'lastStation', 323 field: 'lastStation',
324 title: '末站' 324 title: '末站'
  325 + },{
  326 + field: 'examineStatus',
  327 + title: '状态'
325 }]; 328 }];
326 329
327 330
@@ -375,22 +378,23 @@ @@ -375,22 +378,23 @@
375 shade: 0.3, 378 shade: 0.3,
376 title: title, 379 title: title,
377 content: url, 380 content: url,
378 - btn: ['变更', '返回'], 381 + btn: ['保存', '提交'],
379 // 弹层外区域关闭 382 // 弹层外区域关闭
380 shadeClose: true, 383 shadeClose: true,
381 - yes: function(index, layero){ 384 + yes: callback,
  385 + btn2:function(index, layero){
382 var iframe = window["layui-layer-iframe" + index]; 386 var iframe = window["layui-layer-iframe" + index];
383 if(iframe.f==true){ 387 if(iframe.f==true){
384 layer.confirm("存在待执行的申请,是否重新申请",{ 388 layer.confirm("存在待执行的申请,是否重新申请",{
385 btn: ['是', '否'] 389 btn: ['是', '否']
386 },function (index, layero) { 390 },function (index, layero) {
387 - iframe.submitHandler(index, layero); 391 + iframe.submitHandlerCommit(index, layero);
388 layer.close(index); 392 layer.close(index);
389 }); 393 });
390 }else { 394 }else {
391 - iframe.submitHandler(index, layero); 395 + iframe.submitHandlerCommit(index, layero);
392 } 396 }
393 - }, 397 + }
394 }); 398 });
395 layer.full(index); 399 layer.full(index);
396 } 400 }