diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java index f4ef96f..9a84346 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleVO.java @@ -1,4 +1,4 @@ package com.ruoyi.bst.article.domain; -public class ArticleVO { +public class ArticleVO extends Article { } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java index 8b9a4aa..3b300c1 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java @@ -71,4 +71,6 @@ public interface ArticleMapper * @return 结果 */ public int deleteArticleByIds(Long[] ids); + + public ArticleVO selectChildrenByiId(Long id); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml index bfb38f2..6255069 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml @@ -47,6 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + insert into bst_article diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java index bad4654..a9a08d7 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/ArticleService.java @@ -60,4 +60,6 @@ public interface ArticleService * @return 结果 */ public int deleteArticleById(Long id); + + public ArticleVO selectChildrenByCategoryId(Long id); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java index 10f1b22..df09564 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/service/impl/ArticleServiceImpl.java @@ -116,4 +116,9 @@ public class ArticleServiceImpl implements ArticleService { return articleMapper.deleteArticleById(id); } + + @Override + public ArticleVO selectChildrenByCategoryId(Long id) { + return articleMapper.selectChildrenByiId(id); + } } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java index fb91e78..2eabd18 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategoryQuery.java @@ -1,4 +1,6 @@ package com.ruoyi.bst.articleCategory.domain; public class ArticleCategoryQuery extends ArticleCategory { + + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java index f7ea835..3c438ac 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/service/impl/ArticleCategoryServiceImpl.java @@ -2,10 +2,14 @@ package com.ruoyi.bst.articleCategory.service.impl; import java.util.*; +import com.github.pagehelper.PageHelper; +import com.ruoyi.bst.area.domain.AreaQuery; +import com.ruoyi.bst.area.domain.AreaVO; import com.ruoyi.bst.device.utils.DeviceUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.ServiceUtil; +import com.ruoyi.common.utils.collection.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.bst.articleCategory.mapper.ArticleCategoryMapper; @@ -36,9 +40,19 @@ public class ArticleCategoryServiceImpl implements ArticleCategoryService @Override public ArticleCategoryVO selectArticleCategoryById(Long id) { - return articleCategoryMapper.selectArticleCategoryById(id); + if (id == null) { + return null; + } + ArticleCategoryQuery query = new ArticleCategoryQuery(); + query.setId(id); + return this.selectOne(query); } + public ArticleCategoryVO selectOne(ArticleCategoryQuery query){ + PageHelper.startPage(1, 1); + List list = articleCategoryMapper.selectArticleCategoryList(query); + return CollectionUtils.firstElement(list); + } /** * 查询文章分类列表 * diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java index ba2ad32..110db12 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/Fault.java @@ -52,4 +52,8 @@ public class Fault extends BaseEntity @ApiModelProperty("用户id") private Long userId; + @Excel(name = "是否处理") + @ApiModelProperty("是否处理") + private String handle; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java index c78950c..c126115 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/FaultVO.java @@ -14,4 +14,6 @@ public class FaultVO extends Fault{ @ApiModelProperty("故障原因") private String faultSite; + @ApiModelProperty("车牌号") + private String vehicleNum; } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java new file mode 100644 index 0000000..c53cea0 --- /dev/null +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultHandleStatus.java @@ -0,0 +1,16 @@ +package com.ruoyi.bst.fault.domain.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum FaultHandleStatus { + + REJECTED("0", "驳回"), + DO("1", "处理"); + + private final String code; + private final String name; + +} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java index 32c79f1..f92cb00 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/domain/enums/FaultStatus.java @@ -7,9 +7,10 @@ import lombok.Getter; @AllArgsConstructor public enum FaultStatus { - STORAGE("0", "已驳回"), - AVAILABLE("1", "已提交"), - RESERVED("2", "维修中"); + REJECTED("0", "已驳回"), + PENGDING("1", "待处理"), + REPAIRING("2", "维修中"), + COMPLETED("3", "已完成"); private final String code; private final String name; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml index 2ec89f5..9aa7200 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml @@ -18,7 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bf.appeal_status, bf.create_time, bf.order_end_time, - bf.user_id + bf.user_id, + bf.vehicle_num from bst_fault bf @@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} +