WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

认证-参数清单-复制清单修改

Browse Source
This commit is contained in:
liyawei
2022-05-20 14:25:55 +08:00
parent bc02af774c
commit 67b52dce12
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+6 -6
View File
@@ -303,13 +303,13 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
/**
* 冻结配置，引用参数-下拉选项
* 冻结配置-下拉选项
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@AutoLog(value = "参数项收集清单-配置下拉选项(冻结配置)")
@ApiOperation(value="参数项收集清单-配置下拉选项(冻结配置)", notes="参数项收集清单-配置下拉选项(冻结配置)")
@PostMapping(value = "/getConfigLableList")
// @RequiresPermissions("params:collectManifest:lock")
public Result<?> getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) {
@@ -337,13 +337,13 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
/**
* 冻结配置，引用参数-下拉选项
* 引用参数-下拉选项
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@AutoLog(value = "参数项收集清单-配置下拉选项(引用参数)")
@ApiOperation(value="参数项收集清单-配置下拉选项(引用参数)", notes="参数项收集清单-配置下拉选项(引用参数)")
@PostMapping(value = "/getConfigLableListR")
// @RequiresPermissions("params:collectManifest:refer")
public Result<?> getConfigLableListRefer(ParamsCollectManifestVO paramsCollectManifestVO) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+8 -5
View File
@@ -74,12 +74,15 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
*/
@AutoLog(value = "参数清单-参数模板列表查询")
@ApiOperation(value="参数清单-参数模板列表查询", notes="参数清单-参数模板列表查询")
@GetMapping(value = "/getParamsTemplateList")
@GetMapping(value = "/getParamsTemplatePage")
// @RequiresPermissions("params:manifest:add")
public Result<List<ParamsTemplateEO>> getParamsTemplateList(ParamsTemplateEO paramsTemplateEO,
@RequestParam(name="cut") String cut) {
List<ParamsTemplateEO> list = paramsManifestEOService.getNewestPublishList(paramsTemplateEO);
return Result.OK(cut, list);
public Result<?> getParamsTemplateList(ParamsTemplateEO paramsTemplateEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut") String cut) {
Page<ParamsTemplateEO> page = new Page<ParamsTemplateEO>(pageNo, pageSize);
IPage<ParamsTemplateEO> pageList = paramsManifestEOService.getNewestPublishPage(page, paramsTemplateEO);
return Result.OK(cut, pageList);
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+6 -1
View File
@@ -23,6 +23,8 @@
<result column="project_id" property="projectId" />
<result column="project_name" property="projectName" />
<result column="state" property="state" />
<result column="params_template_name" property="paramsTemplateName" />
<result column="params_template_id" property="paramsTemplateId" />
</resultMap>
<sql id="BaseColumnList">
@@ -70,8 +72,11 @@
pm.title as title,
pm.project_id as project_id,
pm.state as state,
pni.project_name as project_name
pni.project_name as project_name,
pm.params_template_id as params_template_id,
pt.params_template_name as params_template_name
from params_manifest pm
left join params_template pt on pm.params_template_id = pt.id
left join project_library_base as plb on plb.id = pm.project_id
left join project_name_info as pni on plb.project_name_id = pni.id
) tmp_tb
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.jero.modules.cert.collect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsManifestEO;
import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
@@ -67,7 +68,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
* 查询已发布的最新版的参数模板列表
* @return
*/
List<ParamsTemplateEO> getNewestPublishList(ParamsTemplateEO paramsTemplateEO);
IPage<ParamsTemplateEO> getNewestPublishPage(Page<ParamsTemplateEO> page, ParamsTemplateEO paramsTemplateEO);
IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+3 -2
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
@@ -216,12 +217,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
}
@Override
public List<ParamsTemplateEO> getNewestPublishList(ParamsTemplateEO paramsTemplateEO) {
public IPage<ParamsTemplateEO> getNewestPublishPage(Page<ParamsTemplateEO> page, ParamsTemplateEO paramsTemplateEO) {
LambdaQueryWrapper<ParamsTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.gt(ParamsTemplateEO::getVersion, 0) // 已发布的
.eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) // 查询条件：适用地区
.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()); // 查询条件：参数模板
return paramsTemplateEOService.list(queryWrapper);
return paramsTemplateEOService.page(page, queryWrapper);
}
@Override
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java
+2
View File
@@ -15,4 +15,6 @@ public class ParamsManifestVO {
private String projectName;
private String projectId;
private String state;
private String paramsTemplateName;
private String paramsTemplateId;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+1 -1
View File
@@ -2798,7 +2798,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
conditionSb.append(" and osf.file_name like '%.doc%'");
}else if ("pdfdoc".equals(type)) {
//查询条件
conditionSb.append(" and osf.file_name like '%.doc%'");
conditionSb.append(" and (osf.file_name like '%.doc%' or osf.file_name like '%.pdf%')");
}