From b8ba5ee7f64c1c338284b30af02108aa1cffb42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6?= <18621965254@yeah.net> Date: Fri, 18 Mar 2022 15:31:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6:=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=91=E5=AF=BC=E8=88=AA=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/ocp/model/entity/ModelProperty.java | 24 ++---- .../ocp/service/impl/ModelServiceImpl.java | 77 +++++++++++-------- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index 07d6833..0195591 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -116,23 +116,11 @@ public class ModelProperty{ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @TableField(typeHandler = TimestampTypeHandler.class) private LocalDateTime propMtime; + + /** + * 表名称 + */ + @TableField(exist = false) + private String modelTable; } -// 字段名称 字段描述 字段类型 允许为NULL 备注 -// prop_id 主键 varchar(42) 否 -// model_id 模型id varchar(42) 否 -// column_name 属性名称 varchar(50) 否 -// column_code 属性编码 varchar(42) 否 -// column_comments 属性描述 varchar(50) 否 -// data_type 数据类型 int4 否 -// data_length 数据长度 int4 是 -// data_scale 数据精度 int4 是 -// is_pk 是否主键 int4 否 0:否,1:是 -// is_required 是否必填 int4 是 0:否,1:是 -// company_id 省公司ID varchar(42) 是 -// company_name 省公司名称 varchar(50) 是 -// prop _dispidx 显示顺序 int4 否 -// prop_user_id 提交人id varchar(42) 否 -// prop_user_name 提交人姓名 varchar(64) 否 -// prop_ctime 创建时间 timestamp(6) 否 -// prop_mtime 修改时间 timestamp(6) 否 diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java index 4b0ccff..409bfa4 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -150,7 +150,7 @@ public class ModelServiceImpl extends ServiceImpl implements if (ownerCompanyCodes != null && !ownerCompanyCodes.isEmpty()) { List modelList = new ArrayList<>(); - for (String ownerCompanyCode : ownerCompanyCodes){ + for (String ownerCompanyCode : ownerCompanyCodes) { queryWrapper.lambda().eq(Model::getOwnerCompanyCode, ownerCompanyCode); List modelList1; modelList1 = modelMapper.selectList(queryWrapper); @@ -162,7 +162,7 @@ public class ModelServiceImpl extends ServiceImpl implements if (modelGroupCodes != null && !modelGroupCodes.isEmpty()) { List modelList = new ArrayList<>(); - for (String modelGroupCode : modelGroupCodes){ + for (String modelGroupCode : modelGroupCodes) { queryWrapper.lambda().eq(Model::getModelGroupCode, modelGroupCode); List modelList1; modelList1 = modelMapper.selectList(queryWrapper); @@ -202,55 +202,64 @@ public class ModelServiceImpl extends ServiceImpl implements @Override public ResponseVO getModeBaselList(String belongLevel, String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - ResponseVO result; - switch (belongLevel){ + ResponseVO result; + switch (belongLevel) { case Constant.Character.STRINGTWO: - result = this.getModelInfoList(modelCode,currentPage,pageSize,searchCondition); - break; + result = this.getModelInfoList(modelCode, currentPage, pageSize, searchCondition); + break; case Constant.Character.STRINGTHREE: - result = this.getPropertyList(modelCode,currentPage,pageSize,searchCondition); - break; - default: return ResponseVO.ok(); + result = this.getPropertyList(modelCode, currentPage, pageSize, searchCondition); + break; + default: + return ResponseVO.ok(); } - return result; + return result; } + /** - * - * @author huxiuwu - * @date 2022/3/17 - * @param modelCode 分类编码 - * @param currentPage 当前页 - * @param pageSize 每页数量 + * @param modelCode 分类编码 + * @param currentPage 当前页 + * @param pageSize 每页数量 * @param searchCondition 搜索条件 * @return pms.ocp.model.vo.ResponseVO + * @author huxiuwu + * @date 2022/3/17 **/ private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("model_group_code",modelCode).like(StringUtils.isNotEmpty(searchCondition),"ocp_model_prop",searchCondition); - List modelList = modelMapper.selectList(queryWrapper); - PageUtil pageUtil = new PageUtil<>(); - pageUtil.startPage(currentPage,pageSize,modelList); - return ResponseVO.ok(pageUtil); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("model_group_code", modelCode) + .like(StringUtils.isNotEmpty(searchCondition), "ocp_model_prop", searchCondition) + .orderByDesc("model_ctime"); + List modelList = modelMapper.selectList(queryWrapper); + PageUtil pageUtil = new PageUtil<>(); + pageUtil.startPage(currentPage, pageSize, modelList); + return ResponseVO.ok(pageUtil); } /** - * - * @author huxiuwu - * @date 2022/3/17 - * @param modelCode 分类编码 - * @param currentPage 当前页 - * @param pageSize 每页数量 + * @param modelCode 分类编码 + * @param currentPage 当前页 + * @param pageSize 每页数量 * @param searchCondition 搜索条件 * @return pms.ocp.model.vo.ResponseVO + * @author huxiuwu + * @date 2022/3/17 **/ private ResponseVO getPropertyList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("model_code",modelCode).like(StringUtils.isNotEmpty(searchCondition),"column_name",searchCondition); - List modelPropertiesList = modelPropertyMapper.selectList(queryWrapper); + QueryWrapper proWrapper = new QueryWrapper<>(); + //查询模型名称 + QueryWrapper modelWrapper = new QueryWrapper<>(); + modelWrapper.eq("model_code",modelCode); + List modelList = modelMapper.selectList(modelWrapper); + proWrapper.eq("model_code", modelCode) + .like(StringUtils.isNotEmpty(searchCondition), "column_name", searchCondition) + .orderByDesc("prop_ctime"); + List modelPropertiesList = modelPropertyMapper.selectList(proWrapper); + modelPropertiesList.forEach(pro -> + pro.setModelTable(modelList.get(0) == null ?"":modelList.get(0).getModelTable()) + ); PageUtil pageUtil = new PageUtil<>(); - pageUtil.startPage(currentPage,pageSize,modelPropertiesList); + pageUtil.startPage(currentPage, pageSize, modelPropertiesList); return ResponseVO.ok(pageUtil); } - - } -- 2.26.0