From cac8c966f38cea5cde206468006c850014b14ee2 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 3 Nov 2023 20:04:21 +0800 Subject: [PATCH] fix --- .../db/migration/V2023110300001_personmould.sql | 8 ++++++++ .../java/com/iformall/domain/po/sm/PersonMould.java | 4 ++++ .../java/com/iformall/domain/po/sm/VoiceLanguage.java | 3 +++ .../src/main/resources/mapper/PersonMouldMapper.xml | 10 ++++++++-- .../src/main/resources/mapper/VoiceLanguageMapper.xml | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql new file mode 100644 index 0000000..502eca5 --- /dev/null +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -0,0 +1,8 @@ +ALTER TABLE `person_mould` +ADD COLUMN customized int(1) NOT NULL DEFAULT 0 COMMENT '是否私人定制EnumYesOrNo' AFTER `is_del`; + +##更新这几个表 +apimenu,apiguide,apidetail,thirdpartyapi + +ALTER TABLE `voice_language` +ADD COLUMN customized int(1) NOT NULL DEFAULT 0 COMMENT '是否私人定制EnumYesOrNo' AFTER `is_del`; diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java b/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java index 40aa8e7..23d1f05 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/PersonMould.java @@ -124,6 +124,10 @@ public class PersonMould extends TenantEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @io.swagger.annotations.ApiModelProperty(value="isDel",name="isDel") + private Integer isDel; + @io.swagger.annotations.ApiModelProperty(value="是否私人定制EnumYesOrNo",name="customized") + private Integer customized; public String getSalePriceStr() { diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java index d2799f7..00a5a8f 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/VoiceLanguage.java @@ -59,5 +59,8 @@ public class VoiceLanguage extends TenantEntity { * 是否删除1是0否 */ private Integer isDel; + + @io.swagger.annotations.ApiModelProperty(value="是否私人定制EnumYesOrNo",name="customized") + private Integer customized; } diff --git a/suimangService/src/main/resources/mapper/PersonMouldMapper.xml b/suimangService/src/main/resources/mapper/PersonMouldMapper.xml index fbc3084..89cc24b 100644 --- a/suimangService/src/main/resources/mapper/PersonMouldMapper.xml +++ b/suimangService/src/main/resources/mapper/PersonMouldMapper.xml @@ -28,13 +28,15 @@ + + `id`, `tenant_id`, `parent_tenant_id`, `video_type`, `cover_img`, `cover_picture`, `detail_picture`, `title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`, `send_type`, `detail`, `remark`, `mould_sm_id`,`material`,`background_id`,`background_material`, - `status`, `puton_date`, `create_date`, `update_date` + `status`, `puton_date`, `create_date`, `update_date`,`is_del`,`customized` @@ -101,6 +103,10 @@ and create_date < #{endDate} + + + and customized = #{customized} + and id in @@ -128,7 +134,7 @@ `id`, `video_type`, `cover_img`, `cover_picture`, `title`, `sub_title`, `sex`, `age`, `colour`, `scene_sign`, `sale_price`, `price`, `send_type`, `mould_sm_id`,`material`,`background_id`,`background_material`, - `status`, `create_date`, `update_date` + `status`, `create_date`, `update_date`,`customized` from person_mould diff --git a/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml b/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml index 045741e..a783ab1 100644 --- a/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml +++ b/suimangService/src/main/resources/mapper/VoiceLanguageMapper.xml @@ -3,7 +3,7 @@ - `id`, `tenant_id`, `parent_tenant_id`, `language`, `country`, `local`, `name`, `chinese_name`, `img`, `create_date`, `update_date`, `is_del` + `id`, `tenant_id`, `parent_tenant_id`, `language`, `country`, `local`, `name`, `chinese_name`, `img`, `create_date`, `update_date`, `is_del`,`customized` INSERT INTO voice_language (`id`, `country`,