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

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

@@ -181,6 +181,7 @@ public class PlanController extends AbstractBaseController {
 
             param.setBizOrgCode(loginOrgCode);
             param.setBizOrgName(getCompanyName(reginParams));
+            map.put("user_id", userId);
             map.put("param", param);
             Plan plan = planService.addPlan(map);
             Object ob = plan != null ? ToJson.tojson(plan) : null;

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

@@ -1566,9 +1566,9 @@ public class PointController extends AbstractBaseController {
 //			point.setBizOrgCode(bizOrgCode);
 //			point.setBizOrgName(bizOrgName);
 
-			String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
-			String bizOrgName = reginParams.getPersonIdentity().getCompanyName();
-			point.setBizOrgCode(bizOrgCode);
+			Integer bizOrgCode = reginParams.getCompany().getCompanyOrgCode();
+			String bizOrgName = reginParams.getCompany().getCompanyName();
+			point.setBizOrgCode(String.valueOf(bizOrgCode));
 			point.setBizOrgName(bizOrgName);
 
 //			FeignClientResult userInfo = jcsFeignClient.selectById(point.getChargePersonId());

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

@@ -49,24 +49,10 @@ public class PlanServiceImpl implements IPlanService {
 	public Plan addPlan(HashMap<String, Object> map) {
 		Plan param =  (Plan) map.get("param");
 
-//		String userGroupId = param.getUserGroupId();
-//		String[] userGroupIdArr = userGroupId.split(",");
-		StringBuilder stringBuilder = new StringBuilder();
-//		for(String str : userGroupIdArr) {
-//			if(stringBuilder.length() > 0){
-//				stringBuilder.append(",").append(str.split("@")[0]);
-//			}else{
-//				stringBuilder.append(str.split("@")[0]);
-//			}
-//
-//		}
-		param.setUserId(stringBuilder.toString());
 
 		String org_code = map.get("org_code") == null ? "":map.get("org_code").toString();
 		String user_id = map.get("user_id")== null ? "":map.get("user_id").toString();
-		//        if (param.getDeptId() > 0) {
-//            org_code = org_code + "-" + param.getDeptId();
-//        }
+
 		if(StringUtil.isNotEmpty(map.get("dept_id"))){
 			param.setDeptId(map.get("dept_id").toString());
 		}

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

@@ -375,7 +375,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 return;
             }
 
-            reformStatisticsPlanTask(strBginDate, strEndDate, plan.getUserId(), plan.getBizOrgCode());
+//            reformStatisticsPlanTask(strBginDate, strEndDate, plan.getUserId(), plan.getBizOrgCode());
             //8.通知3d数据统计进行更新（换流站全景监控）
 //            this.notifyBusinessRefresh(NotifyBusinessTypeEum.planTask.getCode());
         }

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

@@ -1445,7 +1445,7 @@
 		<if test="name != null and name != ''">
 			AND name like concat('%', #{name}, '%')
 		</if>
-		<if test="name != null and name != ''">
+		<if test="pointNo != null and pointNo != ''">
 			AND point_no like concat('%', #{pointNo}, '%')
 		</if>
 		ORDER BY create_date desc
@@ -1457,7 +1457,7 @@
 		<if test="name != null and name != ''">
 			AND name like concat('%', #{name}, '%')
 		</if>
-		<if test="name != null and name != ''">
+		<if test="pointNo != null and pointNo != ''">
 			AND point_no like concat('%', #{pointNo}, '%')
 		</if>
 	</select>