diff --git a/docs/db/phase2/init-phase2.sql b/docs/db/phase2/init-phase2.sql index e67030e..78285b8 100644 --- a/docs/db/phase2/init-phase2.sql +++ b/docs/db/phase2/init-phase2.sql @@ -245,6 +245,7 @@ create table `eval_project` ( `participants_json` json default null comment '参与人员JSON:[{"name":"名称","id":1}]', `project_leader_name` varchar(50) default null comment '项目负责人(手填)', `archive_flag` int not null default 0 comment '项目归档(1归档0未归档)', + `is_statutory` tinyint not null default 0 comment '是否法定项目 1是 0否', `delete_enum` varchar(32) default null comment '删除标识true false', `remarks` varchar(255) default null comment '备注', `create_name` varchar(50) default null comment '创建人姓名', @@ -830,9 +831,33 @@ ALTER TABLE `qual_filing_personnel_cert` ALTER TABLE `qual_filing_personnel_cert_change` CHANGE COLUMN `cert_type_name` `cert_level` varchar(128) DEFAULT NULL COMMENT '证书等级(CertLevelEnum:SENIOR高级/MIDDLE中级/JUNIOR初级)'; -ALTER TABLE `eval_project_waring` - ADD COLUMN `project_complete_time` datetime DEFAULT NULL COMMENT '项目完成时间' after `archive_date`; - +CREATE TABLE IF NOT EXISTS `eval_project_waring` ( + `id` bigint NOT NULL COMMENT '主键', + `org_id` bigint DEFAULT NULL COMMENT '评价机构id', + `project_id` bigint NOT NULL COMMENT '项目id', + `archive_date` datetime NOT NULL COMMENT '项目归档时间', + `project_complete_time` datetime DEFAULT NULL COMMENT '项目完成时间', + `waring_status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT 'non_warn' COMMENT '项目 预警 状态: non_warn 暂时不预警,first_waring 首次预警，second_waring 二次预警，emergency_waring 紧急预警,overdue_warning 逾期预警 ,end_warning 结束预警', + `waring_start_time` datetime NOT NULL COMMENT '预警开始时间', + `reassessment_date` datetime NOT NULL COMMENT '重新评估时间', + `cycle_date` tinyint NOT NULL COMMENT '周期年份', + `delete_enum` varchar(32) DEFAULT NULL COMMENT '删除标识true false', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `create_name` varchar(50) DEFAULT NULL COMMENT '创建人姓名', + `update_name` varchar(50) DEFAULT NULL COMMENT '更新人姓名', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `version` int DEFAULT NULL COMMENT '版本', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '修改时间', + `create_id` bigint DEFAULT NULL COMMENT '创建人id', + `update_id` bigint DEFAULT NULL COMMENT '修改人id', + `env` varchar(50) DEFAULT NULL COMMENT '环境', + `project_node` varchar(600) NOT NULL DEFAULT '[{"type":"RISK_ANALYSIS","state":1},{"type":"BUSINESS_CONTRACT","state":1},{"type":"PROJECT_GROUP","state":1},{"type":"SITE_SURVEY","state":1},{"type":"REPORT_PREPARATION","state":1},{"type":"INTERNAL_REVIEW","state":1},{"type":"TECHNICAL_REVIEW","state":1},{"type":"PROCESS_CONTROL","state":1}]' COMMENT '项目节点完成进度', + `industry_code` varchar(64) DEFAULT NULL COMMENT '所属行业编码(见 IndustryEnum)', + PRIMARY KEY (`id`), + KEY `idx_project_id` (`project_id`), + KEY `idx_waring_start_time` (`waring_start_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='项目预警'; set foreign_key_checks = 1; -- ============================================= diff --git a/docs/db/todo.sql b/docs/db/todo.sql index 0c31028..48b4ba3 100644 --- a/docs/db/todo.sql +++ b/docs/db/todo.sql @@ -77,4 +77,10 @@ ALTER TABLE `qual_filing_personnel_cert` -- 3. qual_filing_personnel_cert_change 表添加行业专业标准ID字段 ALTER TABLE `qual_filing_personnel_cert_change` ADD COLUMN `industry_professional_standards_id` BIGINT DEFAULT NULL COMMENT '行业专业标准ID' - AFTER `professional_capability_code`; \ No newline at end of file + AFTER `professional_capability_code`; + +-- ============================================= +-- eval_project 表添加是否法定项目字段 +-- ============================================= +ALTER TABLE `eval_project` + ADD COLUMN `is_statutory` tinyint NOT NULL DEFAULT 0 COMMENT '是否法定项目 1是 0否' AFTER `archive_flag`; \ No newline at end of file diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/regulator/RegulatorEvalProjectMonitorController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/regulator/RegulatorEvalProjectMonitorController.java index 76b0c26..7068ac7 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/regulator/RegulatorEvalProjectMonitorController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/regulator/RegulatorEvalProjectMonitorController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -@Api(tags = "监管端-安评项目实时监控") +@Api(tags = "监管端-安评项目") @RestController @RequestMapping("/safetyEval/regulator/eval-project-monitor") public class RegulatorEvalProjectMonitorController { @@ -43,4 +43,6 @@ public class RegulatorEvalProjectMonitorController { @ApiParam("项目ID") @RequestParam String projectId) { return regulatorEvalProjectMonitorApi.nodeOverview(projectId); } + + } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProjectCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProjectCO.java index 28e5777..177fca1 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProjectCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProjectCO.java @@ -75,6 +75,9 @@ public class EvalProjectCO { @ApiModelProperty(value = "项目归档：1归档 0未归档", example = "0") private Integer archiveFlag; + @ApiModelProperty(value = "是否法定项目 1是 0否", example = "0") + private Boolean isStatutory; + @ApiModelProperty("项目阶段编码：NORMAL正常 DELAY延期(按完成时间判定,不落库)") private String projectPhaseCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectAddCmd.java index 29b53be..f696fd4 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectAddCmd.java @@ -65,4 +65,7 @@ public class EvalProjectAddCmd { @ApiModelProperty(value = "项目归档：1归档 0未归档", example = "0") private Integer archiveFlag; + + @ApiModelProperty(value = "是否法定项目 1是 0否", example = "0") + private Boolean isStatutory; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectModifyCmd.java index 65cd27b..a66736b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectModifyCmd.java @@ -40,4 +40,7 @@ public class EvalProjectModifyCmd { @ApiModelProperty(value = "项目状态编码：1草稿 2进行中 3已归档 4已作废", example = "2") private Integer statusCode; + + @ApiModelProperty(value = "是否法定项目 1是 0否", example = "0") + private Boolean isStatutory; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectPageQuery.java index 1681a0e..68d07d5 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectPageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProjectPageQuery.java @@ -21,5 +21,8 @@ public class EvalProjectPageQuery extends BasePageQuery { @ApiModelProperty("是否查询我的项目") private Boolean myProject = false; + @ApiModelProperty("是否法定项目 1是 0否") + private Boolean isStatutory; + private Long customerId; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProjectEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProjectEntity.java index c729fa1..ce2e008 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProjectEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/EvalProjectEntity.java @@ -30,5 +30,7 @@ public class EvalProjectEntity { private String projectNode; /** 1归档 0未归档 */ private Integer archiveFlag; + /** 是否法定项目 1是 0否 */ + private Boolean isStatutory; private Long tenantId; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectQuery.java index 8c3796f..ce96aea 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectQuery.java @@ -32,4 +32,7 @@ public class EvalProjectQuery { @ApiModelProperty("是否查询我的项目") private Boolean myProject = false; + + @ApiModelProperty("是否法定项目 1是 0否") + private Boolean isStatutory; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProjectDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProjectDO.java index ff3d107..2bcc1fb 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProjectDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/EvalProjectDO.java @@ -30,6 +30,8 @@ public class EvalProjectDO { private String projectLeaderName; private String projectNode; private Integer archiveFlag; + /** 是否法定项目 1是 0否 */ + private Boolean isStatutory; private String deleteEnum; private String remarks; private String createName;