diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdQuery.java index da44517..5b02239 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdQuery.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; @Data -public class AdQuery extends Ad{ +public class AdQuery extends AdVO{ @ApiModelProperty("广告ID列表") private List adIds; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdVO.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdVO.java index fad986f..0f9241a 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdVO.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/AdVO.java @@ -9,7 +9,10 @@ public class AdVO extends Ad{ @ApiModelProperty("所属运营区") private String areaName; - @ApiModelProperty("所属运营区") + @ApiModelProperty("广告审核状态") private String auditStatus; + @ApiModelProperty("审核人") + private String verifyName; + } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java index 959f5ac..95d88df 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java @@ -185,7 +185,6 @@ public class AdServiceImpl implements AdService data.setVerifyBy(SecurityUtils.getUserId()); data.setVerifyEndTime(LocalDateTime.now()); data.setVerifyRemark(dto.getVerifyRemark()); - data.setVerifyBy(SecurityUtils.getUserId()); AdQuery query = new AdQuery(); query.setAdId(dto.getId()); query.setStatusList(AdVerifyStatus.canVerify()); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementQuery.java index 0a0b2f6..cfaf1e5 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/domain/AgreementQuery.java @@ -12,7 +12,6 @@ public class AgreementQuery extends AgreementVO { @ApiModelProperty("用户ID") private Long userId; - @ApiModelProperty("协议ID列表") private List ids; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java index 18e74c1..47f5c0a 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/AgreementService.java @@ -35,7 +35,7 @@ public interface AgreementService * @param agreement 协议 * @return 结果 */ - public int insertAgreement(AgreementQuery agreement); + public int insertAgreement(Agreement agreement); /** * 修改协议 diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java index 03ec04f..be1541d 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java @@ -64,16 +64,9 @@ public class AgreementServiceImpl implements AgreementService * @return 结果 */ @Override - public int insertAgreement(AgreementQuery agreement) + public int insertAgreement(Agreement agreement) { agreement.setCreateTime(DateUtils.getNowDate()); - UserVO user = userService.selectUserById(agreement.getUserId()); - if (user != null){ - if (user.getAreaId() != null){ - agreement.setAreaId(user.getAreaId()); - } - agreement.setStoreId(agreement.getUserId()); - } distinct(agreement); return agreementMapper.insertAgreement(agreement); } @@ -93,12 +86,7 @@ public class AgreementServiceImpl implements AgreementService } private void distinct(Agreement agreement) { - if (agreement.getAreaId() != null){ - AreaVO area = areaService.selectAreaById(agreement.getAreaId()); - ServiceUtil.assertion(area == null,"当前区域不存在"); - agreement.setStoreId(area.getUserId()); - ServiceUtil.assertion(agreementMapper.selectDistinct(agreement)!= null,"当前运营区已存在同类协议"); - } + ServiceUtil.assertion(agreementMapper.selectDistinct(agreement)!= null,"当前运营区已存在同类协议"); } /** diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleQuery.java index 4aa90a6..d0f02aa 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/domain/ArticleQuery.java @@ -3,7 +3,7 @@ package com.ruoyi.bst.article.domain; import lombok.Data; @Data -public class ArticleQuery extends Article{ +public class ArticleQuery extends ArticleVO{ } 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 1522680..1d31db4 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 @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class ArticleCategoryQuery extends ArticleCategory { +public class ArticleCategoryQuery extends ArticleCategoryVO { @ApiModelProperty("指南编号") private String code; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/complaint/domain/ComplaintQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/complaint/domain/ComplaintQuery.java index 93b2bde..da6f649 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/complaint/domain/ComplaintQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/complaint/domain/ComplaintQuery.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class ComplaintQuery extends Complaint{ +public class ComplaintQuery extends ComplaintVO{ @ApiModelProperty("用户名称") private String userName; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/customerService/domain/CustomerServiceQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/customerService/domain/CustomerServiceQuery.java index 9869a3d..9a3cc91 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/customerService/domain/CustomerServiceQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/customerService/domain/CustomerServiceQuery.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; @Data -public class CustomerServiceQuery extends CustomerService{ +public class CustomerServiceQuery extends CustomerServiceVO{ @ApiModelProperty("客服ID列表") private List ids; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/domain/HardwareVersionQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/domain/HardwareVersionQuery.java index e1745c2..1e3d7d9 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/domain/HardwareVersionQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/hardwareVersion/domain/HardwareVersionQuery.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; @Data -public class HardwareVersionQuery extends HardwareVersion{ +public class HardwareVersionQuery extends HardwareVersionVO{ @ApiModelProperty("硬件版本列表") private List hardwareVersionIds; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/mchApply/domain/MchApplyQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/mchApply/domain/MchApplyQuery.java index 4adb7d6..0fca2a5 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/mchApply/domain/MchApplyQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/mchApply/domain/MchApplyQuery.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class MchApplyQuery extends MchApply{ +public class MchApplyQuery extends MchApplyVO{ @ApiModelProperty("创建时间范围") @DateTimeFormat(pattern = "yyyy-MM-dd") diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/realName/domain/RealNameQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/realName/domain/RealNameQuery.java index 5a884c6..de4c4bb 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/realName/domain/RealNameQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/realName/domain/RealNameQuery.java @@ -1,4 +1,4 @@ package com.ruoyi.bst.realName.domain; -public class RealNameQuery extends RealName{ +public class RealNameQuery extends RealNameVO{ } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java index 1a61b1e..b73ced3 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/AgreementController.java @@ -76,9 +76,8 @@ public class AgreementController extends BaseController @PreAuthorize("@ss.hasPermi('bst:agreement:add')") @Log(title = "协议", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody AgreementQuery agreement) + public AjaxResult add(@RequestBody Agreement agreement) { - agreement.setUserId(getUserId()); return toAjax(agreementService.insertAgreement(agreement)); }