消防监督计划修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -198,4 +198,9 @@ public interface IOrgUsrService {
 	 */
 	List<OrgUsrTreeDto> companyListByUser(AgencyUserModel user);
 
+    /**
+     * 获取登陆人关联机场单位人员信息，部门信息
+     */
+    List<Map<String, Object>> getLoginUserDetails(AgencyUserModel user);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Plan.java

@@ -268,6 +268,12 @@ public class Plan extends BasicEntity {
 	private String userDept;
 
 	/**
+	 * 用户部门名称
+	 */
+	@Column(name="maker_user_dept_name")
+	private String makerUserDeptName;
+
+	/**
 	 * 牵头部门
 	 */
 	@Column(name="lead_department_ids")
@@ -294,14 +300,14 @@ public class Plan extends BasicEntity {
 	/**
 	 * 参与人
 	 */
-	@Column(name="join_person_ids")
-	private String joinPersonIds;
+	@Column(name="maker_user_id")
+	private String makerUserId;
 
 	/**
 	 * 参与人名称
 	 */
-	@Column(name="join_person_names")
-	private String joinPersonNames;
+	@Column(name="maker_user_name")
+	private String makerUserName;
 
 	/**
 	 * 检查类型id
@@ -716,19 +722,27 @@ public class Plan extends BasicEntity {
 		this.leadDepartmentIds = leadDepartmentIds;
 	}
 
-	public String getJoinPersonIds() {
-		return joinPersonIds;
+	public String getMakerUserId() {
+		return makerUserId;
+	}
+
+	public void setMakerUserId(String makerUserId) {
+		this.makerUserId = makerUserId;
+	}
+
+	public String getMakerUserName() {
+		return makerUserName;
 	}
 
-	public void setJoinPersonIds(String joinPersonIds) {
-		this.joinPersonIds = joinPersonIds;
+	public void setMakerUserName(String makerUserName) {
+		this.makerUserName = makerUserName;
 	}
 
-	public String getJoinPersonNames() {
-		return joinPersonNames;
+	public String getMakerUserDeptName() {
+		return makerUserDeptName;
 	}
 
-	public void setJoinPersonNames(String joinPersonNames) {
-		this.joinPersonNames = joinPersonNames;
+	public void setMakerUserDeptName(String makerUserDeptName) {
+		this.makerUserDeptName = makerUserDeptName;
 	}
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -370,4 +370,20 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(userId));
     }
 
+    /**
+     * 获取登陆人绑定的人员关系
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getLoginUserDetails", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
+    public ResponseModel<List<Map<String, Object>>> getLoginUserDetails() {
+        // 获取登陆人角色
+        AgencyUserModel user = getUserInfo();
+        List<Map<String, Object>> loginUserDetails = iOrgUsrService.getLoginUserDetails(user);
+        return ResponseHelper.buildResponse(loginUserDetails);
+    }
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
@@ -1294,6 +1295,29 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return pid;
     }
 
+   @Override
+   public List<Map<String, Object>> getLoginUserDetails (AgencyUserModel user) {
+
+        // 获取登陆人关联账号
+       List<OrgUsr> orgUsrs = orgUsrList(user);
+       List<Map<String, Object>> list = new ArrayList<>();
+       if (!ObjectUtils.isEmpty(orgUsrs)) {
+           orgUsrs.forEach(orgUsr -> {
+               Map<String, Object> map = new HashMap<>();
+               map.put(OrgPersonEnum.人员.getKey(), orgUsr);
+               // 获取关联账号所在部门/公司
+               LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+               wrapper.eq(OrgUsr::getIsDelete, false);
+               wrapper.eq(BaseEntity::getSequenceNbr, orgUsr.getParentId());
+               OrgUsr one = this.getOne(wrapper);
+               map.put("other",one);
+               list.add(map);
+           });
+
+       }
+       return list;
+   }
+
 }
 
 

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

@@ -151,10 +151,11 @@
 		a.check_type_name as checkTypeName,
 		a.lead_department_ids as leadDepartmentIds,
 		a.lead_department_names as leadDepartmentNames,
-		a.lead_people_ids as leadPersonIds,
-		a.lead_people_names as leadPersonNames,
-		a.join_person_ids as joinPersonIds,
-		a.join_person_names as joinPersonNames,
+		a.lead_people_ids as leadPeopleIds,
+		a.lead_people_names as leadPeopleNames,
+		a.maker_user_id as makerUserId,
+		a.maker_user_name as makerUserName,
+		a.maker_user_dept_name as makerUserDeptName,
 		(select count(1) from p_route_point ppo where ppo.route_id = b.id) as totalPoint,
 		(select count(1) from p_plan_task t where t.plan_id = a.id) as totalPlanTask,
 		(select count(1) from p_plan_task t where t.plan_id = a.id and t.finish_status <![CDATA[<=]]> 1 ) as waitFinishPlanTask