From 54ea358ec400cc7487888d0d2c91688510fbfa08 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 14 Apr 2021 17:52:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.8__alter_function_customized.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql new file mode 100644 index 0000000000..67e6bc0ea6 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql @@ -0,0 +1,3 @@ +ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT ''业务域名(可设置多个 用分号分隔)''; + +ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT ''1'' COMMENT ''业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.''; \ No newline at end of file From 847f965d4e01c1b06c2ae0bbb3e3ec07a4cf77c1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Apr 2021 11:21:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todata/impl/FactOriginProjectMainDailyServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java index 1b06f318b7..9553485a0e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java @@ -432,7 +432,6 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl initNewScreenProjectData(String customerId,Integer rows , String dateId,Integer exceedLimit,Integer about2exceedLimit) { boolean ifBeforeYesterday = true; int beforeDate = Integer.parseInt(DateUtils.getBeforeNDay(NumConstant.ONE)); - log.info("initNewScreenProjectData beforeDate:{},dateId:{}",beforeDate,dateId); if(beforeDate > Integer.parseInt(dateId)){ ifBeforeYesterday = false; } From 6c40a0c2c290dc6a8b4991339ffde46fe4ff4b55 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 13:55:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=AD=A4=E5=88=86=E6=94=AF=E7=AE=A1=E7=90=86sql=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.8__alter_function_customized.sql | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql deleted file mode 100644 index 67e6bc0ea6..0000000000 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT ''业务域名(可设置多个 用分号分隔)''; - -ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT ''1'' COMMENT ''业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.''; \ No newline at end of file From ca78dbc4ae37b4f8cfbc30398047802742242fd0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 14:27:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BA=9F=E5=BC=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.11__alter_project.sql | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql deleted file mode 100644 index 2d700d064e..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE `project` -ADD COLUMN `BACK_GROUND` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目背景' AFTER `TITLE`; - - -ALTER TABLE `project` -MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue 项目立项:agency' AFTER `AGENCY_ID`; - From 043bd455fe2951d060bb1f2ff01e108f1a0134f8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 14:28:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.11__alter_project.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql new file mode 100644 index 0000000000..2d700d064e --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.11__alter_project.sql @@ -0,0 +1,7 @@ +ALTER TABLE `project` +ADD COLUMN `BACK_GROUND` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目背景' AFTER `TITLE`; + + +ALTER TABLE `project` +MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源：议题issue 项目立项:agency' AFTER `AGENCY_ID`; + From 00c4cd375851ba1f602d325382c99c64ab594fd6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 15:27:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B920?= =?UTF-8?q?=E5=AD=97=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/ProjectApprovalFormDTO.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java index dd2001e970..da162d9622 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java @@ -17,19 +17,19 @@ public class ProjectApprovalFormDTO implements Serializable { private static final long serialVersionUID = 4859779755214502427L; public interface ApprovalCategory{} - @NotBlank(message = "项目标题不能为空",groups = {ApprovalCategory.class}) + @NotBlank(message = "项目标题不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @Length(max=20,message = "项目标题不能超过20位") private String title; - @NotBlank(message = "项目背景不能为空",groups = {ApprovalCategory.class}) + @NotBlank(message = "项目背景不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @Length(max=1000,message = "项目背景不能超过1000位") private String backGround; - @NotBlank(message = "项目方案不能为空",groups = {ApprovalCategory.class}) + @NotBlank(message = "项目方案不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @Length(max=1000,message = "项目方案不能超过1000位") private String publicReply; - @NotBlank(message = "内部备注不能为空",groups = {ApprovalCategory.class}) + @NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @Length(max=1000,message = "内部备注不能超过1000位") private String internalRemark;