Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
W
wangxiaolu-sfa-module-operation
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
sfa
wangxiaolu-sfa-module-operation
Commits
88a849af
提交
88a849af
authored
12月 08, 2025
作者:
000516
浏览文件
操作
浏览文件
下载
差异文件
陈列、档期计划【core\query】两类controller合并,方便统一使用条件查询
上级
30eeb479
b9a1640a
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
96 行增加
和
267 行删除
+96
-267
ApDisplayCoreController.java
...ration/controller/sales/core/ApDisplayCoreController.java
+22
-8
ApPromotionCoreController.java
...tion/controller/sales/core/ApPromotionCoreController.java
+0
-61
ApDisplayQueryController.java
...tion/controller/sales/query/ApDisplayQueryController.java
+14
-7
ApPromotionQueryController.java
...on/controller/sales/query/ApPromotionQueryController.java
+0
-76
IApDisplayCoreService.java
...om/sfa/operation/service/sales/IApDisplayCoreService.java
+2
-0
IApDisplayQueryService.java
...m/sfa/operation/service/sales/IApDisplayQueryService.java
+2
-0
IApPromotionCoreService.java
.../sfa/operation/service/sales/IApPromotionCoreService.java
+0
-12
IApPromotionQueryService.java
...sfa/operation/service/sales/IApPromotionQueryService.java
+0
-13
ApDisplayCoreServiceImpl.java
...peration/service/sales/impl/ApDisplayCoreServiceImpl.java
+40
-0
ApDisplayQueryServiceImpl.java
...eration/service/sales/impl/ApDisplayQueryServiceImpl.java
+16
-1
ApPromotionCoreServiceImpl.java
...ration/service/sales/impl/ApPromotionCoreServiceImpl.java
+0
-59
ApPromotionQueryServiceImpl.java
...ation/service/sales/impl/ApPromotionQueryServiceImpl.java
+0
-30
没有找到文件。
src/main/java/com/sfa/operation/controller/sales/core/ApDisplayCoreController.java
浏览文件 @
88a849af
...
...
@@ -23,16 +23,14 @@ import java.util.Optional;
* @describe : 常规陈列、档期陈列、零食陈列
*/
@RestController
@RequestMapping
(
"/sales/ap_display"
)
public
class
ApDisplayCoreController
{
@Autowired
private
IApDisplayCoreService
apDisplayCoreService
;
@Autowired
private
IQinceMarketEmployeeService
qinceMarketEmployeeService
;
/**
* 常规陈列 根据id更新
*/
@PutMapping
(
"/core/{id}"
)
@PutMapping
(
"/
sales/ap_display/
core/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putDetail
(
@PathVariable
(
"id"
)
Long
sadId
,
@RequestBody
SalesApRequest
request
){
// checkPermission();
...
...
@@ -43,7 +41,7 @@ public class ApDisplayCoreController {
/**
* 档期陈列 根据id更新
*/
@PutMapping
(
"/core_pro/{id}"
)
@PutMapping
(
"/
sales/ap_display/
core_pro/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putProDisplayDetail
(
@PathVariable
(
"id"
)
Long
sapdId
,
@RequestBody
SalesApRequest
request
){
// checkPermission();
...
...
@@ -54,7 +52,7 @@ public class ApDisplayCoreController {
/**
* 零食陈列 根据id更新
*/
@PutMapping
(
"/core_snack/{id}"
)
@PutMapping
(
"/
sales/ap_display/
core_snack/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putSnackDisplayDetail
(
@PathVariable
(
"id"
)
Long
sasdId
,
@RequestBody
SalesApRequest
request
){
// checkPermission();
...
...
@@ -65,7 +63,7 @@ public class ApDisplayCoreController {
/**
* 三米两秒
*/
@PutMapping
(
"/core_s/{id}"
)
@PutMapping
(
"/
sales/ap_display/
core_s/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putDisplaySDetail
(
@PathVariable
(
"id"
)
Long
sadsId
,
@RequestBody
SalesApRequest
request
){
// checkPermission();
...
...
@@ -76,7 +74,7 @@ public class ApDisplayCoreController {
/**
* 六小金刚
*/
@PutMapping
(
"/core_j/{id}"
)
@PutMapping
(
"/
sales/ap_display/
core_j/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putDisplayJDetail
(
@PathVariable
(
"id"
)
Long
sadjId
,
@RequestBody
SalesApRequest
request
){
// checkPermission();
...
...
@@ -84,6 +82,22 @@ public class ApDisplayCoreController {
apDisplayCoreService
.
putDisplayJDetail
(
request
);
}
/**
* 更新AP促销计划详情
* 大区总、战区经理、城市经理、TM,可以更新
*/
@PutMapping
(
"/sales/ap_promotion/core/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putPromotionDetail
(
@PathVariable
(
"id"
)
Long
sapId
,
@RequestBody
SalesApRequest
request
)
{
// checkPermission();
request
.
setSapId
(
sapId
);
apDisplayCoreService
.
putPromotionDetail
(
request
);
}
// @Autowired
// private IQinceMarketEmployeeService qinceMarketEmployeeService;
// private void checkPermission(){
// // 是区域销售部的人员,查看人客关系
// LoginUser loginUser = SecurityUtils.getLoginUser();
...
...
src/main/java/com/sfa/operation/controller/sales/core/ApPromotionCoreController.java
deleted
100644 → 0
浏览文件 @
30eeb479
package
com
.
sfa
.
operation
.
controller
.
sales
.
core
;
import
com.sfa.common.core.constant.RoleConstants
;
import
com.sfa.common.core.enums.ECode
;
import
com.sfa.common.core.exception.CheckedException
;
import
com.sfa.common.security.annotation.Logical
;
import
com.sfa.common.security.annotation.RequiresRoles
;
import
com.sfa.common.security.utils.SecurityUtils
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
import
com.sfa.operation.service.qc.IQinceMarketEmployeeService
;
import
com.sfa.operation.service.sales.IApPromotionCoreService
;
import
com.sfa.system.api.domain.SysRole
;
import
com.sfa.system.api.model.LoginUser
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.util.Optional
;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe : 档期计划
*/
@RestController
@RequestMapping
(
"/sales/ap_promotion/core"
)
public
class
ApPromotionCoreController
{
@Autowired
private
IApPromotionCoreService
apPromotionCoreService
;
@Autowired
private
IQinceMarketEmployeeService
qinceMarketEmployeeService
;
/**
* 更新AP促销计划详情
* 大区总、战区经理、城市经理、TM,可以更新
*/
@PutMapping
(
"/{id}"
)
@RequiresRoles
(
value
=
{
RoleConstants
.
OPERATION_AP_MANAGER
,
RoleConstants
.
OPERATIONZQ_AP_MANAGER
,
RoleConstants
.
OPERATIONDQ_AP_MANAGER
,
RoleConstants
.
DISTRICT_AP_MANAGER
},
logical
=
Logical
.
OR
)
public
void
putDetail
(
@PathVariable
(
"id"
)
Long
sapId
,
@RequestBody
SalesApRequest
request
)
{
// checkPermission();
request
.
setSapId
(
sapId
);
apPromotionCoreService
.
updateDetail
(
request
);
}
// private void checkPermission(){
// // 是区域销售部的人员,查看人客关系
// LoginUser loginUser = SecurityUtils.getLoginUser();
// // 只有销售(促销AP管理:cxapgl)、大区TM(大区TM促销AP管理:dqtmcxapgl)两种角色才可以修改
// List<SysRole> roles = loginUser.getSysUser().getRoles();
// Optional<SysRole> first = roles.stream().filter(role -> RoleConstants.DISTRICT_AP_MANAGER.equals(role.getRoleKey()) || RoleConstants.OPERATION_AP_MANAGER.equals(role.getRoleKey())).findFirst();
// if (!first.isPresent()) {
// throw new CheckedException(ECode.ZZ_PRODUCT_QUALITY_AP_ERROR);
// }
//
//// String empNo = loginUser.getUsername();
//// List<String> dealerCodes = qinceMarketEmployeeService.checkPermission(empNo);
//// if (dealerCodes.isEmpty()){
//// throw new CheckedException(ECode.QC_MARKET_EMP_ERROR);
//// }
// }
}
src/main/java/com/sfa/operation/controller/sales/query/ApDisplayQueryController.java
浏览文件 @
88a849af
...
...
@@ -31,9 +31,7 @@ import java.util.Optional;
* 三米两秒
* 六小金刚
*/
@RequiresPermissions
(
"promotion:display_schedule:list"
)
@RestController
@RequestMapping
(
"/sales/ap_display/query"
)
public
class
ApDisplayQueryController
{
@Autowired
private
IApDisplayQueryService
apDisplayQueryService
;
...
...
@@ -45,7 +43,7 @@ public class ApDisplayQueryController {
/**
* 常规陈列
*/
@GetMapping
(
"/page"
)
@GetMapping
(
"/
sales/ap_display/query/
page"
)
public
PageInfo
page
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apDisplayQueryService
.
page
(
salesApRequest
);
...
...
@@ -54,7 +52,7 @@ public class ApDisplayQueryController {
/**
* 档期陈列
*/
@GetMapping
(
"/pro_page"
)
@GetMapping
(
"/
sales/ap_display/query/
pro_page"
)
public
PageInfo
proPage
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apDisplayQueryService
.
proPage
(
salesApRequest
);
...
...
@@ -63,7 +61,7 @@ public class ApDisplayQueryController {
/**
* 零食陈列
*/
@GetMapping
(
"/snack_page"
)
@GetMapping
(
"/s
ales/ap_display/query/s
nack_page"
)
public
PageInfo
snackPage
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apDisplayQueryService
.
snackPage
(
salesApRequest
);
...
...
@@ -72,7 +70,7 @@ public class ApDisplayQueryController {
/**
* 三米两秒
*/
@GetMapping
(
"/sl_page"
)
@GetMapping
(
"/s
ales/ap_display/query/s
l_page"
)
public
PageInfo
slPage
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apDisplayQueryService
.
slPage
(
salesApRequest
);
...
...
@@ -81,12 +79,21 @@ public class ApDisplayQueryController {
/**
* 六小金刚
*/
@GetMapping
(
"/jg_page"
)
@GetMapping
(
"/
sales/ap_display/query/
jg_page"
)
public
PageInfo
jgPage
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apDisplayQueryService
.
jgPage
(
salesApRequest
);
}
/**
* 档期计划
*/
@GetMapping
(
"/sales/ap_promotion/query/page"
)
public
PageInfo
promotionPage
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apDisplayQueryService
.
promotionPage
(
salesApRequest
);
}
/**
* 判断登录人权限
* 判断是否存在人客关系,存在:根据负责经销商查询数据;不存在:判断是否是销售部人员。是:根据部门查询;不是:返回全部数据
...
...
src/main/java/com/sfa/operation/controller/sales/query/ApPromotionQueryController.java
deleted
100644 → 0
浏览文件 @
30eeb479
package
com
.
sfa
.
operation
.
controller
.
sales
.
query
;
import
com.sfa.common.core.constant.RoleConstants
;
import
com.sfa.common.core.enums.ECode
;
import
com.sfa.common.core.exception.CheckedException
;
import
com.sfa.common.core.web.domain.PageInfo
;
import
com.sfa.common.security.utils.SecurityUtils
;
import
com.sfa.operation.config.ConstantValue
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
import
com.sfa.operation.service.qc.IQinceMarketEmployeeService
;
import
com.sfa.operation.service.sales.IApPromotionQueryService
;
import
com.sfa.system.api.domain.SysRole
;
import
com.sfa.system.api.model.LoginUser
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Optional
;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe : 档期计划
*/
@RestController
@RequestMapping
(
"/sales/ap_promotion/query"
)
public
class
ApPromotionQueryController
{
@Autowired
private
IApPromotionQueryService
apPromotionQueryService
;
@Autowired
private
IQinceMarketEmployeeService
qinceMarketEmployeeService
;
@Autowired
private
ConstantValue
constantValue
;
@GetMapping
(
"/page"
)
public
PageInfo
page
(
SalesApRequest
salesApRequest
){
checkPermission
(
salesApRequest
);
return
apPromotionQueryService
.
page
(
salesApRequest
);
}
/**
* 判断登录人权限
* 判断是否存在人客关系,存在:根据负责经销商查询数据;不存在:判断是否是销售部人员。是:根据部门查询;不是:返回全部数据
*/
private
void
checkPermission
(
SalesApRequest
salesApRequest
)
{
LoginUser
loginUser
=
SecurityUtils
.
getLoginUser
();
String
ancestors
=
loginUser
.
getSysUser
().
getDept
().
getAncestors
();
List
<
SysRole
>
roles
=
loginUser
.
getSysUser
().
getRoles
();
// 不是区域销售部的人员,可以查看所有
if
(!
ancestors
.
contains
(
constantValue
.
deptYX
)
&&
roles
.
stream
().
filter
(
role
->
RoleConstants
.
OPERATION_CENTER_AP_MANAGER
.
equals
(
role
.
getRoleKey
())).
findFirst
().
isPresent
())
{
return
;
}
// 是区域销售部的人员:1、销售查看人客关系;2、大区TM查看当前部门下所有数据
// 判断是否是大区TM
String
empNo
=
loginUser
.
getUsername
();
Optional
<
SysRole
>
first
=
roles
.
stream
().
filter
(
role
->
RoleConstants
.
DISTRICT_AP_MANAGER
.
equals
(
role
.
getRoleKey
())).
findFirst
();
if
(
first
.
isPresent
())
{
String
deptName
=
loginUser
.
getSysUser
().
getDept
().
getDeptName
();
salesApRequest
.
setDeptNames
(
"000889"
.
equals
(
empNo
)
?
Arrays
.
asList
(
deptName
,
"北京特区"
)
:
Arrays
.
asList
(
deptName
));
return
;
}
// 不是大区TM,判断是否是销售人员(人客关系)
List
<
String
>
dealerCodes
=
qinceMarketEmployeeService
.
checkPermission
(
empNo
);
if
(
dealerCodes
.
isEmpty
())
{
throw
new
CheckedException
(
ECode
.
QC_MARKET_EMP_ERROR
);
}
// salesApRequest.setNickName(loginUser.getNickName());
salesApRequest
.
setDealerCodes
(
dealerCodes
);
}
}
src/main/java/com/sfa/operation/service/sales/IApDisplayCoreService.java
浏览文件 @
88a849af
...
...
@@ -17,4 +17,6 @@ public interface IApDisplayCoreService {
void
putDisplaySDetail
(
SalesApRequest
request
);
void
putDisplayJDetail
(
SalesApRequest
request
);
void
putPromotionDetail
(
SalesApRequest
request
);
}
src/main/java/com/sfa/operation/service/sales/IApDisplayQueryService.java
浏览文件 @
88a849af
...
...
@@ -21,6 +21,8 @@ public interface IApDisplayQueryService {
PageInfo
jgPage
(
SalesApRequest
salesApRequest
);
PageInfo
promotionPage
(
SalesApRequest
salesApRequest
);
Object
queryStoreAPReport
(
SalesApRequest
request
);
Object
queryDeptAPReport
(
SalesApRequest
request
);
...
...
src/main/java/com/sfa/operation/service/sales/IApPromotionCoreService.java
deleted
100644 → 0
浏览文件 @
30eeb479
package
com
.
sfa
.
operation
.
service
.
sales
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe :
*/
public
interface
IApPromotionCoreService
{
void
updateDetail
(
SalesApRequest
request
);
}
src/main/java/com/sfa/operation/service/sales/IApPromotionQueryService.java
deleted
100644 → 0
浏览文件 @
30eeb479
package
com
.
sfa
.
operation
.
service
.
sales
;
import
com.sfa.common.core.web.domain.PageInfo
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe :
*/
public
interface
IApPromotionQueryService
{
PageInfo
page
(
SalesApRequest
salesApRequest
);
}
src/main/java/com/sfa/operation/service/sales/impl/ApDisplayCoreServiceImpl.java
浏览文件 @
88a849af
package
com
.
sfa
.
operation
.
service
.
sales
.
impl
;
import
cn.hutool.core.date.DatePattern
;
import
com.sfa.common.security.utils.SecurityUtils
;
import
com.sfa.operation.domain.sales.dao.*
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
...
...
@@ -9,6 +10,10 @@ import org.springframework.beans.BeanUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.text.ParseException
;
import
java.util.Date
;
import
java.util.Objects
;
/**
* @author : liqiulin
* @date : 2025-09-16 16
...
...
@@ -26,6 +31,8 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
private
ISalesApDisplaySDao
salesApDisplaySDao
;
@Autowired
private
ISalesApDisplayJDao
salesApDisplayJDao
;
@Autowired
private
ISalesApPromotionDao
salesApPromotionDao
;
@Override
public
void
updateDetail
(
SalesApRequest
request
)
{
SalesApDisplayDto
salesApDisplayDto
=
new
SalesApDisplayDto
();
...
...
@@ -70,4 +77,37 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
djDto
.
setUpdateBy
(
SecurityUtils
.
getNickName
());
salesApDisplayJDao
.
updateDetail
(
djDto
);
}
@Override
public
void
putPromotionDetail
(
SalesApRequest
request
)
{
// 修改DB 日期值为null
try
{
SalesApPromotionDto
dto
=
new
SalesApPromotionDto
();
SalesApRequest
.
Promotion
promotion
=
request
.
getPromotion
();
BeanUtils
.
copyProperties
(
promotion
,
dto
);
dto
.
setSapId
(
request
.
getSapId
());
Date
parse
=
DatePattern
.
NORM_DATE_FORMAT
.
parse
(
"2000-01-01"
);
if
(
Objects
.
isNull
(
promotion
.
getActualPromotionStartDate
()))
{
dto
.
setIsActualPromotionStartDate
(
true
);
}
else
if
(
promotion
.
getActualPromotionStartDate
().
compareTo
(
parse
)
==
0
)
{
dto
.
setIsActualPromotionStartDate
(
false
);
}
else
{
dto
.
setIsActualPromotionStartDate
(
true
);
}
if
(
Objects
.
isNull
(
promotion
.
getActualPromotionEndDate
()))
{
// DB 日期值无需修改
dto
.
setIsActualPromotionEndDate
(
true
);
}
else
if
(
promotion
.
getActualPromotionEndDate
().
compareTo
(
parse
)
==
0
)
{
// DB 日期值无需修改
dto
.
setIsActualPromotionEndDate
(
false
);
}
else
{
dto
.
setIsActualPromotionEndDate
(
true
);
}
dto
.
setUpdateBy
(
SecurityUtils
.
getNickName
());
salesApPromotionDao
.
updateById
(
dto
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
}
}
src/main/java/com/sfa/operation/service/sales/impl/ApDisplayQueryServiceImpl.java
浏览文件 @
88a849af
...
...
@@ -2,6 +2,7 @@ package com.sfa.operation.service.sales.impl;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateUtil
;
import
com.sfa.common.core.utils.StringUtils
;
import
com.sfa.common.core.utils.bean.BeanUtils
;
import
com.sfa.common.core.web.domain.PageInfo
;
import
com.sfa.operation.domain.feishu.dao.IQinceMarketEmployeeDao
;
...
...
@@ -11,8 +12,10 @@ import com.sfa.operation.pojo.sales.request.SalesApRequest;
import
com.sfa.operation.service.sales.IApDisplayQueryService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
java.awt.dnd.Autoscroll
;
import
java.util.Arrays
;
import
java.util.List
;
/**
...
...
@@ -32,7 +35,8 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
private
ISalesApDisplaySDao
salesApDisplaySDao
;
@Autowired
private
ISalesApDisplayJDao
salesApDisplayJDao
;
@Autowired
private
ISalesApPromotionDao
salesApPromotionDao
;
@Override
public
PageInfo
page
(
SalesApRequest
salesApRequest
)
{
...
...
@@ -59,6 +63,11 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
return
salesApDisplayJDao
.
page
(
build
(
salesApRequest
));
}
@Override
public
PageInfo
promotionPage
(
SalesApRequest
salesApRequest
)
{
return
salesApPromotionDao
.
page
(
build
(
salesApRequest
));
}
@Override
public
Object
queryStoreAPReport
(
SalesApRequest
salesApRequest
)
{
return
salesApDisplayDao
.
queryStoreAPReport
(
build
(
salesApRequest
));
...
...
@@ -73,6 +82,12 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
SalesApWq
salesApWq
=
new
SalesApWq
();
BeanUtils
.
copyProperties
(
salesApRequest
,
salesApWq
);
salesApWq
.
setSalesMonth
(
salesApRequest
.
getSalesMonth
()
!=
null
?
DateUtil
.
parse
(
salesApRequest
.
getSalesMonth
()
+
"-01"
,
DatePattern
.
NORM_DATE_PATTERN
)
:
null
);
// departmentName 部门名称
if
(
StringUtils
.
isNotBlank
(
salesApRequest
.
getDeptName
())){
List
<
String
>
deptNames
=
CollectionUtils
.
isEmpty
(
salesApWq
.
getDeptNames
())
?
Arrays
.
asList
()
:
salesApWq
.
getDeptNames
();
deptNames
.
add
(
salesApRequest
.
getDeptName
());
salesApWq
.
setDeptNames
(
deptNames
);
}
return
salesApWq
;
}
}
src/main/java/com/sfa/operation/service/sales/impl/ApPromotionCoreServiceImpl.java
deleted
100644 → 0
浏览文件 @
30eeb479
package
com
.
sfa
.
operation
.
service
.
sales
.
impl
;
import
cn.hutool.core.date.DatePattern
;
import
com.sfa.common.security.utils.SecurityUtils
;
import
com.sfa.operation.domain.sales.dao.ISalesApPromotionDao
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
import
com.sfa.operation.pojo.sales.response.SalesApPromotionDto
;
import
com.sfa.operation.service.sales.IApPromotionCoreService
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.text.ParseException
;
import
java.util.Date
;
import
java.util.Objects
;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe :
*/
@Service
public
class
ApPromotionCoreServiceImpl
implements
IApPromotionCoreService
{
@Autowired
private
ISalesApPromotionDao
salesApPromotionDao
;
@Override
public
void
updateDetail
(
SalesApRequest
request
)
{
// 修改DB 日期值为null
try
{
SalesApPromotionDto
dto
=
new
SalesApPromotionDto
();
SalesApRequest
.
Promotion
promotion
=
request
.
getPromotion
();
BeanUtils
.
copyProperties
(
promotion
,
dto
);
dto
.
setSapId
(
request
.
getSapId
());
Date
parse
=
DatePattern
.
NORM_DATE_FORMAT
.
parse
(
"2000-01-01"
);
if
(
Objects
.
isNull
(
promotion
.
getActualPromotionStartDate
()))
{
dto
.
setIsActualPromotionStartDate
(
true
);
}
else
if
(
promotion
.
getActualPromotionStartDate
().
compareTo
(
parse
)
==
0
)
{
dto
.
setIsActualPromotionStartDate
(
false
);
}
else
{
dto
.
setIsActualPromotionStartDate
(
true
);
}
if
(
Objects
.
isNull
(
promotion
.
getActualPromotionEndDate
()))
{
// DB 日期值无需修改
dto
.
setIsActualPromotionEndDate
(
true
);
}
else
if
(
promotion
.
getActualPromotionEndDate
().
compareTo
(
parse
)
==
0
)
{
// DB 日期值无需修改
dto
.
setIsActualPromotionEndDate
(
false
);
}
else
{
dto
.
setIsActualPromotionEndDate
(
true
);
}
dto
.
setUpdateBy
(
SecurityUtils
.
getNickName
());
salesApPromotionDao
.
updateById
(
dto
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
}
}
src/main/java/com/sfa/operation/service/sales/impl/ApPromotionQueryServiceImpl.java
deleted
100644 → 0
浏览文件 @
30eeb479
package
com
.
sfa
.
operation
.
service
.
sales
.
impl
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateUtil
;
import
com.sfa.common.core.utils.bean.BeanUtils
;
import
com.sfa.common.core.web.domain.PageInfo
;
import
com.sfa.operation.domain.sales.dao.ISalesApPromotionDao
;
import
com.sfa.operation.domain.sales.wq.SalesApWq
;
import
com.sfa.operation.pojo.sales.request.SalesApRequest
;
import
com.sfa.operation.service.sales.IApPromotionQueryService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe :
*/
@Service
public
class
ApPromotionQueryServiceImpl
implements
IApPromotionQueryService
{
@Autowired
private
ISalesApPromotionDao
salesApPromotionDao
;
@Override
public
PageInfo
page
(
SalesApRequest
salesApRequest
)
{
SalesApWq
salesApWq
=
new
SalesApWq
();
BeanUtils
.
copyProperties
(
salesApRequest
,
salesApWq
);
salesApWq
.
setSalesMonth
(
salesApRequest
.
getSalesMonth
()
!=
null
?
DateUtil
.
parse
(
salesApRequest
.
getSalesMonth
()
+
"-01"
,
DatePattern
.
NORM_DATE_PATTERN
)
:
null
);
return
salesApPromotionDao
.
page
(
salesApWq
);
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论