QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 法规符合性评估库增加接口权限及搜索

Browse Source
This commit is contained in:
mzaxd
2024-06-25 13:50:20 +08:00
parent b1ccae82a5
commit 72a458f6c6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java
+4 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.assessmentLibrary.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
@@ -8,6 +9,7 @@ import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibra
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -35,7 +37,8 @@ public class LawsConformityAssessmentController {
@AutoLog(value = "法规符合性评估库-法规符合性评估库-分页列表查询")
@ApiOperation(value = "法规符合性评估库-法规符合性评估库-分页列表查询", notes = "法规符合性评估库-法规符合性评估库-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("")
@ApiOperationSupport(order = 1)
@RequiresPermissions("lawsConformityAssessment:search")
public Result<IPage<LawsConformityAssessmentLibrary>> queryPageList(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+4 -4
View File
@@ -35,11 +35,11 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper = new QueryWrapper<>();
Page<LawsConformityAssessmentLibrary> page = new Page<>(pageNo, pageSize);
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()),
STANDARD_NUMBER, lawsConformityAssessmentLibrary.getStandardNumber());
"d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()),
STANDARD_NAME, lawsConformityAssessmentLibrary.getStandardName());
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardName()),
STANDARD_NAME, lawsConformityAssessmentLibrary.getStandardName());
"d.standard_name", lawsConformityAssessmentLibrary.getStandardName());
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket()),
"d.applicable_market", lawsConformityAssessmentLibrary.getApplicableMarket());
queryWrapper.between(lawsConformityAssessmentLibrary.getValuationTime() != null,
"valuation_time", lawsConformityAssessmentLibrary.getStartValuationTime(), lawsConformityAssessmentLibrary.getEndValuationTime());
queryWrapper.orderByDesc("cs.create_time");