From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 29a5552..2d61cee 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -58,6 +58,7 @@
}
if(StringUtils.isBlank(model.getCode())
||model.getType()==null
+ ||model.getCateId()==null
||model.getType()<0
||model.getType()>3
){
@@ -183,6 +184,7 @@
if(StringUtils.isBlank(model.getCode())
||model.getId()==null
||model.getType()==null
+ ||model.getCateId()==null
||model.getType()<0
||model.getType()>3
){
@@ -226,6 +228,8 @@
.set(Cars::getAuthStatus,Constants.ZERO)
.set(Cars::getType,model.getType())
.set(Cars::getCode,model.getCode())
+ .set(Cars::getGroupId,model.getGroupId())
+ .set(Cars::getCateId,model.getCateId())
.set(Cars::getEditDate,model.getEditDate())
.set(Cars::getEdirot,model.getEdirot())
.set(Cars::getMemberId,model.getMemberId())
@@ -248,6 +252,10 @@
public Cars findById(Integer id) {
return carsMapper.selectById(id);
}
+
+
+
+
@Override
public Cars findOne(Cars cars) {
@@ -272,9 +280,17 @@
queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
queryWrapper.selectAs(Company::getCompanyNamePath,Cars::getCompanyName);
+ queryWrapper.selectAs(Category::getParentId,Cars::getCatePId);
+ queryWrapper.selectAs(Category::getName,Cars::getCateName);
+ queryWrapper.select(" c.name as catePName");
+ queryWrapper.select(" c1.COMPANY_NAME_PATH as carCompanyNamePath");
+ queryWrapper.select(" c1.name as carCompanyName");
queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Cars::getEdirot);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.leftJoin(Category.class,Category::getId,Cars::getCateId);
+ queryWrapper.leftJoin("category c on t4.PARENT_ID = c.id");
+ queryWrapper.leftJoin("company c1 on t.GROUP_ID = c1.id");
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getCompanyNamePath,pageWrap.getModel().getCompanyName());
--
Gitblit v1.9.3