diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java index c85835a9..ecaf3f24 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java @@ -36,7 +36,7 @@ public interface YxUserBillService extends BaseService{ * @param criteria 条件参数 * @return List */ - List queryAll(YxUserBillQueryCriteria criteria); + List> queryAll(YxUserBillQueryCriteria criteria); /** * 导出数据 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java index b8cffe53..8773bb70 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java @@ -17,36 +17,37 @@ import java.io.Serializable; */ @Data public class YxSystemUserTaskDto implements Serializable { - private Integer id; - /** 任务名称 */ + // 任务名称 private String name; - /** 配置原名 */ + // 配置原名 private String realName; - /** 任务类型 */ + // 任务类型 private String taskType; - /** 限定数 */ + // 限定数 private Integer number; - /** 等级id */ + // 等级id private Integer levelId; - /** 排序 */ + private String levalName; + + // 排序 private Integer sort; - /** 是否显示 */ + // 是否显示 private Integer isShow; - /** 是否务必达成任务,1务必达成,0=满足其一 */ + // 是否务必达成任务,1务必达成,0=满足其一 private Integer isMust; - /** 任务说明 */ + // 任务说明 private String illustrate; - /** 新增时间 */ + // 新增时间 private Integer addTime; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java index 7047ac89..94d8ef7a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java @@ -18,4 +18,7 @@ import co.yixiang.annotation.Query; */ @Data public class YxUserBillQueryCriteria{ + private String nickname; + private String category; + private String type; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java index e365961c..dd904508 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java @@ -52,8 +52,13 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl queryAll(YxSystemUserTaskQueryCriteria criteria, Pageable pageable) { getPage(pageable); PageInfo page = new PageInfo<>(queryAll(criteria)); + List systemUserTaskDTOS = generator.convert(page.getList(),YxSystemUserTaskDto.class); + for (YxSystemUserTaskDto systemUserTaskDTO : systemUserTaskDTOS) { + systemUserTaskDTO.setLevalName(this + .getById(systemUserTaskDTO.getLevelId()).getName()); + } Map map = new LinkedHashMap<>(2); - map.put("content", generator.convert(page.getList(), YxSystemUserTaskDto.class)); + map.put("content", systemUserTaskDTOS); map.put("totalElements", page.getTotal()); return map; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java index 41d87f76..581197e1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java @@ -19,6 +19,7 @@ import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.dto.YxUserBillDto; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import co.yixiang.modules.shop.service.mapper.UserBillMapper; +import org.apache.xmlbeans.impl.xb.xmlconfig.Qnametargetlist; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -51,9 +52,9 @@ public class YxUserBillServiceImpl extends BaseServiceImpl queryAll(YxUserBillQueryCriteria criteria, Pageable pageable) { getPage(pageable); - PageInfo page = new PageInfo<>(queryAll(criteria)); + PageInfo> page = new PageInfo<>(queryAll(criteria)); Map map = new LinkedHashMap<>(2); - map.put("content", generator.convert(page.getList(), YxUserBillDto.class)); + map.put("content", page.getList()); map.put("totalElements", page.getTotal()); return map; } @@ -61,8 +62,9 @@ public class YxUserBillServiceImpl extends BaseServiceImpl queryAll(YxUserBillQueryCriteria criteria){ - return baseMapper.selectList(QueryHelpPlus.getPredicate(YxUserBill.class, criteria)); + public List> queryAll(YxUserBillQueryCriteria criteria){ + + return baseMapper.findAllByQueryCriteria(criteria.getCategory(),criteria.getType(),criteria.getNickname()); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java index ce14053e..17357f8e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java @@ -10,9 +10,17 @@ package co.yixiang.modules.shop.service.mapper; import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxUserBill; +import co.yixiang.modules.shop.service.dto.YxUserBillDto; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.ResultType; +import org.apache.ibatis.annotations.Select; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + /** * @author hupeng * @date 2020-05-12 @@ -21,4 +29,9 @@ import org.springframework.stereotype.Repository; @Mapper public interface UserBillMapper extends CoreMapper { + @ResultType(Map.class) + @Select("select b.title,b.pm,b.category,b.type,b.number,b.add_time as addTime,u.nickname " + + "from yx_user_bill b left join yx_user u on u.uid=b.uid where if(#{category} !='',b.category=#{category},1=1) " + + "and if(#{type} !='',b.type=#{type},1=1) and if(#{nickname} !='',u.nickname LIKE CONCAT('%',#{nickname},'%'),1=1) ") + List> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, @Param("nickname") String nickname); }