diff --git a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/OwCases.java b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/OwCases.java index 9dd4986..dd3514b 100644 --- a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/OwCases.java +++ b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/OwCases.java @@ -56,7 +56,7 @@ public class OwCases extends BaseEntity { private String selected; /** - * 客户名称 + * 功能说明文档链接 */ private String client; @@ -66,17 +66,17 @@ public class OwCases extends BaseEntity { private Date completionDate; /** - * 客户面临的挑战 + * 设计稿链接 */ private String challenge; /** - * 提供的解决方案 + * 小程序二维码 */ private String solution; /** - * 项目成果 + * 网站链接 */ private String results; @@ -85,15 +85,15 @@ public class OwCases extends BaseEntity { */ private String content; - /** - * 客户评价 - */ - private String testimonial; - - /** - * 评价人及职位 - */ - private String testimonialAuthor; + /** + * 设计展示 + */ + private String testimonial; +// +// /** +// * 评价人及职位 +// */ +// private String testimonialAuthor; } diff --git a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/bo/OwCasesBo.java b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/bo/OwCasesBo.java index f8b27c2..89bf591 100644 --- a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/bo/OwCasesBo.java +++ b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/bo/OwCasesBo.java @@ -62,7 +62,7 @@ public class OwCasesBo extends BaseEntity { private String selected; /** - * 客户名称 + * 功能说明文档链接 */ private String client; @@ -72,17 +72,17 @@ public class OwCasesBo extends BaseEntity { private Date completionDate; /** - * 客户面临的挑战 + * 设计稿链接 */ private String challenge; /** - * 提供的解决方案 + * 小程序二维码 */ private String solution; /** - * 项目成果 + * 网站链接 */ private String results; @@ -92,7 +92,7 @@ public class OwCasesBo extends BaseEntity { private String content; /** - * 客户评价 + * 设计展示 */ private String testimonial; diff --git a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/vo/OwCasesVo.java b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/vo/OwCasesVo.java index 63b1f03..294a6b4 100644 --- a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/vo/OwCasesVo.java +++ b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/domain/vo/OwCasesVo.java @@ -34,7 +34,7 @@ public class OwCasesVo implements Serializable { * 编号 */ @ExcelProperty(value = "编号") - private Long id; + private String id; /** * 标题 @@ -77,11 +77,17 @@ public class OwCasesVo implements Serializable { private String categoryName; /** - * 客户名称 + * 功能说明文档链接 */ - @ExcelProperty(value = "客户名称") + @ExcelProperty(value = "功能说明文档链接") private String client; + /** + * 功能说明文档链接Url + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "client") + private String clientUrl; + /** * 完成日期 */ @@ -89,18 +95,33 @@ public class OwCasesVo implements Serializable { private Date completionDate; /** - * 客户面临的挑战 + * 设计稿链接 */ + @ExcelProperty(value = "设计稿链接") private String challenge; /** - * 提供的解决方案 + * 设计稿链接Url + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "challenge") + private String challengeUrl; + + /** + * 小程序二维码 */ + @ExcelProperty(value = "小程序二维码") private String solution; /** - * 项目成果 + * 小程序二维码Url */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "solution") + private String solutionUrl; + + /** + * 网站链接 + */ + @ExcelProperty(value = "网站链接") private String results; /** @@ -109,13 +130,19 @@ public class OwCasesVo implements Serializable { private String content; /** - * 客户评价 + * 设计展示 */ private String testimonial; + /** + * 设计展示Url + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "testimonial") + private String testimonialUrl; + /** * 评价人及职位 */ - private String testimonialAuthor; + //private String testimonialAuthor; } diff --git a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/front/controller/OwFrontCasesController.java b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/front/controller/OwFrontCasesController.java index a702bfc..ef6ca2f 100644 --- a/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/front/controller/OwFrontCasesController.java +++ b/java-api/ruoyi-modules/h-project/src/main/java/org/dromara/officialWebsite/front/controller/OwFrontCasesController.java @@ -51,7 +51,7 @@ public class OwFrontCasesController extends BaseController { * * @param id 主键 */ - @GetMapping("/{id}") + @GetMapping("/detail/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(owCasesService.queryById(id)); diff --git a/plus-ui/src/views/officialWebsite/cases/index.vue b/plus-ui/src/views/officialWebsite/cases/index.vue index 50361c9..06ecfed 100644 --- a/plus-ui/src/views/officialWebsite/cases/index.vue +++ b/plus-ui/src/views/officialWebsite/cases/index.vue @@ -69,7 +69,7 @@ - +