diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java index 6224e8f..12d32d3 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/controller/SolutionController.java @@ -27,10 +27,16 @@ public class SolutionController { @ApiOperation(value="解决方案列表", notes="解决方案列表") @GetMapping("/list") - public Result getStr() { + public Result getList() { return Result.OK(this.solutionService.query().select("id","title","des","img","date","cases").eq("isshow","Y").list()); } + @ApiOperation(value="解决方案列表含案例", notes="解决方案列表含案例") + @GetMapping("/list-all") + public Result getListAll() { + return Result.OK(this.solutionService.getAll()); + } + @ApiOperation(value="解决方案详情", notes="解决方案详情") @GetMapping("/info") public Result getInfo(@RequestParam(name="id",required=true) String id) { diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/entity/Solution.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/entity/Solution.java index a8873f1..9a85a58 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/entity/Solution.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/entity/Solution.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -31,6 +33,7 @@ import lombok.experimental.Accessors; @ApiModel(value="yxgw_solution对象", description="解决方案") public class Solution implements Serializable { private static final long serialVersionUID = 1L; + public List caseslist; /**id*/ @TableId(type = IdType.ASSIGN_ID) @@ -71,7 +74,7 @@ public class Solution implements Serializable { @Excel(name = "案例列表", width = 15, dictTable = "yxgw_case", dicText = "customer", dicCode = "id") @Dict(dictTable = "yxgw_case", dicText = "customer", dicCode = "id") @ApiModelProperty(value = "案例列表") - private java.lang.String cases; + public java.lang.String cases; /**发布日期*/ @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/CaseMapper.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/CaseMapper.java index 80a9a58..a7a7f43 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/CaseMapper.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/CaseMapper.java @@ -1,8 +1,11 @@ package org.jeecg.modules.demo.yxgwf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.demo.yxgwf.entity.Case; +import java.util.List; + /** * @Description: 客户案例 * @Author: jeecg-boot @@ -11,4 +14,5 @@ import org.jeecg.modules.demo.yxgwf.entity.Case; */ public interface CaseMapper extends BaseMapper { + List getAll(@Param("caseIds") String[] caseIds); } diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java index 5a32b2e..d624b6d 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/SolutionMapper.java @@ -2,7 +2,14 @@ package org.jeecg.modules.demo.yxgwf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; +import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer; import org.jeecg.modules.demo.yxgwf.entity.Solution; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service public interface SolutionMapper extends BaseMapper { + public List getAll(); } diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml index dc46b8e..7fdc21f 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml @@ -1,5 +1,13 @@ - + \ No newline at end of file diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml index 8e84846..feda69a 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml @@ -1,5 +1,7 @@ - + \ No newline at end of file diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java index aac7c1a..2849d3b 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/ISolutionService.java @@ -3,5 +3,8 @@ package org.jeecg.modules.demo.yxgwf.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.demo.yxgwf.entity.Solution; +import java.util.List; + public interface ISolutionService extends IService { + List getAll(); } diff --git a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java index e68ebaf..8890c9f 100644 --- a/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java +++ b/linus-boot/linus-module-demo/src/main/java/org/jeecg/modules/demo/yxgwf/service/impl/SolutionServiceImpl.java @@ -1,11 +1,30 @@ package org.jeecg.modules.demo.yxgwf.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.demo.yxgwf.entity.Case; import org.jeecg.modules.demo.yxgwf.entity.Solution; +import org.jeecg.modules.demo.yxgwf.mapper.CaseMapper; import org.jeecg.modules.demo.yxgwf.mapper.SolutionMapper; import org.jeecg.modules.demo.yxgwf.service.ISolutionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class SolutionServiceImpl extends ServiceImpl implements ISolutionService { + @Autowired + private SolutionMapper solutionMapper; + @Autowired + private CaseMapper caseMapper; + + public List getAll() { + List solution_list = solutionMapper.getAll(); + solution_list.forEach((e) -> { + String[] caseIds = e.cases.split(","); + List case_list = caseMapper.getAll(caseIds); + e.caseslist = case_list; + }); + return solution_list; + } } diff --git a/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml b/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml index dc46b8e..7fdc21f 100644 --- a/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml +++ b/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/CaseMapper.xml @@ -1,5 +1,13 @@ - + \ No newline at end of file diff --git a/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml b/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml index 8e84846..feda69a 100644 --- a/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml +++ b/linus-boot/linus-module-demo/target/classes/org/jeecg/modules/demo/yxgwf/mapper/xml/SolutionMapper.xml @@ -1,5 +1,7 @@ - + \ No newline at end of file