Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into dev-yf (31f681f2) · Commits · 融通安全管理系统 / RuoYi-Vue-master · GitLab

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

+22 −2

Original line number	Original line	Diff line number	Diff line
	@@ -198,7 +198,7 @@ public class RiskPlanAppController extends BaseController {
	,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);		,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);
	state = "已完成";		state = "已完成";
	}		}
	List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(),null,null);		List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, null,getUserId(),null);
	String finalState = state;		String finalState = state;
	list.forEach(dto -> {		list.forEach(dto -> {
	Long finishNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), "finish");		Long finishNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), "finish");
	@@ -312,6 +312,18 @@ public class RiskPlanAppController extends BaseController {
	return R.ok(riskPlanInherentListService.getInherentListByPlanId(null, buildingId, floorId, roomId));		return R.ok(riskPlanInherentListService.getInherentListByPlanId(null, buildingId, floorId, roomId));
	}		}

			/**
			* 根据计划id、楼宇id、楼层id、房间id获取固有风险列表
			*
			* @param planId 计划id
			* @real_return {@link R<List<RiskPlanAppInherentListDto>>}
			*/
			@GetMapping("/inherent/list/{planId}")
			public R<List<RiskPlanAppInherentListDto>> getInherentListByPlanId(@PathVariable("planId") Long planId) {
			RiskPlan riskPlan = riskPlanService.selectRiskPlanById(planId);
			return R.ok(riskPlanInherentListService.getInherentListByPlanId(riskPlan.getProjectId(), null, null, null));
			}

	/**		/**
	* 添加固有风险		* 添加固有风险
	*		*
	@@ -464,7 +476,15 @@ public class RiskPlanAppController extends BaseController {
	*/		*/
	@GetMapping("/approve/list")		@GetMapping("/approve/list")
	public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByApproveUser(String status) {		public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByApproveUser(String status) {
	return R.ok(riskPlanService.getRiskPlanAppListDtoListByApproveUser(getUserId(),status));		String result = null;
			if ("completed".equals(status)){
			status = "completed";
			result = "1";
			}else if ("return".equals(status)){
			status = "completed";
			result = "0";
			}
			return R.ok(riskPlanService.getRiskPlanAppListDtoListByApproveUser(getUserId(),status,result));
	}		}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppDetailsDto.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,9 @@ public class RiskPlanAppDetailsDto {
	/** 任务详情 */		/** 任务详情 */
	private RiskPlanAppTaskDetailsDto detailsDto;		private RiskPlanAppTaskDetailsDto detailsDto;

			/** 风险清单 */
			private List<RiskPlanAppInherentListDto> inherentListDtos;

	/** 风险清单 */		/** 风险清单 */
	private List<RiskPlanAppRiskBuildingListDto> riskBuildingListDtos;		private List<RiskPlanAppRiskBuildingListDto> riskBuildingListDtos;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppTaskDetailsDto.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,9 @@ public class RiskPlanAppTaskDetailsDto {
	/** id */		/** id */
	private Long id;		private Long id;

			/** 任务名称 */
			private String name;

	/** 任务编号 */		/** 任务编号 */
	private String no;		private String no;

	@@ -42,10 +45,10 @@ public class RiskPlanAppTaskDetailsDto {
	private String projectName;		private String projectName;

	/** 所属单位id */		/** 所属单位id */
	private Long projectDeptId;		private Long deptId;

	/** 所属单位 */		/** 所属单位 */
	private String projectDeptName;		private String deptName;

	/** 所在城市 */		/** 所在城市 */
	private String city;		private String city;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanInherentListMapper.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,7 @@ public interface RiskPlanInherentListMapper
	*/		*/
	public int deleteRiskPlanInherentListByIds(Long[] ids);		public int deleteRiskPlanInherentListByIds(Long[] ids);

	List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("planId") Long planId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);		List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("projectId") Long projectId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);

	RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(@Param("inherentId") Long inherentId);		RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(@Param("inherentId") Long inherentId);

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,8 @@ public interface RiskPlanMapper

	List<RiskPlanAppApproveListDto> getApproveListDtoByPlanId(@Param("planId") Long planId);		List<RiskPlanAppApproveListDto> getApproveListDtoByPlanId(@Param("planId") Long planId);

	List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(@Param("userId") Long userId,@Param("status") String status);		List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(@Param("userId") Long userId
			,@Param("status") String status,@Param("result") String result);

	List<RiskPlanAppListDto> getRiskPlanAppListDtoListByCreateUserDeptId(@Param("deptId") Long deptId);		List<RiskPlanAppListDto> getRiskPlanAppListDtoListByCreateUserDeptId(@Param("deptId") Long deptId);
	}		}