From c9d51ef54cd9c69f83b77b25583479bd6118a031 Mon Sep 17 00:00:00 2001 From: fengguangyu <841028466@qq.com> Date: Thu, 22 Jul 2021 14:34:55 +0800 Subject: [PATCH 1/2] no message --- .../dto/baseconfig/extendfrommanage/ExtendFormManageQry.java | 3 +++ .../db/mapper/table/ExtendFromManageMapper.java | 3 ++- .../infrastructure/db/mapper/xml/ExtendFromManageMapper.xml | 5 +++++ .../reader/baseconfig/BaseConfigQuerySvrImpl.java | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/extendfrommanage/ExtendFormManageQry.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/extendfrommanage/ExtendFormManageQry.java index 42c7f2a9..9f0b07aa 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/extendfrommanage/ExtendFormManageQry.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/extendfrommanage/ExtendFormManageQry.java @@ -27,4 +27,7 @@ public class ExtendFormManageQry extends BaseDto { @NotNull(message = "鍒嗛〉澶у皬涓嶈兘涓虹┖") @ApiModelProperty(value = "鍒嗛〉澶у皬", example = "10") private Integer pageSize; + + @NotNull(message = "鎵╁睍琛ㄥ悕绉�") + private String extendName; } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/ExtendFromManageMapper.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/ExtendFromManageMapper.java index 6846bea9..693296cb 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/ExtendFromManageMapper.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/table/ExtendFromManageMapper.java @@ -5,6 +5,7 @@ import com.seasky.core.base.BaseMapper; import com.seasky.projectplan.dto.baseconfig.extendfrommanage.ExtendFormManageOut; +import com.seasky.projectplan.dto.baseconfig.extendfrommanage.ExtendFormManageQry; import com.seasky.projectplan.dto.baseconfig.personfund.PersonFundOut; import com.seasky.projectplan.infrastructure.dataobject.po.ExtendFormManagePo; import org.apache.ibatis.annotations.Mapper; @@ -24,7 +25,7 @@ public interface ExtendFromManageMapper extends BaseMapper<ExtendFormManagePo> { List<ExtendFormManagePo> selectByIds(@Param("pm") List<Long> ids); - Page<ExtendFormManagePo> queryExtendFormPage(Page<ExtendFormManageOut> page); + Page<ExtendFormManagePo> queryExtendFormPage(Page<ExtendFormManageOut> page,@Param("pm") ExtendFormManageQry qry); List<ExtendFormManagePo> queryExtendFormByTable(@Param("extendName")String extendName); diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml index 63d59cad..f09cbf4a 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml @@ -13,10 +13,15 @@ <select id="queryExtendFormPage" resultType="com.seasky.projectplan.infrastructure.dataobject.po.ExtendFormManagePo"> select * from extend_from_manage where available = 'YES' + <if test="pm.extendName != null and pm.extendName != ''"> + and extend_table_name = #{pm.extendName} + </if> + ORDER BY row_no </select> <select id="queryExtendFormByTable" resultType="com.seasky.projectplan.infrastructure.dataobject.po.ExtendFormManagePo"> select * from extend_from_manage where available = 'YES' and extend_table_name = #{extendName} and is_open='YES' + ORDER BY row_no </select> <select id="queryExtendFormName" resultType="java.lang.String"> select distinct extend_table_name from extend_from_manage where available = 'YES' diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigQuerySvrImpl.java index 90cdfed4..16efded2 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigQuerySvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigQuerySvrImpl.java @@ -152,7 +152,7 @@ public class BaseConfigQuerySvrImpl implements BaseConfigQuerySvr { @Override public Pagination<ExtendFormManageOut> queryExtendFormPage(ExtendFormManageQry qry) { Page<ExtendFormManageOut> page = new Page<>(qry.getPageIndex(), qry.getPageSize()); - List<ExtendFormManageOut> outs = BaseConfigReaderConvert.toExtendFromManageOutList(extendFromManageMapper.queryExtendFormPage(page).getRecords()); + List<ExtendFormManageOut> outs = BaseConfigReaderConvert.toExtendFromManageOutList(extendFromManageMapper.queryExtendFormPage(page,qry).getRecords()); page.setRecords(outs); return Pagination.fromPage(page); } @@ -160,7 +160,7 @@ public class BaseConfigQuerySvrImpl implements BaseConfigQuerySvr { @Override public void exportExtendFormPage(HttpServletRequest request, HttpServletResponse response, ExtendFormManageQry qry) { Page<ExtendFormManageOut> page = new Page<>(qry.getPageIndex(), qry.getPageSize()); - List<ExtendFormManageOut> outs = BaseConfigReaderConvert.toExtendFromManageOutList(extendFromManageMapper.queryExtendFormPage(page).getRecords()); + List<ExtendFormManageOut> outs = BaseConfigReaderConvert.toExtendFromManageOutList(extendFromManageMapper.queryExtendFormPage(page,qry).getRecords()); page.setRecords(outs); //return Pagination.fromPage(page); } -- GitLab From 422d258df74545019295a61877e6b500bdb687f8 Mon Sep 17 00:00:00 2001 From: fengguangyu <841028466@qq.com> Date: Thu, 22 Jul 2021 14:41:44 +0800 Subject: [PATCH 2/2] no message --- .../infrastructure/db/mapper/xml/ExtendFromManageMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml index f09cbf4a..b1876a9d 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/db/mapper/xml/ExtendFromManageMapper.xml @@ -14,7 +14,7 @@ resultType="com.seasky.projectplan.infrastructure.dataobject.po.ExtendFormManagePo"> select * from extend_from_manage where available = 'YES' <if test="pm.extendName != null and pm.extendName != ''"> - and extend_table_name = #{pm.extendName} + and extend_table_name like concat('%', #{pm.extendName}, '%') </if> ORDER BY row_no </select> -- GitLab