Merge branch 'develop_dl_plan6_temp' of…

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

@@ -19,6 +19,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import com.yeejoin.amos.patrol.core.enums.QueryOperatorEnum;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -137,6 +138,42 @@ public class CheckController extends AbstractBaseController {
 
 
 
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "巡检记录查询", notes = "巡检记录查询")
+    @RequestMapping(value = "/listXNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    public CommonResponse qryCheckInfoPageNew(
+            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
+            @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("bizOrgCode", reginParams.getPersonIdentity().getCompanyBizOrgCode());
+
+        CheckInfoPageParam param = CheckPageParamUtil.fillCheckInfoParam(queryRequests, commonPageable, paramMap);
+        if (ObjectUtils.isEmpty(param.getOrderBy())) {
+            param.setOrderBy("checkDate desc");
+        }
+        Page<CheckInfoVo> list = checkService.getCheckInfoNew(null,null,null,param);
+        return CommonResponseUtil.success(list);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "保存巡检记录<font color='blue'>手机app</font>", notes = "保存巡检记录<font color='blue'>手机app</font>")
     @RequestMapping(value = "/saveRecordNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
@@ -423,6 +460,34 @@ public class CheckController extends AbstractBaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取巡检日历数据<font color='blue'>手机app</font>", notes = "获取巡检日历数据<font color='blue'>手机app</font>")
+    @PostMapping(value = "/checkCalendarNew", produces = "application/json;charset=UTF-8")
+    public CommonResponse checkCalendarNew(
+            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
+        try {
+            ReginParams reginParams = getSelectedOrgInfo();
+           // String loginOrgCode = getOrgCode(reginParams);
+
+            String loginOrgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode();
+//            String roleTypeName = getRoleTypeName(reginParams);
+            List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, false, null, null);
+
+            DaoCriteria childCompDaoCriteria = new DaoCriteria();
+            childCompDaoCriteria.setPropertyName("bizOrgCode");
+            childCompDaoCriteria.setOperator(QueryOperatorEnum.LIKE.getName());
+            childCompDaoCriteria.setValue(loginOrgCode);
+            daoCriterias.add(childCompDaoCriteria);
+
+
+            Map<String, Object> map = checkService.checkCalendar(CheckParamUtil.checkCalendar(daoCriterias));
+            return CommonResponseUtil.success(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+
+    }
 
 
 //    @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -513,6 +578,38 @@ public class CheckController extends AbstractBaseController {
     }
 
 
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取巡检点巡检记录列表信息<font color='blue'>手机app</font>", notes = "获取巡检点巡检记录列表信息<font color='blue'>手机app</font>")
+    @RequestMapping(value = "/queryCheckRecordNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    public CommonResponse queryRecordByPointIdNew(
+            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
+        ReginParams reginParams = getSelectedOrgInfo();
+//        String loginOrgCode = getOrgCode(reginParams);
+//        String roleTypeName = getRoleTypeName(reginParams);
+//        String departmentId = getDepartmentId(reginParams);
+        HashMap<String, Object> req = CheckPageParamUtil.fillInfo(queryRequests);
+        req.put("orgCode", reginParams.getPersonIdentity().getCompanyBizOrgCode());
+
+
+//        if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase())
+//                || XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) {
+//            req.put("orgCode", loginOrgCode);
+//        } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName.toUpperCase())) {
+//            req.put("departmentId",departmentId);
+//        } else {
+//            if(StringUtil.isNotEmpty(req.get("userId"))&&req.get("userId")==null){
+//                req.put("userId", getUserId());
+//            }
+//        }
+        Map<String, Object> map = checkService.queryRecordByPointId(req);
+        return CommonResponseUtil.success(map);
+    }
+
+
+
     /**
      * 根据检查项ID获取所有不合格检查项
      *

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

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import opennlp.tools.util.HashList;
 import org.slf4j.Logger;
@@ -52,6 +53,50 @@ public class GroupController extends AbstractBaseController{
 	@Autowired
 	JcsFeignClient jcsFeignClient;
 
+
+
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "获取当前用户所属公司的所有部门", notes = "获取当前用户所属公司的所有部门")
+	@RequestMapping(value = "/queryDeptNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+	public CommonResponse queryCurrentCompanyDeptNew() {
+
+			List<LinkedHashMap<String, Object>> res = new ArrayList<>();
+		FeignClientResult<List<Map<String, Object>>> listFeignClientResult = jcsFeignClient.getDetByCompanyId();
+		List<Map<String, Object>> list=listFeignClientResult.getResult();
+		for (Map<String, Object> d : list) {
+			LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
+			dept.put("id", d.get("sequenceNbr").toString());
+			dept.put("key", d.get("sequenceNbr").toString());
+			dept.put("value", d.get("sequenceNbr").toString());
+			dept.put("state", "open");
+			dept.put("type", "department");
+			dept.put("orgCode", d.get("bizOrgCode").toString()+"-"+d.get("sequenceNbr").toString());
+			dept.put("label", d.get("bizOrgName").toString());
+			dept.put("title", d.get("bizOrgName").toString());
+			dept.put("name", d.get("bizOrgName").toString());
+			dept.put("writeable", 0);
+			res.add(dept);
+		}
+		return CommonResponseUtil.success(res);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	 * 部门查询
 	 * @return

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

@@ -296,11 +296,12 @@ public class InputItemController extends AbstractBaseController {
 		//LoginUserParam user = CurUserCompanyCache.getInstance().getCurCompany(getUserId(), getToken());
 
 		  ReginParams reginParams = getSelectedOrgInfo();
-	        String loginOrgCode = getOrgCode(reginParams);
+//	        String loginOrgCode = getOrgCode(reginParams);
+		String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
 
 
 		HashMap<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("orgCode", loginOrgCode);
+		paramMap.put("bizOrgCode", bizOrgCode);
 		InputItemPageParam criterias = InputItemParamUtil.fillInputItemPageParam(queryRequests, pageable, paramMap);
 		Page<InputItemVo> page = inputItemService.queryInputItemByPage(criterias);
 		return CommonResponseUtil.success(page);

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

 package com.yeejoin.amos.patrol.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
+import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.param.PlanInfoPageParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IPlanService;
 import com.yeejoin.amos.patrol.business.util.CommonResponse;
@@ -21,8 +23,8 @@ import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import java.util.HashMap;
-import java.util.List;
+import javax.persistence.Column;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/plan")
@@ -32,7 +34,8 @@ public class PlanController extends AbstractBaseController {
     @Autowired
     private IPlanService planService;
 
-
+    @Autowired
+    JcsFeignClient jcsFeignClient;
 
     /**
      * 新加接口
@@ -57,6 +60,19 @@ public class PlanController extends AbstractBaseController {
 
 
 
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "查询计划列表(<font color='blue'>手机app</font>)", notes = "查询计划列表(<font color='blue'>手机app</font>)")
+    @RequestMapping(value = "/queryPlanListNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse queryPlanListNew() {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String loginOrgCode =reginParams.getPersonIdentity().getBizOrgCode();
+        List<HashMap<String, Object>> list = planService.queryPlanListByOrgCode(loginOrgCode);
+        return CommonResponseUtil.success(list);
+    }
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "巡检计划查询", notes = "巡检计划查询")
     @RequestMapping(value = "/queryPlanByOrgCodeNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
@@ -129,6 +145,33 @@ public class PlanController extends AbstractBaseController {
             HashMap<String, Object> map = new HashMap<String, Object>();
             map.put("org_code", loginOrgCode);
             map.put("user_id", userId);
+            Map<String, String> deptMap = new HashMap<>();
+            Set<String> departmentIds = new HashSet<>();
+            List<String> depts = Arrays.asList(param.getUserDept().split(","));
+            depts.stream().forEach(dept -> {
+                deptMap.put(dept.substring(0, dept.indexOf("@")), dept.substring(dept.indexOf("@") + 1));
+            });
+            for (String entry : deptMap.keySet()) {
+                String entryValue = deptMap.get(entry);
+                departmentIds.add(entryValue);
+            }
+
+            StringBuffer departmentIdBuffer = new StringBuffer();
+            Iterator<String> it = departmentIds.iterator();
+            while (it.hasNext()) {
+                departmentIdBuffer.append(it.next()).append(",");
+            }
+
+            if(departmentIds.size() > 0){
+                FeignClientResult<List<Map<String, Object>>> departmentModeldate=   jcsFeignClient.selectByIdDeptList
+                        (departmentIdBuffer.toString().substring(0, departmentIdBuffer.toString().length() - 1));
+                List<Map<String, Object>> departmentModels = departmentModeldate.getResult();
+                if(departmentModels!=null&&departmentModels.size()>0){
+                    Map<String, Object> mapj= departmentModels.get(0);
+                    param.setBizOrgCode(mapj.get("bizOrgCode").toString());
+                    param.setBizOrgName(mapj.get("bizOrgName").toString());
+                }
+            }
             map.put("param", param);
             planService.addPlan(map);
             return CommonResponseUtil.success();

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

@@ -142,7 +142,30 @@ public class PointController extends AbstractBaseController {
 	}
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "新增移动巡检点(<font color='blue'>手机app</font>)", notes = "新增移动巡检点(<font color='blue'>手机app</font>)")
+	@PostMapping(value = "/addMovePointNew", produces = "application/json;charset=UTF-8")
+	public CommonResponse addMovePointNew(@RequestBody MovePointParam param) {
+		AgencyUserModel user = getUserInfo();
+		if (ObjectUtils.isEmpty(user)) {
+			return CommonResponseUtil.failure("用户session过期");
+		}
+		try {
 
+			ReginParams reginParams = getSelectedOrgInfo();
+			String loginOrgCode = getOrgCode(reginParams);
+			param.setOrgCode(loginOrgCode);	//点归属于公司
+			param.setCreatorId(user.getUserId());
+			param.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
+			param.setBizOrgName(reginParams.getPersonIdentity().getCompanyName());
+			param.setChargeDeptId(reginParams.getPersonIdentity().getCompanyId());
+			iPointService.addMovePoint(param);
+			return CommonResponseUtil.success();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return CommonResponseUtil.failure("巡检点新增失败");
+		}
+	}
 
 
 
@@ -362,12 +385,14 @@ public class PointController extends AbstractBaseController {
 				if(list.size()==1){
 					return CommonResponseUtil.failure("巡查点最少保留一个巡查对象！");
 				}
-				//删除对象
-				iPointClassifyDao.deleteById(id);
+
 				//删除检查项
 				iPointInputItemDao.deleteClassifyId(id);
 				//删除巡检路线和项的关系表
 				iRoutePointItemDao.delRoutePointItemByPointClassifyId(id);
+				//删除对象
+				iPointClassifyDao.deleteById(id);
+
 
 			}
 

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

@@ -112,6 +112,30 @@ public class RouteController extends AbstractBaseController {
 	}
 
 
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "查询所有路线列表<font color='blue'>手机app</font>", notes = "查询所有路线列表<font color='blue'>手机app</font>")
+	@GetMapping(value = "/routeListNew", produces = "application/json;charset=UTF-8")
+	public CommonResponse queryRouteListNew() {
+		try {
+
+			ReginParams reginParams = getSelectedOrgInfo();
+
+
+			List<HashMap<String, Object>> routeList = routeService.queryRouteListByOrgCodeNew(reginParams.getPersonIdentity().getBizOrgCode(),null);
+			routeList=routeList.stream().distinct().collect(Collectors.toList());
+			return CommonResponseUtil.success(routeList);
+		} catch (Exception e) {
+			return CommonResponseUtil.failure(e.getMessage());
+		}
+	}
+
+
+
+
+
+
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询当前登录公司的的所有巡检路线", notes = "查询当前登录公司的的所有巡检路线")
 	@GetMapping(value = "/AllNew", produces = "application/json;charset=UTF-8")

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

@@ -11,6 +11,7 @@ import java.util.TreeSet;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.param.PushMsgParam;
 import com.yeejoin.amos.patrol.feign.PushFeignServer;
 import org.slf4j.Logger;
@@ -93,6 +94,180 @@ public class UserController extends AbstractBaseController {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    JcsFeignClient jcsFeignClient;
+
+
+
+
+
+
+
+
+
+    /**
+     * 查询用户部门人员树
+     *
+     * @return
+     * @RequestParam userName 用户名
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "通讯录(<font color='blue'>手机app</font>)", notes = "通讯录(<font color='blue'>手机app</font>)")
+    @RequestMapping(value = "/queryUserAddressListNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public CommonResponse queryUserAddressListTreeNew(
+            @ApiParam(value = "用户名", required = false) @RequestParam(value = "userName", required = false) String userName) {
+        try {
+            FeignClientResult<List<Map<String, Object>>> listFeignClientResult = jcsFeignClient.getDetByCompanyId();
+            List<Map<String, Object>> list1=listFeignClientResult.getResult();
+            DepartmentUserTreeAppVo departmentUserTreeDto = new DepartmentUserTreeAppVo();
+            if (list1 != null && list1.size() > 0) {
+                buildUserDeptTree(departmentUserTreeDto, list1);
+            }
+            List<LinkedHashMap<String, Object>> content = new ArrayList<>();
+            //数据重新封装
+            List<DepartmentUserTreeAppVo> list = departmentUserTreeDto.getChildren();
+            for (DepartmentUserTreeAppVo departmentUserTreeAppVo : list) {
+                LinkedHashMap<String, Object> otherDept = new LinkedHashMap<>();
+
+
+                    otherDept.put("children", paraseData1New(departmentUserTreeAppVo.getChildren(), departmentUserTreeAppVo.getName(), departmentUserTreeAppVo.getId(), userName));
+                    otherDept.put("id", departmentUserTreeAppVo.getId());
+                    otherDept.put("key", departmentUserTreeAppVo.getId());
+                    otherDept.put("value", departmentUserTreeAppVo.getId());
+                    otherDept.put("state", "open");
+                    otherDept.put("type", "department");
+                    otherDept.put("label", departmentUserTreeAppVo.getName());
+                    otherDept.put("title", departmentUserTreeAppVo.getName());
+                    otherDept.put("name", departmentUserTreeAppVo.getName());
+                    otherDept.put("desc", null);
+                    otherDept.put("writeable", 0);
+                    otherDept.put("attributes", "");
+                    content.add(otherDept);
+            }
+            return CommonResponseUtil.success(content);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("通讯录异常", e);
+            return CommonResponseUtil.failure("系统繁忙，请稍后再试");
+        }
+
+
+    }
+
+
+
+
+
+
+    private void buildUserDeptTree(DepartmentUserTreeAppVo deptUser,  List<Map<String, Object>> childs) {
+        for (int i = 0; i < childs.size(); i++) {
+            Map<String, Object> d = childs.get(i);
+            DepartmentUserTreeAppVo treeDto = new DepartmentUserTreeAppVo();
+            treeDto.setName(d.get("bizOrgName").toString());
+            treeDto.setId(d.get("sequenceNbr").toString());
+            treeDto.setType("department");
+
+            List<Map<String, Object>> userModelList = jcsFeignClient.getPersonListByCompanyId(d.get("sequenceNbr").toString()).getResult();
+            if (userModelList != null && userModelList.size() > 0) {
+                UserDeptTreeNew(treeDto, userModelList);
+            }
+
+            deptUser.getChildren().add(treeDto);
+        }
+    }
+
+
+    private void UserDeptTreeNew(DepartmentUserTreeAppVo deptUser, List<Map<String, Object>> childs) {
+
+        for (int i = 0; i < childs.size(); i++) {
+            Map<String, Object> d = childs.get(i);
+            DepartmentUserTreeAppVo treeDto = new DepartmentUserTreeAppVo();
+            treeDto.setName(d.get("bizOrgName").toString());
+            treeDto.setId(d.get("amosOrgId").toString());
+            treeDto.setType("user");
+            Map<String, String> user = Maps.newHashMap();
+            user.put("mobile", null);
+            user.put("telephone", null);
+            user.put("email", null);
+            treeDto.setObject(user);
+            deptUser.getChildren().add(treeDto);
+        }
+    }
+
+
+    private List<LinkedHashMap<String, Object>> paraseData1New(List<DepartmentUserTreeAppVo> map, String name, String depid, String username) {
+
+        List<LinkedHashMap<String, Object>> content = new ArrayList<>();
+        if (map != null && map.size() > 0) {
+            for (DepartmentUserTreeAppVo departmentUserTreeAppVo : map) {
+
+
+                if ("dept".equals(departmentUserTreeAppVo.getType())) {
+                    LinkedHashMap<String, Object> otherDept = new LinkedHashMap<>();
+                    otherDept.put("children", paraseData1New( departmentUserTreeAppVo.getChildren(), departmentUserTreeAppVo.getName(), departmentUserTreeAppVo.getId(), username));
+                    otherDept.put("id", departmentUserTreeAppVo.getId());
+                    otherDept.put("key", departmentUserTreeAppVo.getId());
+                    otherDept.put("value", departmentUserTreeAppVo.getId());
+                    otherDept.put("state", "open");
+                    otherDept.put("type", "department");
+                    otherDept.put("label", departmentUserTreeAppVo.getName());
+                    otherDept.put("title", departmentUserTreeAppVo.getName());
+                    otherDept.put("name", departmentUserTreeAppVo.getName());
+                    otherDept.put("desc", null);
+                    otherDept.put("writeable", 0);
+                    otherDept.put("attributes", "");
+                    content.add(otherDept);
+                } else {
+                    LinkedHashMap<String, Object> user = new LinkedHashMap<>();
+                    user.put("id", departmentUserTreeAppVo.getId());
+                    user.put("key", departmentUserTreeAppVo.getId());
+                    user.put("value", departmentUserTreeAppVo.getId());
+                    user.put("checked", false);
+                    user.put("state", "open");
+                    user.put("type", "user");
+                    user.put("label", departmentUserTreeAppVo.getName());
+                    user.put("title", departmentUserTreeAppVo.getName());
+                    user.put("name", departmentUserTreeAppVo.getName());
+                    user.put("desc", null);
+                    user.put("writeable", 0);
+                    user.put("userName", departmentUserTreeAppVo.getName());
+                    user.put("depid", depid);
+                    //获取电话邮箱
+                    Map<String, String> userObj = departmentUserTreeAppVo.getObject();
+                    if (userObj != null && userObj.get("telephone") != null) {
+                        user.put("mobile", userObj.get("telephone"));
+                    } else {
+                        user.put("mobile", "");
+                    }
+                    if (userObj != null && userObj.get("email") != null) {
+                        user.put("email", userObj.get("email"));
+                    } else {
+                        user.put("email", "");
+                    }
+                    if (userObj != null && userObj.get("mobile") != null) {
+                        user.put("mobile", userObj.get("mobile"));
+                    } else {
+                        user.put("mobile", "");
+                    }
+
+                    user.put("departmentName", name);
+                    if (username != null && !"".equals(username)) {
+                        if (!ObjectUtils.isEmpty(departmentUserTreeAppVo.getName()) && departmentUserTreeAppVo.getName().indexOf(username) != -1) {
+                            content.add(user);
+                        }
+                    } else {
+                        content.add(user);
+                    }
+                }
+            }
+            return content;
+        }
+        return null;
+    }
+
+
+
+
 
     /**
      * 根据部门id查询用户信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/RouteMapper.java

@@ -71,6 +71,8 @@ public interface RouteMapper extends BaseMapper {
 	 */
 	List<HashMap<String, Object>> queryRouteListByOrgCode(@Param("orgCode") String orgCode,@Param("userId") String userId,@Param("deptId") String deptId);
 
+	List<HashMap<String, Object>> queryRouteListByOrgCodeNew(@Param("orgCode") String orgCode,@Param("userId") String userId);
+
 	/**
 	 * 获取路线巡检点个数
 	 * @param param

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

@@ -50,7 +50,6 @@ public interface JcsFeignClient {
     @GetMapping(value = "/org-usr/company/bizOrgCode/list")
     ResponseModel<Object> getCompanyByBizOrgCodeList(@RequestParam String bizOrgCode);
 
-
     /**
      * 查询用户单位信息
      * @param userId 用户id
@@ -71,5 +70,8 @@ public interface JcsFeignClient {
     @PostMapping (value = "/org-usr/selectByAmosOrgIdDeptList")
     FeignClientResult<List<Map<String, Object>>> selectByAmosOrgIdDeptList(@RequestBody String ids);
 
+
+    @PostMapping (value = "/org-usr/getDetByCompanyId")
+    FeignClientResult<List<Map<String, Object>>> getDetByCompanyId();
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/param/MovePointParam.java

@@ -23,7 +23,35 @@ public class MovePointParam {
 	private String inputItems;
 	
 	private String level = "1";
+	private String bizOrgCode;
 
+	private String bizOrgName;
+
+	private String chargeDeptId ;
+
+	public String getChargeDeptId() {
+		return chargeDeptId;
+	}
+
+	public void setChargeDeptId(String chargeDeptId) {
+		this.chargeDeptId = chargeDeptId;
+	}
+
+	public String getBizOrgCode() {
+		return bizOrgCode;
+	}
+
+	public void setBizOrgCode(String bizOrgCode) {
+		this.bizOrgCode = bizOrgCode;
+	}
+
+	public String getBizOrgName() {
+		return bizOrgName;
+	}
+
+	public void setBizOrgName(String bizOrgName) {
+		this.bizOrgName = bizOrgName;
+	}
 
 	public String getLevel() {
 		return level;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanServiceImpl.java

@@ -142,9 +142,10 @@ public class PlanServiceImpl implements IPlanService {
 	public Plan queryPlanById(Long id) {
 		Optional<Plan> plan = planDao.findById(id);
          if(Optional.ofNullable(plan).isPresent()){
-			 return null;
-		 }else{
 			 return plan.get();
+		 }else{
+			 return null;
+
 		 }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -615,7 +615,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 }
 
             //2.5.插入planTask及planTaskDetail
-            insertPlanTaskAndDet(list, plan, XJConstant.SCHED_FLAG, now);
+            insertPlanTaskAndDetNew(list, plan, XJConstant.SCHED_FLAG, now);
 
         }
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/RouteServiceImpl.java

@@ -646,7 +646,10 @@ public class RouteServiceImpl implements IRouteService {
     public List<HashMap<String, Object>> queryRouteListByOrgCode(String orgCode, String userId, String deptId) {
         return routeMapper.queryRouteListByOrgCode(orgCode, userId, deptId);
     }
-
+    @Override
+    public List<HashMap<String, Object>> queryRouteListByOrgCodeNew(String orgCode, String userId) {
+        return routeMapper.queryRouteListByOrgCodeNew(orgCode, userId);
+    }
     @Override
     public void exchangeRoutePointOrderNumber(long src, long target) {
         List<Long> ids = new ArrayList<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IRouteService.java

@@ -170,7 +170,7 @@ public interface IRouteService {
 	 * @return
 	 */
 	List<HashMap<String, Object>> queryRouteListByOrgCode(String orgCode,String userId,String deptId);
-
+	List<HashMap<String, Object>> queryRouteListByOrgCodeNew(String orgCode,String userId);
 	/**
 	 * 根据路线查询巡检点
 	 * @param routeId

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/CheckPageParamUtil.java

@@ -82,7 +82,10 @@ public class CheckPageParamUtil {
 		if(param.getEndDate() != null &&param.getEndDate().length()==10){
 			param.setEndDate(param.getEndDate()+" 23:59:59");
 		}
-		param.setOrgCode(perMap.get("orgCode") == null ? null : perMap.get("orgCode").toString());
+//		param.setOrgCode(perMap.get("orgCode") == null ? null : perMap.get("orgCode").toString());
+
+		param.setBizOrgCode(perMap.get("bizOrgCode") == null ? null : perMap.get("bizOrgCode").toString());
+
 		if ("0".equals(perMap.get("roleFlag"))) {
 			param.setUserId(perMap.get("userId") == null ? null : perMap.get("userId").toString());
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/CheckParamUtil.java

@@ -23,6 +23,8 @@ public class CheckParamUtil {
 				param.setRouteId(Long.valueOf(daoCriterias.get(i).getValue().toString()));
 			}else if("orgCode".equals(name) && operator.equals(QueryOperatorEnum.EQUAL.getName())){
 				param.setOrgCode(daoCriterias.get(i).getValue().toString()+"%");
+			}else if("bizOrgCode".equals(name)){
+				param.setOrgCode(daoCriterias.get(i).getValue().toString());
 			}
 		}		
 		return param;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/util/InputItemParamUtil.java

@@ -58,7 +58,8 @@ public class InputItemParamUtil {
                 }
             }
         }
-        param.setOrgCode(perMap.get("orgCode").toString());
+//        param.setOrgCode(perMap.get("orgCode").toString());
+        param.setBizOrgCode(perMap.get("bizOrgCode").toString());
         if (commonPageable != null) {
             param.setPageNumber(commonPageable.getPageNumber());
             param.setPageSize(commonPageable.getPageSize());

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -442,7 +442,8 @@
         DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
         <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
         <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+<!--        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>-->
+        <if test="orgCode!=null">AND org_code LIKE concat(#{orgCode},"%")</if>
     </select>
 
     <select id="calendarData" resultType="Map">
@@ -456,7 +457,8 @@
         DATE_FORMAT(check_time, '%Y-%m') = #{checkTime}
         <if test="userId!=null and userId!=0">AND FIND_IN_SET(#{userId}, user_id)>0</if>
         <if test="routeId!=null and routeId!=0">AND route_id = #{routeId}</if>
-        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>
+<!--        <if test="orgCode!=null">AND org_code LIKE #{orgCode}</if>-->
+        <if test="orgCode!=null">AND org_code  LIKE concat(#{orgCode},"%") </if>
         GROUP BY is_ok,time
         ORDER BY time
     </select>
@@ -479,7 +481,10 @@
         p_check c
         LEFT JOIN p_plan p ON p.id = c.plan_id
         WHERE 1 = 1
-        <if test="orgCode!=null">AND (c.org_code LIKE concat(#{orgCode},"-%") or c.org_code = #{orgCode})</if>
+<!--        <if test="orgCode!=null">AND (c.org_code LIKE concat(#{orgCode},"-%") or c.org_code = #{orgCode})</if>-->
+
+        <if test="orgCode!=null">AND c.org_code LIKE concat(#{orgCode},"%") </if>
+
         <if test="departmentId!=null">AND FIND_IN_SET(#{departmentId}, c.dep_id) > 0</if>
         <if test="userId != null and userId != '' ">
         	AND FIND_IN_SET(#{userId}, c.user_id) > 0

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan.xml

@@ -186,7 +186,7 @@
 	</select>
 
 	<select id="queryPlanListByOrgCode" resultType="Map">
-		select p.id, p.name from p_plan p where p.is_delete = 0 and (p.org_code like concat(#{orgCode},"-%") or p.org_code = #{orgCode})
+		select p.id, p.name from p_plan p where p.is_delete = 0 and and b.biz_org_code like concat(#{loginOrgCode},"%")
 	</select>
 
 	<update id="initUpdatePlanStatus">

amos-boot-system-patrol/src/main/resources/db/mapper/routeMapper.xml

@@ -168,6 +168,46 @@
 		GROUP BY temp.id
 	</select>
 
+
+
+
+	<select id="queryRouteListByOrgCodeNew" resultType="Map">
+		SELECT temp.* FROM (
+		<if test="userId != null and userId != ''">
+			SELECT
+
+			r.id,
+			r.`name`
+			FROM
+			p_plan ppl
+			LEFT JOIN p_route r ON r.id = ppl.route_id
+			WHERE
+			r.is_delete = 0
+			AND	find_in_set(#{userId}, ppl.user_id) > 0 and r.biz_org_code LIKE CONCAT( #{orgCode}, '%')
+
+		</if>
+		<if test="(orgCode != null and orgCode != '')">
+			<if test="userId != null and userId != ''">
+				UNION
+			</if>
+			SELECT
+			r.id,
+			r.`name`
+			FROM
+			p_route r
+			WHERE
+			r.is_delete = 0
+			<if test="orgCode != null and orgCode != ''">
+				AND r.biz_org_code LIKE CONCAT( #{orgCode}, '%')
+			</if>
+
+		</if>) temp
+		GROUP BY temp.id
+	</select>
+
+
+
+
 	<select id="queryRoutePointsCount" resultType="Long">
 		SELECT
 			count(1) num