Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

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

@@ -125,7 +125,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) CheckInfoPageParam param,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        param.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+        param.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
         param.setOrderBy("checkDate desc");
         if(commonPageable !=null){
             param.setPageNumber(commonPageable.getPageNumber()-1);

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

@@ -80,7 +80,7 @@ public class PlanController extends AbstractBaseController {
 
         PlanInfoPageParam param =new PlanInfoPageParam();
         ReginParams reginParams = getSelectedOrgInfo();
-        param.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+        param.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
         List<HashMap<String, Object>> list = planService.getPlanInfoNoPage(param);
         return CommonResponseUtil.success(list);
     }

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

@@ -75,7 +75,7 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) PlanTaskPageParam params,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
-        params.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+        params.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
 
         if (!ObjectUtils.isEmpty(commonPageable)) {
             params.setPageNumber(commonPageable.getPageNumber()-1);

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

@@ -95,7 +95,7 @@ public class RouteController extends AbstractBaseController {
 		try {
 			ReginParams reginParams = getSelectedOrgInfo();
 			//获取所在公司code
-			String bizOrgCode=reginParams.getPersonIdentity().getCompanyBizOrgCode();
+			String bizOrgCode=reginParams.getPersonIdentity().getBizOrgCode();
 			queryRequests.setBizOrgCode(bizOrgCode);
 			if(commonPageable !=null){
 				queryRequests.setPageNumber(commonPageable.getPageNumber()-1);
@@ -143,7 +143,7 @@ public class RouteController extends AbstractBaseController {
 		try {
 
 			ReginParams reginParams = getSelectedOrgInfo();
-			String orgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode();
+			String orgCode =reginParams.getPersonIdentity().getBizOrgCode();
 			//2.查询
 			List<Route> routeList = routeService.queryRouteListNew(orgCode);
 			List<Route> list = routeList.stream().filter(e -> e.getIsExist().equals("true")).collect(Collectors.toList());

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

@@ -143,7 +143,8 @@
 		when	0 THEN '否'
 		else	'是' END) as isFixedDateName,
 	IFNULL(a.plan_end,"") planEnd,a.plan_end planEnd,a.plan_type planType,
-	b.name routeName,a.route_id routeId,a.is_fixed_date isFixedDate,a.remark,a.remark1
+	b.name routeName,a.route_id routeId,a.is_fixed_date isFixedDate,a.remark,a.remark1,
+	b.dept_name bizOrgCode
 		FROM
 		p_plan a,
 		p_route b