From 6ced9dbd0ea3e333d7ed1553b685687048f6f577 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 25 Mar 2022 09:57:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=80=A7?= =?UTF-8?q?=E5=88=AB=E3=80=81=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E7=9A=84=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=E4=B8=BA=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E3=80=81=E6=80=A7=E5=88=AB=E3=80=81=E5=87=BA?= =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.17__update_sort_idcard.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql new file mode 100644 index 0000000000..9d383f58d9 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql @@ -0,0 +1,12 @@ +UPDATE ic_form_list_item +SET SORT = '5' +WHERE + FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%身份证%' AND i.DEL_FLAG = '0' ) + AND DEL_FLAG = '0'; + +UPDATE ic_form_list_item +SET SORT = '6' +WHERE + FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%性别%' AND i.DEL_FLAG = '0' ) + AND DEL_FLAG = '0'; + \ No newline at end of file From 5bb10bda1b0bd54b0099660727b38c47164376ea Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 09:59:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=88=BF=E4=B8=BB=E5=BF=85=E5=A1=AB=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.13__ic_house_remove_owner.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql new file mode 100644 index 0000000000..edf66e716e --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__ic_house_remove_owner.sql @@ -0,0 +1,4 @@ +ALTER TABLE `epmet_gov_org`.`ic_house` + MODIFY COLUMN `OWNER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主姓名' AFTER `RENT_FLAG`, + MODIFY COLUMN `OWNER_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主电话' AFTER `OWNER_NAME`, + MODIFY COLUMN `OWNER_ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主身份证号' AFTER `OWNER_PHONE`; From bd74456861ddbdad57f49a0546d71722ba5ccc24 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 10:04:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8E=BB=E6=8E=89=E6=88=BF=E4=B8=BB=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcHouseFormDTO.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java index 58376e2032..fb679755d7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java @@ -87,19 +87,16 @@ public class IcHouseFormDTO implements Serializable { /** * 房主姓名 */ - @NotBlank(message = "房主姓名不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private String ownerName; /** * 房主电话 */ - @NotBlank(message = "房主电话不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private String ownerPhone; /** * 房主身份证号 */ - @NotBlank(message = "房主身份证号不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private String ownerIdCard; -} \ No newline at end of file +}