zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改bug

Browse Source
This commit is contained in:
潘荣晟
2025-10-28 17:52:42 +08:00
parent 1f68b47345
commit 475609b3b2
10 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmpItmPageReqVO.java
View File

@@ -32,4 +32,7 @@ public class TmpItmPageReqVO extends PageParam {
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDate[] createTime;
@Schema(description = "状态")
private String sts;
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplFldPageReqVO.java
View File

@@ -28,6 +28,10 @@ public class TmplFldPageReqVO extends PageParam {
@Schema(description = "备注")
private String rmk;
@Schema(description = "状态")
private String sts;
@Schema(description = "是否必填")
private String isMust;

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java
View File

@@ -15,6 +15,7 @@ public interface TmplItmMapper extends BaseMapperX<TmplItmDO> {
.likeIfPresent(TmplItmDO::getItmName, reqVO.getItmName())
.likeIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum())
.eqIfPresent(TmplItmDO::getRmk, reqVO.getRmk())
.eqIfPresent(TmplItmDO::getSts, reqVO.getSts())
.betweenIfPresent(TmplItmDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TmplItmDO::getId));
}

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java
View File

@@ -17,6 +17,7 @@ public interface TmplTpFldMapper extends BaseMapperX<TmplTpFldDO> {
.eqIfPresent(TmplTpFldDO::getFldDoc, reqVO.getFldDoc())
.eqIfPresent(TmplTpFldDO::getIsMust, reqVO.getIsMust())
.eqIfPresent(TmplTpFldDO::getDatTp, reqVO.getDatTp())
.eqIfPresent(TmplTpFldDO::getSts, reqVO.getSts())
.betweenIfPresent(TmplTpFldDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TmplTpFldDO::getId));
}

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java
View File

@@ -29,6 +29,7 @@ public interface TmplTpMapper extends BaseMapperX<TmplTpDO> {
.eqIfPresent(TmplTpDO::getPrnId, reqVO.getPrnId())
.eqIfPresent(TmplTpDO::getSrt, reqVO.getSrt())
.eqIfPresent(TmplTpDO::getSts, reqVO.getSts())
.eqIfPresent(TmplTpDO::getSts, reqVO.getSts())
.betweenIfPresent(TmplTpDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TmplTpDO::getId));
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java
View File

@@ -252,8 +252,8 @@ public class TmplTpServiceImpl extends ServiceImpl<TmplTpMapper, TmplTpDO> imple
// 1. 根据条件查询匹配的节点
List<TmplTpDO> matchedNodes = baseMapper.selectList(new LambdaQueryWrapper<TmplTpDO>()
.eq(name != null && !name.isEmpty(), TmplTpDO::getName, name)
.eq(num != null && !num.isEmpty(), TmplTpDO::getNum, num));
.like(name != null && !name.isEmpty(), TmplTpDO::getName, name)
.like(num != null && !num.isEmpty(), TmplTpDO::getNum, num));
if (matchedNodes.isEmpty()) {
return new ArrayList<>();

2
zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml
View File

@@ -21,6 +21,7 @@
AND rel.DELETED = 0
AND tp.DELETED = 0
AND tp.id = #{id}
and itm.sts=1
</select>
<select id="getField" resultType="com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO">
@@ -33,6 +34,7 @@
AND r.DELETED = '0'
AND t.DELETED = '0'
AND t.id = #{id}
AND f.sts=1
ORDER BY t.SRT, f.FLD_KY
</select>