修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java

@@ -172,18 +172,22 @@ public class RouteController extends AbstractBaseController {
 	@ApiOperation(value = "新*保存巡检路线", notes = "新*保存巡检路线")
 	@PutMapping(value = "/saveUpdateNew", produces = "application/json;charset=UTF-8")
 	public CommonResponse saveRouteNew(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
-		try {
+
 			ReginParams reginParams = getSelectedOrgInfo();
 			String loginOrgCode = getOrgCode(reginParams);
 			route.setOrgCode(loginOrgCode);
 
-			if(!StringUtils.isEmpty(route.getName())){
-				List<Route> list = iRouteDao.getListByName(route.getName());
-				if (!ObjectUtils.isEmpty(list) || list.size()>0){
-					throw new BadRequest("该名称路线已存在");
-				}
-			}
 
+        if(!org.apache.commons.lang3.StringUtils.isEmpty(route.getName())){
+            List<Route> list =null;
+
+            list = route.getId()>0?iRouteDao.getListByNameUpdate(route.getId(),route.getName()):iRouteDao.getListByName(route.getName());
+
+            if (!ObjectUtils.isEmpty(list) || list.size()>0){
+                throw new BadRequest("该名称路线已存在");
+            }
+        }
+        try {
 			if(route.getDeptId()!=null){
 				//查询jcs
 				ResponseModel<Object> companyInfo = jcsFeignClient.getCompanyInfo(route.getDeptId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyPreCtrlController.java

@@ -114,13 +114,13 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 		List<HashMap<String, Object>> seriesData=new ArrayList<>();
 		HashMap<String, Object> actualNummap=new HashMap<>();
 		actualNummap.put("data",actualNum);
-		actualNummap.put("name","计划巡检次数");
+		actualNummap.put("name","实际巡检次数");
 		HashMap<String, Object> forNummap=new HashMap<>();
 		forNummap.put("data",forNum);
 		forNummap.put("name","漏检次数");
 		HashMap<String, Object> proNummap=new HashMap<>();
 		proNummap.put("data",proNum);
-		proNummap.put("name","实际巡检次数");
+		proNummap.put("name","计划巡检次数");
 		seriesData.add(proNummap);
 		seriesData.add(forNummap);
 		seriesData.add(actualNummap);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/repository/IRouteDao.java

@@ -25,4 +25,6 @@ public interface IRouteDao extends BaseDao<Route, Long> {
 
     @Query(value = "select * from p_route where `name` = ?1 and is_delete =0", nativeQuery = true)
     List<Route> getListByName(String name);
+    @Query(value = "select * from p_route where id !=?1 and `name` = ?2 and is_delete =0", nativeQuery = true)
+    List<Route> getListByNameUpdate(Long id,String name);
 }