From 8cc0e647348323e9102942e1bd54a595e3f75d2c Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 31 Jul 2025 17:50:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20sys=E6=B7=BB=E5=8A=A0=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/SysPrintTemplateInfo.java | 2 +- .../domain/bo/SysPrintTemplateInfoBo.java | 2 +- .../domain/vo/SysPrintTemplateInfoVo.java | 2 +- .../impl/SysPrintTemplateInfoServiceImpl.java | 29 ++++++++++--------- .../impl/SysPrintTemplateNodeServiceImpl.java | 5 ++++ 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java index 3bb7695..27154bd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPrintTemplateInfo.java @@ -30,7 +30,7 @@ public class SysPrintTemplateInfo extends TenantEntity { /** * 模板列表ID */ - private String templateListId; + private Long templateListId; /** * 纸张类型 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java index 5218139..e95ce45 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPrintTemplateInfoBo.java @@ -25,7 +25,7 @@ public class SysPrintTemplateInfoBo extends BaseEntity { /** * 模板列表ID */ - private String templateListId; + private Long templateListId; /** * 纸张类型 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java index 14b9c20..0ef5cff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPrintTemplateInfoVo.java @@ -38,7 +38,7 @@ public class SysPrintTemplateInfoVo implements Serializable { * 模板列表ID */ @ExcelProperty(value = "模板列表ID") - private String templateListId; + private Long templateListId; /** * 纸张类型 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java index 4ba5cd1..e1dfecd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.system.domain.SysPrintTemplateList; import org.springframework.stereotype.Service; import org.dromara.system.domain.bo.SysPrintTemplateInfoBo; import org.dromara.system.domain.vo.SysPrintTemplateInfoVo; @@ -39,7 +40,7 @@ public class SysPrintTemplateInfoServiceImpl implements ISysPrintTemplateInfoSer * @return 打印模板信息 */ @Override - public SysPrintTemplateInfoVo queryById(Long templateInfoId){ + public SysPrintTemplateInfoVo queryById(Long templateInfoId) { return baseMapper.selectVoById(templateInfoId); } @@ -72,16 +73,18 @@ public class SysPrintTemplateInfoServiceImpl implements ISysPrintTemplateInfoSer private MPJLambdaWrapper buildQueryWrapper(SysPrintTemplateInfoBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(SysPrintTemplateInfo.class) - .selectAll(SysPrintTemplateInfo.class) - .eq(bo.getTemplateInfoId() != null, SysPrintTemplateInfo::getTemplateInfoId, bo.getTemplateInfoId()) - .eq(StringUtils.isNotBlank(bo.getTemplateListId()), SysPrintTemplateInfo::getTemplateListId, bo.getTemplateListId()) - .eq(StringUtils.isNotBlank(bo.getPaperType()), SysPrintTemplateInfo::getPaperType, bo.getPaperType()) - .eq(StringUtils.isNotBlank(bo.getWidth()), SysPrintTemplateInfo::getWidth, bo.getWidth()) - .eq(StringUtils.isNotBlank(bo.getHeight()), SysPrintTemplateInfo::getHeight, bo.getHeight()) - .eq(StringUtils.isNotBlank(bo.getBackgroundColor()), SysPrintTemplateInfo::getBackgroundColor, bo.getBackgroundColor()) - .eq(StringUtils.isNotBlank(bo.getOrientation()), SysPrintTemplateInfo::getOrientation, bo.getOrientation()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysPrintTemplateInfo::getActiveFlag, bo.getActiveFlag()) - .orderByAsc(SysPrintTemplateInfo::getCreateTime); + .selectAll(SysPrintTemplateInfo.class) + .select(SysPrintTemplateList::getTemplateName) + .leftJoin(SysPrintTemplateList.class, SysPrintTemplateList::getTemplateListId, SysPrintTemplateInfo::getTemplateListId) + .eq(bo.getTemplateInfoId() != null, SysPrintTemplateInfo::getTemplateInfoId, bo.getTemplateInfoId()) + .eq(StringUtils.isNotNull(bo.getTemplateListId()), SysPrintTemplateInfo::getTemplateListId, bo.getTemplateListId()) + .eq(StringUtils.isNotBlank(bo.getPaperType()), SysPrintTemplateInfo::getPaperType, bo.getPaperType()) + .eq(StringUtils.isNotBlank(bo.getWidth()), SysPrintTemplateInfo::getWidth, bo.getWidth()) + .eq(StringUtils.isNotBlank(bo.getHeight()), SysPrintTemplateInfo::getHeight, bo.getHeight()) + .eq(StringUtils.isNotBlank(bo.getBackgroundColor()), SysPrintTemplateInfo::getBackgroundColor, bo.getBackgroundColor()) + .eq(StringUtils.isNotBlank(bo.getOrientation()), SysPrintTemplateInfo::getOrientation, bo.getOrientation()) + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), SysPrintTemplateInfo::getActiveFlag, bo.getActiveFlag()) + .orderByAsc(SysPrintTemplateInfo::getCreateTime); return lqw; } @@ -118,7 +121,7 @@ public class SysPrintTemplateInfoServiceImpl implements ISysPrintTemplateInfoSer /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysPrintTemplateInfo entity){ + private void validEntityBeforeSave(SysPrintTemplateInfo entity) { //TODO 做一些数据校验,如唯一约束 } @@ -131,7 +134,7 @@ public class SysPrintTemplateInfoServiceImpl implements ISysPrintTemplateInfoSer */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java index 10f2913..6907969 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java @@ -10,6 +10,8 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.system.domain.SysPrintTemplateInfo; +import org.dromara.system.domain.SysPrintTemplateList; import org.springframework.stereotype.Service; import org.dromara.system.domain.bo.SysPrintTemplateNodeBo; import org.dromara.system.domain.vo.SysPrintTemplateNodeVo; @@ -75,6 +77,9 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(SysPrintTemplateNode.class) .selectAll(SysPrintTemplateNode.class) + .select(SysPrintTemplateList::getTemplateName) + .leftJoin(SysPrintTemplateInfo.class, SysPrintTemplateInfo::getTemplateInfoId, SysPrintTemplateNode::getTemplateInfoId) + .leftJoin(SysPrintTemplateList.class, SysPrintTemplateList::getTemplateListId, SysPrintTemplateInfo::getTemplateListId) .eq(bo.getTemplateNodeId() != null, SysPrintTemplateNode::getTemplateNodeId, bo.getTemplateNodeId()) .eq(StringUtils.isNotBlank(bo.getTemplateInfoId()), SysPrintTemplateNode::getTemplateInfoId, bo.getTemplateInfoId()) .like(StringUtils.isNotBlank(bo.getName()), SysPrintTemplateNode::getName, bo.getName())