Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
promotion-service
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
promotion
promotion-service
Commits
ba1dcb65
提交
ba1dcb65
authored
12月 23, 2024
作者:
李秋林
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
店铺计划转让
上级
17652ddc
显示空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
75 行增加
和
2 行删除
+75
-2
ActivityPlanRecordCoreController.java
...manage/activityplan/ActivityPlanRecordCoreController.java
+14
-0
EmployeeActivityPlanInfoDao.java
...motion/domain/manage/dao/EmployeeActivityPlanInfoDao.java
+3
-0
EmployeeActivityPlanRecordDao.java
...tion/domain/manage/dao/EmployeeActivityPlanRecordDao.java
+2
-0
EmployeeActivityPlanInfoDaoImpl.java
...main/manage/dao/impl/EmployeeActivityPlanInfoDaoImpl.java
+6
-0
EmployeeActivityPlanRecordDaoImpl.java
...in/manage/dao/impl/EmployeeActivityPlanRecordDaoImpl.java
+6
-0
EmployeeActivityPlanInfoMapper.java
.../domain/manage/mapper/EmployeeActivityPlanInfoMapper.java
+2
-0
EmployeeActivityPlanRecordMapper.java
...omain/manage/mapper/EmployeeActivityPlanRecordMapper.java
+3
-0
ActivityPlanVo.java
...olu/promotion/pojo/activity/manage/vo/ActivityPlanVo.java
+3
-0
ActivityPlanRecordCoreService.java
...ervice/activity/manage/ActivityPlanRecordCoreService.java
+2
-0
ActivityPlanRecordCoreServiceImpl.java
...tivity/manage/impl/ActivityPlanRecordCoreServiceImpl.java
+13
-0
application-dev.yml
src/main/resources/application-dev.yml
+1
-1
EmployeeActivityPlanInfoMapper.xml
src/main/resources/mapper/EmployeeActivityPlanInfoMapper.xml
+8
-0
EmployeeActivityPlanRecordMapper.xml
...ain/resources/mapper/EmployeeActivityPlanRecordMapper.xml
+12
-1
没有找到文件。
src/main/java/com/wangxiaolu/promotion/controller/activity/manage/activityplan/ActivityPlanRecordCoreController.java
浏览文件 @
ba1dcb65
...
@@ -17,6 +17,7 @@ import org.springframework.util.CollectionUtils;
...
@@ -17,6 +17,7 @@ import org.springframework.util.CollectionUtils;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.Objects
;
/**
/**
* @author : liqiulin
* @author : liqiulin
...
@@ -56,6 +57,19 @@ public class ActivityPlanRecordCoreController {
...
@@ -56,6 +57,19 @@ public class ActivityPlanRecordCoreController {
}
}
}
}
/**
* 活动店铺转让
*/
@PutMapping
(
"/transfer"
)
public
R
transferActivityPlan
(
@RequestBody
ActivityPlanVo
activityPlanVo
)
{
if
(
Objects
.
isNull
(
activityPlanVo
.
getOriginalEmpId
())
||
Objects
.
isNull
(
activityPlanVo
.
getTransferEmpId
())){
throw
new
ParamException
(
RCode
.
CHARGER_ID_ERROR
);
}
activityPlanRecordCoreService
.
transferActivityPlan
(
activityPlanVo
);
return
R
.
success
();
}
@DeleteMapping
(
"/delete/{id}"
)
@DeleteMapping
(
"/delete/{id}"
)
public
R
deleteActivityPlanById
(
@PathVariable
Long
id
){
public
R
deleteActivityPlanById
(
@PathVariable
Long
id
){
if
(
NumberUtils
.
isNull
(
id
)){
if
(
NumberUtils
.
isNull
(
id
)){
...
...
src/main/java/com/wangxiaolu/promotion/domain/manage/dao/EmployeeActivityPlanInfoDao.java
浏览文件 @
ba1dcb65
...
@@ -3,6 +3,7 @@ package com.wangxiaolu.promotion.domain.manage.dao;
...
@@ -3,6 +3,7 @@ package com.wangxiaolu.promotion.domain.manage.dao;
import
com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanInfoWrapper
;
import
com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanInfoWrapper
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanInfoDto
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanInfoDto
;
import
com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
...
@@ -28,4 +29,6 @@ public interface EmployeeActivityPlanInfoDao {
...
@@ -28,4 +29,6 @@ public interface EmployeeActivityPlanInfoDao {
EmployeeActivityPlanInfoDto
selectOne
(
ActivityPlanInfoWrapper
wrapper
);
EmployeeActivityPlanInfoDto
selectOne
(
ActivityPlanInfoWrapper
wrapper
);
Set
<
String
>
findStoreNameByEmployeeId
(
Integer
employeeId
);
Set
<
String
>
findStoreNameByEmployeeId
(
Integer
employeeId
);
void
transfer
(
Integer
oriId
,
ManageEmployeeInfoDto
tranUser
);
}
}
src/main/java/com/wangxiaolu/promotion/domain/manage/dao/EmployeeActivityPlanRecordDao.java
浏览文件 @
ba1dcb65
...
@@ -3,6 +3,7 @@ package com.wangxiaolu.promotion.domain.manage.dao;
...
@@ -3,6 +3,7 @@ package com.wangxiaolu.promotion.domain.manage.dao;
import
com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanRecordWrapper
;
import
com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanRecordWrapper
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanRecordDto
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanRecordDto
;
import
com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto
;
import
java.util.List
;
import
java.util.List
;
...
@@ -20,4 +21,5 @@ public interface EmployeeActivityPlanRecordDao {
...
@@ -20,4 +21,5 @@ public interface EmployeeActivityPlanRecordDao {
void
deleteById
(
Long
id
);
void
deleteById
(
Long
id
);
void
transfer
(
Integer
oriId
,
ManageEmployeeInfoDto
tranUser
);
}
}
src/main/java/com/wangxiaolu/promotion/domain/manage/dao/impl/EmployeeActivityPlanInfoDaoImpl.java
浏览文件 @
ba1dcb65
...
@@ -11,6 +11,7 @@ import com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanInfoWrapper;
...
@@ -11,6 +11,7 @@ import com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanInfoWrapper;
import
com.wangxiaolu.promotion.exception.ParamException
;
import
com.wangxiaolu.promotion.exception.ParamException
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanInfoDto
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanInfoDto
;
import
com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
...
@@ -107,6 +108,11 @@ public class EmployeeActivityPlanInfoDaoImpl implements EmployeeActivityPlanInfo
...
@@ -107,6 +108,11 @@ public class EmployeeActivityPlanInfoDaoImpl implements EmployeeActivityPlanInfo
}
}
@Override
public
void
transfer
(
Integer
oriId
,
ManageEmployeeInfoDto
tranUser
)
{
employeeActivityPlanInfoMapper
.
transfer
(
oriId
,
tranUser
.
getId
(),
tranUser
.
getEmployeeNo
(),
tranUser
.
getName
());
}
private
LambdaQueryWrapper
<
EmployeeActivityPlanInfoDO
>
buildWrapper
(
ActivityPlanInfoWrapper
wrapper
)
{
private
LambdaQueryWrapper
<
EmployeeActivityPlanInfoDO
>
buildWrapper
(
ActivityPlanInfoWrapper
wrapper
)
{
LambdaQueryWrapper
<
EmployeeActivityPlanInfoDO
>
qw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
EmployeeActivityPlanInfoDO
>
qw
=
new
LambdaQueryWrapper
<>();
if
(
Objects
.
nonNull
(
wrapper
.
getEmployeeId
()))
{
if
(
Objects
.
nonNull
(
wrapper
.
getEmployeeId
()))
{
...
...
src/main/java/com/wangxiaolu/promotion/domain/manage/dao/impl/EmployeeActivityPlanRecordDaoImpl.java
浏览文件 @
ba1dcb65
...
@@ -11,6 +11,7 @@ import com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanRecordWrappe
...
@@ -11,6 +11,7 @@ import com.wangxiaolu.promotion.domain.manage.wrapperQo.ActivityPlanRecordWrappe
import
com.wangxiaolu.promotion.exception.DataException
;
import
com.wangxiaolu.promotion.exception.DataException
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanRecordDto
;
import
com.wangxiaolu.promotion.pojo.activity.manage.dto.EmployeeActivityPlanRecordDto
;
import
com.wangxiaolu.promotion.pojo.user.dto.ManageEmployeeInfoDto
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
...
@@ -71,6 +72,11 @@ public class EmployeeActivityPlanRecordDaoImpl implements EmployeeActivityPlanRe
...
@@ -71,6 +72,11 @@ public class EmployeeActivityPlanRecordDaoImpl implements EmployeeActivityPlanRe
employeeActivityPlanRecordMapper
.
deleteByIdFake
(
id
);
employeeActivityPlanRecordMapper
.
deleteByIdFake
(
id
);
}
}
@Override
public
void
transfer
(
Integer
oriId
,
ManageEmployeeInfoDto
tranUser
)
{
employeeActivityPlanRecordMapper
.
updateByEmployeeId
(
oriId
,
tranUser
.
getId
(),
tranUser
.
getName
());
}
private
LambdaQueryWrapper
<
EmployeeActivityPlanRecordDO
>
buildWrapper
(
ActivityPlanRecordWrapper
rWrapper
){
private
LambdaQueryWrapper
<
EmployeeActivityPlanRecordDO
>
buildWrapper
(
ActivityPlanRecordWrapper
rWrapper
){
LambdaQueryWrapper
<
EmployeeActivityPlanRecordDO
>
qw
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
EmployeeActivityPlanRecordDO
>
qw
=
new
LambdaQueryWrapper
<>();
if
(
Objects
.
nonNull
(
rWrapper
.
getId
())){
if
(
Objects
.
nonNull
(
rWrapper
.
getId
())){
...
...
src/main/java/com/wangxiaolu/promotion/domain/manage/mapper/EmployeeActivityPlanInfoMapper.java
浏览文件 @
ba1dcb65
...
@@ -24,6 +24,8 @@ public interface EmployeeActivityPlanInfoMapper extends BaseMapper<EmployeeActiv
...
@@ -24,6 +24,8 @@ public interface EmployeeActivityPlanInfoMapper extends BaseMapper<EmployeeActiv
void
deletebyActivityPlanRecordId
(
Long
recordId
);
void
deletebyActivityPlanRecordId
(
Long
recordId
);
Set
<
String
>
findStoreNameByEmployeeId
(
Integer
employeeId
);
Set
<
String
>
findStoreNameByEmployeeId
(
Integer
employeeId
);
void
transfer
(
@Param
(
"oriId"
)
Integer
oriId
,
@Param
(
"id"
)
Integer
id
,
@Param
(
"employeeNo"
)
String
employeeNo
,
@Param
(
"employeeName"
)
String
name
);
}
}
...
...
src/main/java/com/wangxiaolu/promotion/domain/manage/mapper/EmployeeActivityPlanRecordMapper.java
浏览文件 @
ba1dcb65
...
@@ -3,6 +3,7 @@ package com.wangxiaolu.promotion.domain.manage.mapper;
...
@@ -3,6 +3,7 @@ package com.wangxiaolu.promotion.domain.manage.mapper;
import
com.wangxiaolu.promotion.domain.manage.mapper.entity.EmployeeActivityPlanRecordDO
;
import
com.wangxiaolu.promotion.domain.manage.mapper.entity.EmployeeActivityPlanRecordDO
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
/**
/**
...
@@ -16,6 +17,8 @@ import org.springframework.stereotype.Repository;
...
@@ -16,6 +17,8 @@ import org.springframework.stereotype.Repository;
public
interface
EmployeeActivityPlanRecordMapper
extends
BaseMapper
<
EmployeeActivityPlanRecordDO
>
{
public
interface
EmployeeActivityPlanRecordMapper
extends
BaseMapper
<
EmployeeActivityPlanRecordDO
>
{
void
deleteByIdFake
(
Long
id
);
void
deleteByIdFake
(
Long
id
);
void
updateByEmployeeId
(
@Param
(
"oriId"
)
Integer
oriId
,
@Param
(
"tranId"
)
Integer
id
,
@Param
(
"tranName"
)
String
name
);
}
}
...
...
src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/vo/ActivityPlanVo.java
浏览文件 @
ba1dcb65
...
@@ -55,4 +55,7 @@ public class ActivityPlanVo {
...
@@ -55,4 +55,7 @@ public class ActivityPlanVo {
*/
*/
// private Date monthEndDate;
// private Date monthEndDate;
private
Integer
originalEmpId
;
private
Integer
transferEmpId
;
}
}
src/main/java/com/wangxiaolu/promotion/service/activity/manage/ActivityPlanRecordCoreService.java
浏览文件 @
ba1dcb65
...
@@ -12,4 +12,6 @@ public interface ActivityPlanRecordCoreService {
...
@@ -12,4 +12,6 @@ public interface ActivityPlanRecordCoreService {
void
saveActivityPlan
(
EmployeeActivityPlanRecordDto
planDto
,
ActivityPlanVo
activityPlanVo
)
throws
Exception
;
void
saveActivityPlan
(
EmployeeActivityPlanRecordDto
planDto
,
ActivityPlanVo
activityPlanVo
)
throws
Exception
;
void
deleteById
(
Long
id
);
void
deleteById
(
Long
id
);
void
transferActivityPlan
(
ActivityPlanVo
activityPlanVo
);
}
}
src/main/java/com/wangxiaolu/promotion/service/activity/manage/impl/ActivityPlanRecordCoreServiceImpl.java
浏览文件 @
ba1dcb65
...
@@ -61,6 +61,19 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
...
@@ -61,6 +61,19 @@ public class ActivityPlanRecordCoreServiceImpl implements ActivityPlanRecordCore
employeeActivityPlanInfoDao
.
deletebyActivityPlanRecordId
(
id
);
employeeActivityPlanInfoDao
.
deletebyActivityPlanRecordId
(
id
);
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
void
transferActivityPlan
(
ActivityPlanVo
activityPlanVo
)
{
ManageEmployeeInfoDto
oriUser
=
manageEmployeeInfoDao
.
selectById
(
activityPlanVo
.
getOriginalEmpId
());
ManageEmployeeInfoDto
tranUser
=
manageEmployeeInfoDao
.
selectById
(
activityPlanVo
.
getTransferEmpId
());
if
(
Objects
.
isNull
(
oriUser
)
||
Objects
.
isNull
(
tranUser
)){
throw
new
DataException
(
RCode
.
CHARGER_ID_ERROR
);
}
employeeActivityPlanRecordDao
.
transfer
(
oriUser
.
getId
(),
tranUser
);
employeeActivityPlanInfoDao
.
transfer
(
oriUser
.
getId
(),
tranUser
);
}
private
void
saveActivityPlanInfo
(
ActivityPlanVo
activityPlanVo
,
EmployeeActivityPlanRecordDto
planDto
)
throws
Exception
{
private
void
saveActivityPlanInfo
(
ActivityPlanVo
activityPlanVo
,
EmployeeActivityPlanRecordDto
planDto
)
throws
Exception
{
// 下载
// 下载
String
filePath
=
"/home/"
+
planDto
.
getExcelFiledId
();
String
filePath
=
"/home/"
+
planDto
.
getExcelFiledId
();
...
...
src/main/resources/application-dev.yml
浏览文件 @
ba1dcb65
...
@@ -2,7 +2,7 @@ spring:
...
@@ -2,7 +2,7 @@ spring:
datasource
:
datasource
:
driver-class-name
:
com.mysql.jdbc.Driver
driver-class-name
:
com.mysql.jdbc.Driver
# url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
# url: jdbc:mysql://bj-cdb-j8ppdy86.sql.tencentcdb.com:63569/promotion_dev?autoReconnect=true
url
:
jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
url
:
jdbc:mysql://192.168.100.39:25301/promotion_dev?autoReconnect=true
username
:
root
username
:
root
password
:
Zt%68Dsuv&M
password
:
Zt%68Dsuv&M
...
...
src/main/resources/mapper/EmployeeActivityPlanInfoMapper.xml
浏览文件 @
ba1dcb65
...
@@ -58,4 +58,12 @@
...
@@ -58,4 +58,12 @@
and is_delete = 1;
and is_delete = 1;
</select>
</select>
<update
id=
"transfer"
>
update employee_activity_plan_info
set employee_id = #{id},
employee_name = #{employeeName},
employee_no = #{employeeNo}
where employee_id = #{oriId}
and is_delete = 1;
</update>
</mapper>
</mapper>
src/main/resources/mapper/EmployeeActivityPlanRecordMapper.xml
浏览文件 @
ba1dcb65
...
@@ -28,6 +28,17 @@
...
@@ -28,6 +28,17 @@
</sql>
</sql>
<update
id=
"deleteByIdFake"
>
<update
id=
"deleteByIdFake"
>
update employee_activity_plan_record set is_delete = 0,delete_time = now() where id = #{id};
update employee_activity_plan_record
set is_delete = 0,
delete_time = now()
where id = #{id};
</update>
<update
id=
"updateByEmployeeId"
>
update employee_activity_plan_record
set employee_id = #{tranId},
employee_name = #{tranName}
where employee_id = #{oriId}
and is_delete = 1;
</update>
</update>
</mapper>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论