Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
a2255d2f
Commit
a2255d2f
authored
Jan 08, 2024
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
咨询机构管理搜索常量信息重命名
parent
0e183e91
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
AdvisoryBodyManageQueryConstants.java
.../dsk/cscec/constant/AdvisoryBodyManageQueryConstants.java
+2
-2
CustomerInfoServiceImpl.java
...a/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java
+7
-7
IDProjectServiceImpl.java
...java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
+3
-3
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/QueryConstants.java
→
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/
AdvisoryBodyManage
QueryConstants.java
View file @
a2255d2f
package
com
.
dsk
.
cscec
.
constant
;
package
com
.
dsk
.
cscec
.
constant
;
/**
/**
* 搜索常量信息
*
咨询机构管理
搜索常量信息
*
*
* @author sxk
* @author sxk
* @date 2023.12.11
* @date 2023.12.11
* @time 14:22
* @time 14:22
*/
*/
public
interface
QueryConstants
{
public
interface
AdvisoryBodyManage
QueryConstants
{
/**
/**
* 筛选数据一级公司名称
* 筛选数据一级公司名称
*/
*/
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java
View file @
a2255d2f
...
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.cscec.constant.QueryConstants
;
import
com.dsk.cscec.constant.
AdvisoryBodyManage
QueryConstants
;
import
com.dsk.cscec.domain.DCustomer
;
import
com.dsk.cscec.domain.DCustomer
;
import
com.dsk.cscec.domain.bo.AdvisoryBodyBo
;
import
com.dsk.cscec.domain.bo.AdvisoryBodyBo
;
import
com.dsk.cscec.domain.bo.CustomerCooperationBo
;
import
com.dsk.cscec.domain.bo.CustomerCooperationBo
;
...
@@ -98,7 +98,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
...
@@ -98,7 +98,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
Assert
.
isTrue
(
false
,
"参数不能为空"
);
Assert
.
isTrue
(
false
,
"参数不能为空"
);
}
}
LambdaQueryWrapper
<
DCustomer
>
lqw
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
DCustomer
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
DCustomer:
:
getRecommendOrgId
,
QueryConstants
.
LEVEL1_COMPANY_ID
);
lqw
.
eq
(
DCustomer:
:
getRecommendOrgId
,
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
);
lqw
.
eq
(
ObjectUtil
.
isNotNull
(
bo
.
getCustomerKey
()),
DCustomer:
:
getCustomerKey
,
bo
.
getCustomerKey
());
lqw
.
eq
(
ObjectUtil
.
isNotNull
(
bo
.
getCustomerKey
()),
DCustomer:
:
getCustomerKey
,
bo
.
getCustomerKey
());
lqw
.
eq
(
StringUtil
.
isNotBlank
(
bo
.
getUnifySocialCode
()),
DCustomer:
:
getUnifySocialCode
,
bo
.
getUnifySocialCode
());
lqw
.
eq
(
StringUtil
.
isNotBlank
(
bo
.
getUnifySocialCode
()),
DCustomer:
:
getUnifySocialCode
,
bo
.
getUnifySocialCode
());
lqw
.
eq
(
StringUtil
.
isNotBlank
(
bo
.
getCustomerName
()),
DCustomer:
:
getCustomerName
,
bo
.
getCustomerName
());
lqw
.
eq
(
StringUtil
.
isNotBlank
(
bo
.
getCustomerName
()),
DCustomer:
:
getCustomerName
,
bo
.
getCustomerName
());
...
@@ -132,7 +132,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
...
@@ -132,7 +132,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
@Override
@Override
public
TableDataInfo
<
AdvisoryBodyVo
>
queryAdvisoryList
(
AdvisoryBodyBo
bo
,
PageQuery
query
)
{
public
TableDataInfo
<
AdvisoryBodyVo
>
queryAdvisoryList
(
AdvisoryBodyBo
bo
,
PageQuery
query
)
{
bo
.
setContractOrgId
(
QueryConstants
.
LEVEL1_COMPANY_ID
);
bo
.
setContractOrgId
(
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
);
Page
<
AdvisoryBodyVo
>
page
=
advisoryBodyMapper
.
queryListByBo
(
query
.
build
(),
bo
);
Page
<
AdvisoryBodyVo
>
page
=
advisoryBodyMapper
.
queryListByBo
(
query
.
build
(),
bo
);
return
TableDataInfo
.
build
(
page
);
return
TableDataInfo
.
build
(
page
);
}
}
...
@@ -142,7 +142,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
...
@@ -142,7 +142,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
if
(
StringUtil
.
isBlank
(
bo
.
getCustomerId
())
&&
StringUtil
.
isBlank
(
bo
.
getCustomerName
())){
if
(
StringUtil
.
isBlank
(
bo
.
getCustomerId
())
&&
StringUtil
.
isBlank
(
bo
.
getCustomerName
())){
Assert
.
isTrue
(
false
,
"供应商不能为空"
);
Assert
.
isTrue
(
false
,
"供应商不能为空"
);
}
}
bo
.
setSignOrgId
(
QueryConstants
.
LEVEL1_COMPANY_ID
);
bo
.
setSignOrgId
(
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
);
Page
<
CustomerCooperationVo
>
page
=
dSubcontractMapper
.
selectCooperationList
(
query
.
build
(),
bo
);
Page
<
CustomerCooperationVo
>
page
=
dSubcontractMapper
.
selectCooperationList
(
query
.
build
(),
bo
);
return
TableDataInfo
.
build
(
page
);
return
TableDataInfo
.
build
(
page
);
}
}
...
@@ -153,15 +153,15 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
...
@@ -153,15 +153,15 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
return
new
HashMap
<>();
return
new
HashMap
<>();
}
}
AdvisoryBodyBo
advisoryBodyBo
=
new
AdvisoryBodyBo
();
AdvisoryBodyBo
advisoryBodyBo
=
new
AdvisoryBodyBo
();
advisoryBodyBo
.
setContractOrgId
(
QueryConstants
.
LEVEL1_COMPANY_ID
);
advisoryBodyBo
.
setContractOrgId
(
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
);
advisoryBodyBo
.
setAdvisoryBodyName
(
companyName
);
advisoryBodyBo
.
setAdvisoryBodyName
(
companyName
);
LambdaQueryWrapper
<
DCustomer
>
lqw
=
Wrappers
.
lambdaQuery
();
LambdaQueryWrapper
<
DCustomer
>
lqw
=
Wrappers
.
lambdaQuery
();
lqw
.
eq
(
DCustomer:
:
getRecommendOrgId
,
QueryConstants
.
LEVEL1_COMPANY_ID
);
lqw
.
eq
(
DCustomer:
:
getRecommendOrgId
,
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
);
lqw
.
eq
(
StringUtil
.
isNotBlank
(
companyName
),
DCustomer:
:
getCustomerName
,
companyName
);
lqw
.
eq
(
StringUtil
.
isNotBlank
(
companyName
),
DCustomer:
:
getCustomerName
,
companyName
);
CustomerCooperationBo
customerCooperationBo
=
new
CustomerCooperationBo
();
CustomerCooperationBo
customerCooperationBo
=
new
CustomerCooperationBo
();
customerCooperationBo
.
setSignOrgId
(
QueryConstants
.
LEVEL1_COMPANY_ID
);
customerCooperationBo
.
setSignOrgId
(
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
);
customerCooperationBo
.
setCustomerName
(
companyName
);
customerCooperationBo
.
setCustomerName
(
companyName
);
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
View file @
a2255d2f
...
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.domain.PageQuery
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.core.page.TableDataInfo
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.common.utils.StringUtils
;
import
com.dsk.cscec.constant.QueryConstants
;
import
com.dsk.cscec.constant.
AdvisoryBodyManage
QueryConstants
;
import
com.dsk.cscec.domain.AdvisoryBody
;
import
com.dsk.cscec.domain.AdvisoryBody
;
import
com.dsk.cscec.domain.AdvisoryBodyProject
;
import
com.dsk.cscec.domain.AdvisoryBodyProject
;
import
com.dsk.cscec.domain.DProject
;
import
com.dsk.cscec.domain.DProject
;
...
@@ -101,9 +101,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
...
@@ -101,9 +101,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
//咨询机构的项目数据取中建一局集团第二建筑有限公司和他的下级组织
//咨询机构的项目数据取中建一局集团第二建筑有限公司和他的下级组织
wrapper
wrapper
//承包单位ID
//承包单位ID
.
eq
(
"p.contract_org_id"
,
QueryConstants
.
LEVEL1_COMPANY_ID
)
.
eq
(
"p.contract_org_id"
,
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_ID
)
//承包单位主键(字段叫主键,但并不是主键)
//承包单位主键(字段叫主键,但并不是主键)
.
eq
(
"p.contract_org_name"
,
QueryConstants
.
LEVEL1_COMPANY_NAME
)
.
eq
(
"p.contract_org_name"
,
AdvisoryBodyManage
QueryConstants
.
LEVEL1_COMPANY_NAME
)
//项目名称
//项目名称
.
like
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getProjectName
()),
"p.project_name"
,
projectSearchBo
.
getProjectName
())
.
like
(
StringUtils
.
isNotBlank
(
projectSearchBo
.
getProjectName
()),
"p.project_name"
,
projectSearchBo
.
getProjectName
())
//根据咨询机构名称查出来对应的项目ID
//根据咨询机构名称查出来对应的项目ID
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment