From 75a25d314355a08f40597ca57444251816a1d4f9 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 19 Apr 2024 11:03:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E4=BC=9A=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E4=BA=BA=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 10 +++++++++- .../process/esRevision/entity/ProcessEsRevision.java | 1 - .../listener/ProcessESRevisionEndListener.java | 1 + .../laws/bindPart/mapper/xml/LawsBindPartMapper.xml | 5 +++-- .../entity/EnterpriseStandardReviewMeetingRecord.java | 4 ++++ .../entity/vo/EnterpriseStandardReviewMeetingVo.java | 6 +++++- .../EnterpriseStandardReviewMeetingRecordMapper.xml | 4 +++- 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index e092cf62..d3a63d73 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -83,4 +83,12 @@ ALTER TABLE laws_part_name COMMENT = '零部件结构树表'; -- 2024 0412 外标增加授权部门字段 INSERT INTO laws_tag (id, `table_name`, db_field_name, db_field_en_name, db_field_txt, order_num, db_field_name_old, db_is_key, db_is_null, db_type, db_length, field_show_type, field_must_input, is_show_form_create, is_query, is_show_form, is_show_list, is_read_only, create_time, create_by, sort_flag, show_area, is_show_search, del_flag, is_model) VALUES ('1778616879331246081', 'laws_overseas_standard', 'auth_dept', 'Auth Dept', '授权部门', 38, 'auth_dept', 0, 1, 'String', 500, '7', '0', 1, 0, 1, 0, 0, '2024-04-12 10:51:23', 'admin', '0', '1694630597254553601', 0, 0, '2'); -ALTER TABLE laws_overseas_standard ADD COLUMN auth_dept varchar (500) null comment '授权部门'; \ No newline at end of file +ALTER TABLE laws_overseas_standard ADD COLUMN auth_dept varchar (500) null comment '授权部门'; + + +-- 2024 0418 企标评审会记录增加评审人列 +ALTER TABLE `laws_enterprise_standard_review_meeting_record` + ADD COLUMN `review_user` varchar(2000) NULL COMMENT '评审人' AFTER `review_date`; +-- 2024 0418 企标制修订流程表增加评审人列 +ALTER TABLE `process_es_revision` + ADD COLUMN `review_user` varchar(2000) NULL COMMENT '评审人（标准化审批）' AFTER `comments_summary`; \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java index efe826c9..d3e21988 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java @@ -127,7 +127,6 @@ public class ProcessEsRevision implements Serializable { /** * 评审人 */ - @TableField(exist = false) @ApiModelProperty(value = "评审人") private String reviewUser; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index 333e1b7f..3ed77206 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -116,6 +116,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener { esRmr.setStandardId(standardId); esRmr.setPlanId(esp.getId()); esRmr.setReviewDate(data.getReviewDate()); + esRmr.setReviewUser(data.getReviewUser()); rmrService.save(esRmr); // 保存评审会评审结果 List reviewMeetingDetailVOS = data.parseReviewMeetingDetails(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml index 2c559f7c..b5986ff1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml @@ -44,9 +44,10 @@ select id, standard_number, standard_name from laws_enterprise_standard where del_flag = 0 UNION ALL select id, standard_number, standard_name from laws_domestic_standard where del_flag = 0 + UNION ALL + select id, standard_number, standard_name from laws_overseas_standard where del_flag = 0 ) AS standard ON sfsi.standard_id = standard.id - LEFT JOIN - laws_bind_part_doc AS lbpd ON lbpd.bind_id = bp.id + LEFT JOIN laws_bind_part_doc AS lbpd ON lbpd.bind_id = bp.id LEFT JOIN laws_document_split AS split ON split.id = lbpd.clause_id diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java index d78c928e..8f836728 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardReviewMeetingRecord.java @@ -71,4 +71,8 @@ public class EnterpriseStandardReviewMeetingRecord implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "评审日期") private Date reviewDate; + + /**评审人*/ + @ApiModelProperty(value = "评审人") + private String reviewUser; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java index 9e638b8c..9cb32d52 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardReviewMeetingVo.java @@ -43,10 +43,14 @@ public class EnterpriseStandardReviewMeetingVo { @ApiModelProperty(value = "评审日期") private Date reviewDate; + @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname") @ApiModelProperty(value = "评审人") private String reviewUsers; - @ApiModelProperty(value = "评审人") + @ApiModelProperty(value = "评分人") + private String rateUsers; + + @ApiModelProperty(value = "平均分") private String avgScore; /**是否为优质标准*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml index 5a1dde8c..b942ad2b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardReviewMeetingRecordMapper.xml @@ -13,6 +13,7 @@ + @@ -24,10 +25,11 @@ es.main_drafting_user AS mainDraftUser, es.main_drafting_unit AS mainDraftUnit, rmr.review_date AS reviewDate, + rmr.review_user AS reviewUsers, esp.qualityFlag, (score.avg_score_item1 + score.avg_score_item2 + score.avg_score_item3 + score.avg_score_item4 + score.avg_score_item5 + score.avg_score_item6) AS avgScore, - GROUP_CONCAT(DISTINCT CONCAT(u.realname, '(', u.username, ')') ORDER BY u.username ASC SEPARATOR ',') AS reviewUsers + GROUP_CONCAT(DISTINCT CONCAT(u.realname, '(', u.username, ')') ORDER BY u.username ASC SEPARATOR ',') AS rateUsers FROM `laws_enterprise_standard_review_meeting_record` AS rmr LEFT JOIN