From 57e73a68fa3d68bb58521a2e58b74d9a7d9fab80 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 13:57:58 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9EMULTI=5FSELECT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/ConditionResultDTO.java | 5 +++++ .../java/com/epmet/entity/IcFormQueryBuilderEntity.java | 7 ++++++- .../src/main/resources/mapper/IcFormItemDao.xml | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index 4d0a000b8a..386fffd4d5 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -96,5 +96,10 @@ public class ConditionResultDTO implements Serializable { * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 */ private boolean supportAdd; + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 22f83887ba..a6940e9499 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -76,7 +76,12 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { * 手机号：mobile; 身份证：id_card；只能输入数字:num */ private String validType; - + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index b58666f21c..20974d2afa 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -85,7 +85,8 @@ IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, b.QUERY_TYPE, - b.FUN_TYPE + b.FUN_TYPE, + b.MULTI_SELECT as multiSelect FROM ic_form_query_builder b inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0') LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id ) From 98a769f34cd6a1e4c46bcb5c447884533e632899 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 14:28:21 +0800 Subject: [PATCH 2/8] queryType=resi_category --- .../src/main/resources/mapper/IcResiUserDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 81f3c65f49..8fa484805f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -128,6 +128,12 @@ ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%') + + + + ${subCondition.tableName}.${colValue} ='1' + + From 7961404fa7eb16fab2e1a8dfbbd38df0b8e44374 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 14:37:24 +0800 Subject: [PATCH 3/8] queryType=resi_category --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 8fa484805f..caf51d1d3b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,8 +130,8 @@ - - ${subCondition.tableName}.${colValue} ='1' + + and ${subCondition.tableName}.${colValue} ='1' From 2f5ec4e8bde982c763a797c2fed2ee305ef598f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 14:47:12 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index caf51d1d3b..182caedcf6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,7 +130,7 @@ - + and ${subCondition.tableName}.${colValue} ='1' From 2d29c8872e1464f09072d319f7fa97d329bcee08 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 16:00:51 +0800 Subject: [PATCH 5/8] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.30__item_query.sql | 7 +++++++ .../src/main/resources/mapper/IcResiUserDao.xml | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql new file mode 100644 index 0000000000..5f8f565bed --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql @@ -0,0 +1,7 @@ +alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE; + +update ic_form_query_builder set MULTI_SELECT=( + select ic_form_item.MULTI_SELECT from ic_form_item where ic_form_item.CUSTOMER_ID=ic_form_query_builder.CUSTOMER_ID + and ic_form_item.ID=ic_form_query_builder.FORM_ITEM_ID +)where ic_form_query_builder.DEL_FLAG='0' +; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 182caedcf6..934839a316 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,9 +130,11 @@ - - and ${subCondition.tableName}.${colValue} ='1' - + + + and ${subCondition.tableName}.${colValue} ='1' + + From df0489940ec6f6b4888311cc301714ae68748a53 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 19 Jun 2022 13:05:08 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=EF=BC=81=3D''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 934839a316..edb2455bee 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -132,7 +132,9 @@ - and ${subCondition.tableName}.${colValue} ='1' + + and ${subCondition.tableName}.${colValue} ='1' + From 62451d7338293db67d62e0cdae9ab71a7d4aac92 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 19 Jun 2022 15:16:04 +0800 Subject: [PATCH 7/8] change --- .../main/resources/db/migration/V0.0.30__item_query.sql | 5 ----- .../main/resources/db/migration/V0.0.31__item_query2.sql | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql index 5f8f565bed..cdf0174eab 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql @@ -1,7 +1,2 @@ alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE; -update ic_form_query_builder set MULTI_SELECT=( - select ic_form_item.MULTI_SELECT from ic_form_item where ic_form_item.CUSTOMER_ID=ic_form_query_builder.CUSTOMER_ID - and ic_form_item.ID=ic_form_query_builder.FORM_ITEM_ID -)where ic_form_query_builder.DEL_FLAG='0' -; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql new file mode 100644 index 0000000000..32d8738bbc --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql @@ -0,0 +1,7 @@ +update ic_form_query_builder b set b.MULTI_SELECT=( + select i.MULTI_SELECT + from ic_form_item i + where i.CUSTOMER_ID=b.CUSTOMER_ID + and i.ID=b.FORM_ITEM_ID + and i.del_flag='0' +)where b.DEL_FLAG='0'; \ No newline at end of file From b73f2593f533e51f2309bb36543c4cc5898335d4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 19 Jun 2022 15:26:13 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.31__item_query2.sql | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql deleted file mode 100644 index 32d8738bbc..0000000000 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql +++ /dev/null @@ -1,7 +0,0 @@ -update ic_form_query_builder b set b.MULTI_SELECT=( - select i.MULTI_SELECT - from ic_form_item i - where i.CUSTOMER_ID=b.CUSTOMER_ID - and i.ID=b.FORM_ITEM_ID - and i.del_flag='0' -)where b.DEL_FLAG='0'; \ No newline at end of file