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

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

+25 −9

Original line number	Diff line number	Diff line
		@@ -7,8 +7,10 @@ import com.censoft.censoftrongtong.service.*;
		import com.ruoyi.common.config.RuoYiConfig;
		import com.ruoyi.common.core.controller.BaseController;
		import com.ruoyi.common.core.domain.R;
		import com.ruoyi.common.core.domain.entity.SysDept;
		import com.ruoyi.common.core.domain.entity.SysDictData;
		import com.ruoyi.common.core.domain.entity.SysUser;
		import com.ruoyi.system.service.ISysDeptService;
		import com.ruoyi.system.service.ISysDictDataService;
		import com.ruoyi.system.service.ISysUploadFileService;
		import org.springframework.beans.factory.annotation.Autowired;
		@@ -35,6 +37,9 @@ import java.util.stream.Collectors;
		@RequestMapping("/app-api/risk/plan")
		public class RiskPlanAppController extends BaseController {

		@Resource
		private ISysDeptService sysDeptService;

		@Resource
		private ILedgerProjectService ledgerProjectService;

		@@ -107,14 +112,24 @@ public class RiskPlanAppController extends BaseController {
		}

		/**
		* 获取项目下的人员
		* 获取全部组织机构列表
		*
		* @param projectId 项目id
		* @real_return {@link R<List<SysDept>>}
		*/
		@GetMapping("/dept/list")
		public R<List<SysDept>> getDeptList() {
		return R.ok(sysDeptService.selectDeptList(new SysDept()));
		}

		/**
		* 获取组织机构下的人员
		*
		* @param deptId 组织机构id
		* @real_return {@link R<List<SysUser>>}
		*/
		@GetMapping("/user/list/{projectId}")
		public R<List<SysUser>> getUserListByProjectId(@PathVariable("projectId") Long projectId) {
		return R.ok(ledgerProjectService.getUserListByProjectId(projectId));
		@GetMapping("/user/list/{deptId}")
		public R<List<SysUser>> getUserListByProjectId(@PathVariable("deptId") Long deptId) {
		return R.ok(ledgerProjectService.getUserListByDeptId(deptId));
		}

		/**
		@@ -125,6 +140,7 @@ public class RiskPlanAppController extends BaseController {
		*/
		@PostMapping()
		public R<Integer> saveRiskPlan(@RequestBody RiskPlan riskPlan) {
		riskPlan.setApproveUserId(getUserId());
		riskPlan.setCreateUserId(getUserId());
		riskPlan.setCreateDeptId(getDeptId());
		return R.ok(riskPlanService.saveRiskPlan(riskPlan));
		@@ -144,7 +160,7 @@ public class RiskPlanAppController extends BaseController {
		statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START);
		state = "待执行";
		} else if ("running".equals(status)) {
		statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN);
		statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN,RiskPlanStatusType.WAIT_LEADER_RETURN);
		state = "执行中";
		} else if ("finish".equals(status)) {
		statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
		@@ -173,7 +189,7 @@ public class RiskPlanAppController extends BaseController {
		statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START);
		state = "待评估";
		} else if ("running".equals(status)) {
		statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN);
		statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN,RiskPlanStatusType.WAIT_LEADER_RETURN);
		state = "执行中";
		} else if ("finish".equals(status)) {
		statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
		@@ -216,7 +232,7 @@ public class RiskPlanAppController extends BaseController {
		statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START,RiskPlanStatusType.RUNNING);
		state = "待执行";
		} else if ("finish".equals(status)) {
		statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
		statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE,RiskPlanStatusType.WAIT_LEADER_RETURN
		,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);
		state = "已执行";
		} else if ("return".equals(status)) {
		@@ -291,7 +307,7 @@ public class RiskPlanAppController extends BaseController {
		@GetMapping("/inherent/list/{planId}/{buildingId}")
		public R<List<RiskPlanAppInherentListDto>> getInherentListByPlanId(@PathVariable("planId") Long planId
		, @PathVariable("buildingId") Long buildingId, Long floorId, Long roomId) {
		return R.ok(riskPlanInherentListService.getInherentListByPlanId(planId, buildingId, floorId, roomId));
		return R.ok(riskPlanInherentListService.getInherentListByPlanId(null, buildingId, floorId, roomId));
		}

		/**

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,10 @@ public class RiskPlan extends BaseEntity
		@Excel(name = "创建单位")
		private Long createDeptId;

		/** 评估小组id */
		@Excel(name = "评估小组id")
		private Long deptId;

		/** 负责人id */
		@Excel(name = "负责人id")
		private Long leaderUserId;
		@@ -199,6 +203,14 @@ public class RiskPlan extends BaseEntity
		this.approveUserId = approveUserId;
		}

		public Long getDeptId() {
		return deptId;
		}

		public void setDeptId(Long deptId) {
		this.deptId = deptId;
		}

		@Override
		public String toString() {
		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanInherentList.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,14 @@ public class RiskPlanInherentList extends BaseEntity
		@Excel(name = "风险等级")
		private String level;

		/** 风险可能性 */
		@Excel(name = "风险可能性")
		private String riskLikelihood;

		/** 后果严重性 */
		@Excel(name = "后果严重性")
		private String riskSeverity;

		/** 存在部位 */
		@Excel(name = "存在部位")
		private String presenceLocation;
		@@ -301,6 +309,22 @@ public class RiskPlanInherentList extends BaseEntity
		return delFlag;
		}

		public String getRiskLikelihood() {
		return riskLikelihood;
		}

		public void setRiskLikelihood(String riskLikelihood) {
		this.riskLikelihood = riskLikelihood;
		}

		public String getRiskSeverity() {
		return riskSeverity;
		}

		public void setRiskSeverity(String riskSeverity) {
		this.riskSeverity = riskSeverity;
		}

		@Override
		public String toString() {
		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
		@@ -315,6 +339,8 @@ public class RiskPlanInherentList extends BaseEntity
		.append("evaluationModel", getEvaluationModel())
		.append("evaluationRange", getEvaluationRange())
		.append("level", getLevel())
		.append("riskLikelihood", getRiskLikelihood())
		.append("riskSeverity", getRiskSeverity())
		.append("presenceLocation", getPresenceLocation())
		.append("pictureFileIds", getPictureFileIds())
		.append("factor", getFactor())

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/enums/RiskPlanStatusType.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -30,9 +30,13 @@ public enum RiskPlanStatusType {
		*/
		FINISH("FINISH","项目完成"),
		/**
		* 已退回
		* 已退回至组长
		*/
		WAIT_RETURN("WAIT_RETURN","已退回"),
		WAIT_LEADER_RETURN("WAIT_LEADER_RETURN","已退回至组长"),
		/**
		* 已退回至组员
		*/
		WAIT_RETURN("WAIT_RETURN","已退回至组员"),
		/**
		* 已撤销
		*/
		@@ -73,6 +77,8 @@ public enum RiskPlanStatusType {
		return PROJECT_REPORT;
		case "FINISH":
		return FINISH;
		case "WAIT_LEADER_RETURN":
		return WAIT_LEADER_RETURN;
		case "WAIT_RETURN":
		return WAIT_RETURN;
		case "REVOKE":

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerProjectService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -70,10 +70,10 @@ public interface ILedgerProjectService
		public List<LedgerProject> getProjectListByDeptId(LedgerProject ledgerProject);

		/**
		* 获取项目所在部门下的所有人员
		* 获取部门下的所有人员
		*
		* @param projectId 项目id
		* @param deptId 项目id
		* @return 人员list
		*/
		public List<SysUser> getUserListByProjectId(Long projectId);
		public List<SysUser> getUserListByDeptId(Long deptId);
		}