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/PointController.java

@@ -130,6 +130,17 @@ public class PointController extends AbstractBaseController {
 	}
 
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "获取登录人单位", notes = "获取登录人单位")
+	@GetMapping(value = "/getuserdept", produces = "application/json;charset=UTF-8")
+	public CommonResponse getuserdept() {
+		ReginParams reginParams = getSelectedOrgInfo();
+		return CommonResponseUtil.success(reginParams.getPersonIdentity());
+	}
+
+
+
+
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/PlanTaskPointInputItemBo.java

@@ -72,12 +72,36 @@ public class PlanTaskPointInputItemBo {
 	private String userName;
 	//执行部门名称
 	private String depName;
-	
-	
-	
-	
-	
-	
+
+	private String  pointName;
+	private String  planName;
+	private String routeName;
+
+
+	public String getPointName() {
+		return pointName;
+	}
+
+	public void setPointName(String pointName) {
+		this.pointName = pointName;
+	}
+
+	public String getPlanName() {
+		return planName;
+	}
+
+	public void setPlanName(String planName) {
+		this.planName = planName;
+	}
+
+	public String getRouteName() {
+		return routeName;
+	}
+
+	public void setRouteName(String routeName) {
+		this.routeName = routeName;
+	}
+
 	public String getUserName() {
 		return userName;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -332,6 +332,12 @@ public class JobService implements IJobService {
 
 		for(PlanTaskPointInputItemBo arg:planTaskPointInputItems){
 			Check check = new Check();
+
+
+
+
+
+
 			if (checkMap.get(arg.getPointId()) == null) {
 				check.setOrgCode(arg.getOrgCode());
 				check.setUserId(planTask.getUserId());
@@ -344,6 +350,12 @@ public class JobService implements IJobService {
 				check.setDepId(deptId.toString().substring(0,deptId.length()-1));
 				check.setDepName(deptName.toString());
 				check.setPointId(arg.getPointId());
+
+				check.setPointName(arg.getPointName());
+				check.setRouteName(arg.getRouteName());
+				check.setPlanName(arg.getPlanName());
+				check.setErrorClassify(arg.getClassifyName());
+
 				check.setUploadTime(new Date());
 				check.setPlanId(arg.getPlanId());
 				check.setPlanTaskId(arg.getPlanTaskId());

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

@@ -474,6 +474,9 @@
 			temp1.classifyId,
 			temp1.classifyName,
 			pii.`name` inputName,
+			(select p_point.`name` from p_point where p_point.id= temp2.pointId) pointName,
+			(select p_plan.`name` from p_plan where p_plan.id= temp2.planId) planName,
+			(select p_route.`name` from p_route where p_route.id= temp2.routeId) routeName,
 			temp2.*
 		FROM
 			p_point_inputitem ppi