Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
promotion-service
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
promotion
promotion-service
Commits
87d5bd0a
提交
87d5bd0a
authored
4月 10, 2025
作者:
李秋林
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
创建稽查任务时,计划部分参数放到后端补充
上级
76b0c682
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
34 行增加
和
38 行删除
+34
-38
ExaPlanCoreController.java
...on/controller/activity/examine/ExaPlanCoreController.java
+2
-2
ActivityExamineDaoImpl.java
...otion/domain/examine/dao/impl/ActivityExamineDaoImpl.java
+0
-4
ActivityExamineDO.java
...otion/domain/examine/mapper/entity/ActivityExamineDO.java
+0
-11
ActivityExamineDto.java
...omotion/pojo/activity/examine/dto/ActivityExamineDto.java
+0
-10
ExaPlanVo.java
...gxiaolu/promotion/pojo/activity/examine/vo/ExaPlanVo.java
+11
-11
ExaPlanCoreServiceImpl.java
...service/activity/examine/impl/ExaPlanCoreServiceImpl.java
+21
-0
没有找到文件。
src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanCoreController.java
浏览文件 @
87d5bd0a
...
...
@@ -32,10 +32,10 @@ public class ExaPlanCoreController {
BeanUtils
.
copyProperties
(
exaPlanVo
,
examineDto
);
ActivityExamineDto
examineN
=
null
;
if
(
Objects
.
isNull
(
exaPlanVo
.
getId
()))
{
examineDto
.
setCreateBy
(
exaPlanVo
.
get
Oper
Name
());
examineDto
.
setCreateBy
(
exaPlanVo
.
get
Employee
Name
());
examineN
=
saveOne
(
examineDto
);
}
else
{
examineDto
.
setModifyBy
(
exaPlanVo
.
get
Oper
Name
());
examineDto
.
setModifyBy
(
exaPlanVo
.
get
Employee
Name
());
examineN
=
updateById
(
examineDto
);
}
return
R
.
success
(
examineN
);
...
...
src/main/java/com/wangxiaolu/promotion/domain/examine/dao/impl/ActivityExamineDaoImpl.java
浏览文件 @
87d5bd0a
...
...
@@ -95,16 +95,12 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
if
(
Objects
.
isNull
(
dto
)){
return
null
;
}
dto
.
setReportedIds
(
Objects
.
isNull
(
activityExamineDO
.
getReportedIds
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getReportedIds
()));
dto
.
setClockIds
(
Objects
.
isNull
(
activityExamineDO
.
getClockIds
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getClockIds
()));
dto
.
setTemWorkPhotos
(
Objects
.
isNull
(
activityExamineDO
.
getTemWorkPhotos
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getTemWorkPhotos
()));
dto
.
setPosPhotos
(
Objects
.
isNull
(
activityExamineDO
.
getPosPhotos
())
?
null
:
JSONArray
.
parseArray
(
activityExamineDO
.
getPosPhotos
()));
return
dto
;
}
private
void
arrayToStringByDo
(
ActivityExamineDO
examineDO
,
ActivityExamineDto
examineDto
)
{
examineDO
.
setReportedIds
(
Objects
.
isNull
(
examineDto
.
getReportedIds
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getReportedIds
()));
examineDO
.
setClockIds
(
Objects
.
isNull
(
examineDto
.
getClockIds
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getClockIds
()));
examineDO
.
setTemWorkPhotos
(
Objects
.
isNull
(
examineDto
.
getTemWorkPhotos
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getTemWorkPhotos
()));
examineDO
.
setPosPhotos
(
Objects
.
isNull
(
examineDto
.
getPosPhotos
())
?
null
:
JSONObject
.
toJSONString
(
examineDto
.
getPosPhotos
()));
}
...
...
src/main/java/com/wangxiaolu/promotion/domain/examine/mapper/entity/ActivityExamineDO.java
浏览文件 @
87d5bd0a
...
...
@@ -51,17 +51,6 @@ public class ActivityExamineDO implements Serializable {
* 计划状态:执行/未执行
*/
private
String
planStatus
;
/**
* 上报ID
*/
private
String
reportedIds
;
/**
* 打卡ID
*/
private
String
clockIds
;
/**
* 所属战区名称
*/
...
...
src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/dto/ActivityExamineDto.java
浏览文件 @
87d5bd0a
...
...
@@ -49,16 +49,6 @@ public class ActivityExamineDto {
*/
private
String
planStatus
;
/**
* 上报ID
*/
private
JSONArray
reportedIds
;
/**
* 打卡ID
*/
private
JSONArray
clockIds
;
/**
* 所属战区名称
*/
...
...
src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/vo/ExaPlanVo.java
浏览文件 @
87d5bd0a
...
...
@@ -50,52 +50,52 @@ public class ExaPlanVo {
/**
* 上报ID
*/
private
JSONArray
reportedIds
;
//
private JSONArray reportedIds;
/**
* 打卡ID
*/
private
JSONArray
clockIds
;
//
private JSONArray clockIds;
/**
* 所属战区名称
*/
private
String
deptQcOrgName
;
//
private String deptQcOrgName;
/**
* 负责人姓名
*/
private
String
manageName
;
//
private String manageName;
/**
* 执行城市
*/
private
String
city
;
//
private String city;
/**
* 计划日期
*/
private
Date
planDate
;
//
private Date planDate;
/**
* 系统名称
*/
private
String
lineName
;
//
private String lineName;
/**
* 门店名称
*/
private
String
storeName
;
//
private String storeName;
/**
* 经销商名称
*/
private
String
dealerName
;
//
private String dealerName;
/**
* 活动模式
*/
private
String
pattern
;
//
private String pattern;
/**
* 门头照
...
...
@@ -159,5 +159,5 @@ public class ExaPlanVo {
/**
* 操作人
*/
private
String
operName
;
//
private String operName;
}
src/main/java/com/wangxiaolu/promotion/service/activity/examine/impl/ExaPlanCoreServiceImpl.java
浏览文件 @
87d5bd0a
package
com
.
wangxiaolu
.
promotion
.
service
.
activity
.
examine
.
impl
;
import
com.wangxiaolu.promotion.domain.activityplanv2.dao.ActivityPlanInfoDao
;
import
com.wangxiaolu.promotion.domain.examine.dao.ActivityExamineDao
;
import
com.wangxiaolu.promotion.exception.ParamException
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
com.wangxiaolu.promotion.service.activity.examine.ExaPlanCoreService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.Objects
;
/**
* @author : liqiulin
* @date : 2025-04-02 15
...
...
@@ -16,9 +22,24 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService {
@Autowired
private
ActivityExamineDao
activityExamineDao
;
@Autowired
private
ActivityPlanInfoDao
activityPlanInfoDao
;
@Override
public
ActivityExamineDto
save
(
ActivityExamineDto
examineDto
)
{
// 根据促销计划id得到详情并补充
ActivityPlanInfoDto
planInfoDto
=
activityPlanInfoDao
.
selectById
(
examineDto
.
getPlanId
());
if
(
Objects
.
isNull
(
planInfoDto
))
{
throw
new
ParamException
(
RCode
.
ACTIVITY_PLAN_IS_NULL
);
}
examineDto
.
setDeptQcOrgName
(
planInfoDto
.
getOrgName
());
examineDto
.
setManageName
(
planInfoDto
.
getEmployeeName
());
examineDto
.
setCity
(
planInfoDto
.
getCity
());
examineDto
.
setPlanDate
(
planInfoDto
.
getDate
());
examineDto
.
setLineName
(
planInfoDto
.
getLineName
());
examineDto
.
setStoreName
(
planInfoDto
.
getStoreName
());
examineDto
.
setDealerName
(
planInfoDto
.
getDealerName
());
examineDto
.
setPattern
(
planInfoDto
.
getPattern
());
return
activityExamineDao
.
save
(
examineDto
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论