From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 23 一月 2024 15:17:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java index e8a4fdb..688db64 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java @@ -12,6 +12,7 @@ import com.doumee.dao.business.SolutionsMapper; import com.doumee.dao.business.WorktypeMapper; import com.doumee.dao.business.join.SolutionWorktypeJoinMapper; +import com.doumee.dao.business.join.SolutionsJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.service.business.SolutionsService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -29,6 +30,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.UUID; /** @@ -41,6 +43,8 @@ @Autowired private SolutionsMapper solutionsMapper; + @Autowired + private SolutionsJoinMapper solutionsJoinMapper; @Autowired private WorktypeMapper worktypeMapper; @Autowired @@ -393,4 +397,7 @@ QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions); return solutionsMapper.selectCount(wrapper); } + + + } -- Gitblit v1.9.3