Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
promotion-service
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
promotion
promotion-service
Commits
bfbf8f58
提交
bfbf8f58
authored
4月 03, 2025
作者:
000516
提交者:
Coding
4月 03, 2025
浏览文件
操作
浏览文件
下载
差异文件
1、创建稽查任务;2、按ID判断修改/新增;3、按id/分页查询;4、引入db表
Merge Request: ActivityExamine表添加任务执行状态 Created By: @李秋林 Accepted By: @李秋林 URL:
https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/250
上级
08acbebc
36894d6b
隐藏空白字符变更
内嵌
并排
正在显示
16 个修改的文件
包含
978 行增加
和
0 行删除
+978
-0
ExaPlanCoreController.java
...on/controller/activity/examine/ExaPlanCoreController.java
+55
-0
ExaPlanQueryController.java
...n/controller/activity/examine/ExaPlanQueryController.java
+36
-0
PromPlanQueryController.java
...on/controller/activityplanv2/PromPlanQueryController.java
+7
-0
ActivityExamineDao.java
...aolu/promotion/domain/examine/dao/ActivityExamineDao.java
+22
-0
ActivityExamineDaoImpl.java
...otion/domain/examine/dao/impl/ActivityExamineDaoImpl.java
+94
-0
ActivityExamineMapper.java
...romotion/domain/examine/mapper/ActivityExamineMapper.java
+23
-0
ActivityExamineDO.java
...otion/domain/examine/mapper/entity/ActivityExamineDO.java
+193
-0
ExamineWrapper.java
...lu/promotion/domain/examine/wrapperQo/ExamineWrapper.java
+36
-0
ActivityExamineDto.java
...omotion/pojo/activity/examine/dto/ActivityExamineDto.java
+186
-0
ExaPlanVo.java
...gxiaolu/promotion/pojo/activity/examine/vo/ExaPlanVo.java
+163
-0
ActivityResponse.java
...otion/pojo/activity/planv2/response/ActivityResponse.java
+3
-0
ExaPlanCoreService.java
...romotion/service/activity/examine/ExaPlanCoreService.java
+14
-0
ExaPlanQueryService.java
...omotion/service/activity/examine/ExaPlanQueryService.java
+17
-0
ExaPlanCoreServiceImpl.java
...service/activity/examine/impl/ExaPlanCoreServiceImpl.java
+30
-0
ExaPlanQueryServiceImpl.java
...ervice/activity/examine/impl/ExaPlanQueryServiceImpl.java
+39
-0
ActivityExamineMapper.xml
src/main/resources/mapper/examine/ActivityExamineMapper.xml
+60
-0
没有找到文件。
src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanCoreController.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
controller
.
activity
.
examine
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.pojo.activity.examine.vo.ExaPlanVo
;
import
com.wangxiaolu.promotion.result.basedata.R
;
import
com.wangxiaolu.promotion.service.activity.examine.ExaPlanCoreService
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.Objects
;
/**
* @author : liqiulin
* @date : 2025-04-02 13
* @describe :
*/
@RestController
@RequestMapping
(
"/exa/core"
)
public
class
ExaPlanCoreController
{
@Autowired
private
ExaPlanCoreService
exaPlanCoreService
;
@PostMapping
(
"/save"
)
public
R
saveOne
(
@RequestBody
ExaPlanVo
exaPlanVo
)
{
ActivityExamineDto
examineDto
=
new
ActivityExamineDto
();
BeanUtils
.
copyProperties
(
exaPlanVo
,
examineDto
);
if
(
Objects
.
isNull
(
exaPlanVo
.
getId
()))
{
examineDto
.
setCreateBy
(
exaPlanVo
.
getOperName
());
saveOne
(
examineDto
);
}
else
{
examineDto
.
setModifyBy
(
exaPlanVo
.
getOperName
());
updateById
(
examineDto
);
}
return
R
.
success
();
}
private
void
saveOne
(
ActivityExamineDto
examineDto
)
{
exaPlanCoreService
.
save
(
examineDto
);
}
private
void
updateById
(
ActivityExamineDto
examineDto
)
{
exaPlanCoreService
.
updateById
(
examineDto
);
}
}
src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanQueryController.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
controller
.
activity
.
examine
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.result.basedata.R
;
import
com.wangxiaolu.promotion.service.activity.examine.ExaPlanQueryService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.websocket.server.PathParam
;
/**
* @author : liqiulin
* @date : 2025-04-02 13
* @describe :
*/
@RestController
@RequestMapping
(
"/exa/query"
)
public
class
ExaPlanQueryController
{
@Autowired
private
ExaPlanQueryService
exaPlanQueryService
;
@GetMapping
(
"/{id}"
)
public
R
selectById
(
@PathVariable
@PathParam
(
"id"
)
Long
id
)
{
ActivityExamineDto
examineDto
=
exaPlanQueryService
.
selectById
(
id
);
return
R
.
success
(
examineDto
);
}
@PostMapping
(
"/page"
)
public
R
page
(
@RequestBody
PageInfo
pageInfo
){
exaPlanQueryService
.
page
(
pageInfo
);
return
R
.
success
(
pageInfo
);
}
}
src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanQueryController.java
浏览文件 @
bfbf8f58
...
...
@@ -4,10 +4,12 @@ import cn.hutool.core.collection.CollectionUtil;
import
com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryActivityWrapper
;
import
com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.pojo.activity.planv2.response.ActivityResponse
;
import
com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto
;
import
com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto
;
import
com.wangxiaolu.promotion.result.basedata.R
;
import
com.wangxiaolu.promotion.service.activity.examine.ExaPlanQueryService
;
import
com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService
;
import
com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityQueryService
;
import
com.wangxiaolu.promotion.service.activityplanv2.PromPlanQueryService
;
...
...
@@ -34,6 +36,8 @@ public class PromPlanQueryController {
private
TemporaryActivityClockQueryService
temporaryActivityClockQueryService
;
@Autowired
private
TemporaryActivityQueryService
temporaryActivityQueryService
;
@Autowired
private
ExaPlanQueryService
exaPlanQueryService
;
@PostMapping
(
"/page"
)
public
R
queryPage
(
@RequestBody
PageInfo
pageInfo
){
...
...
@@ -47,6 +51,9 @@ public class PromPlanQueryController {
@GetMapping
(
"/{id}"
)
public
R
queryPlanById
(
@PathParam
(
"id"
)
@PathVariable
Long
id
){
ActivityResponse
activityResponse
=
promPlanQueryService
.
queryPlanById
(
id
);
ActivityExamineDto
examineDto
=
exaPlanQueryService
.
selectByPlanId
(
id
);
activityResponse
.
setExamine
(
examineDto
);
List
<
TemporaryActivityReportedDto
>
reportedDtos
=
temporaryActivityQueryService
.
findListByPlan
(
id
);
if
(
CollectionUtil
.
isEmpty
(
reportedDtos
)){
return
R
.
success
(
activityResponse
);
...
...
src/main/java/com/wangxiaolu/promotion/domain/examine/dao/ActivityExamineDao.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
domain
.
examine
.
dao
;
import
com.wangxiaolu.promotion.domain.examine.wrapperQo.ExamineWrapper
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
/**
* @author : liqiulin
* @date : 2025-04-02 14
* @describe :
*/
public
interface
ActivityExamineDao
{
ActivityExamineDto
selectById
(
Long
id
);
ActivityExamineDto
selectByPlanId
(
Long
planId
);
void
save
(
ActivityExamineDto
examineDto
);
void
updateById
(
ActivityExamineDto
examineDto
);
void
page
(
PageInfo
pageInfo
,
ExamineWrapper
wq
);
}
src/main/java/com/wangxiaolu/promotion/domain/examine/dao/impl/ActivityExamineDaoImpl.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
domain
.
examine
.
dao
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.wangxiaolu.promotion.common.util.BeanUtils
;
import
com.wangxiaolu.promotion.domain.examine.dao.ActivityExamineDao
;
import
com.wangxiaolu.promotion.domain.examine.mapper.ActivityExamineMapper
;
import
com.wangxiaolu.promotion.domain.examine.mapper.entity.ActivityExamineDO
;
import
com.wangxiaolu.promotion.domain.examine.wrapperQo.ExamineWrapper
;
import
com.wangxiaolu.promotion.exception.ParamException
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.Objects
;
/**
* @author : liqiulin
* @date : 2025-04-02 14
* @describe :
*/
@Service
public
class
ActivityExamineDaoImpl
implements
ActivityExamineDao
{
@Autowired
private
ActivityExamineMapper
activityExamineMapper
;
@Override
public
ActivityExamineDto
selectById
(
Long
id
)
{
ActivityExamineDO
activityExamineDO
=
activityExamineMapper
.
selectById
(
id
);
return
BeanUtils
.
transitionDto
(
activityExamineDO
,
ActivityExamineDto
.
class
);
}
@Override
public
ActivityExamineDto
selectByPlanId
(
Long
planId
)
{
ActivityExamineDO
examineDO
=
activityExamineMapper
.
selectByPlanId
(
planId
);
return
BeanUtils
.
transitionDto
(
examineDO
,
ActivityExamineDto
.
class
);
}
@Override
public
void
save
(
ActivityExamineDto
examineDto
)
{
try
{
ActivityExamineDO
examineDO
=
new
ActivityExamineDO
();
BeanUtils
.
copyProperties
(
examineDto
,
examineDO
);
arrayToStringByDo
(
examineDO
,
examineDto
);
activityExamineMapper
.
insert
(
examineDO
);
}
catch
(
Exception
e
)
{
String
eMsg
=
e
.
getCause
().
getMessage
();
if
(
eMsg
.
contains
(
"for key 'plan_id_unique'"
))
{
throw
new
ParamException
(
RCode
.
DATA_HAVE_ERROR
);
}
}
}
@Override
public
void
updateById
(
ActivityExamineDto
examineDto
)
{
ActivityExamineDO
examineDO
=
new
ActivityExamineDO
();
BeanUtils
.
copyProperties
(
examineDto
,
examineDO
);
arrayToStringByDo
(
examineDO
,
examineDto
);
activityExamineMapper
.
updateById
(
examineDO
);
}
@Override
public
void
page
(
PageInfo
pageInfo
,
ExamineWrapper
wq
)
{
LambdaQueryWrapper
<
ActivityExamineDO
>
qw
=
buildWq
(
wq
);
Page
<
ActivityExamineDO
>
page
=
new
Page
<>(
pageInfo
.
getPageNum
(),
pageInfo
.
getPageSize
());
Page
<
ActivityExamineDO
>
doPage
=
activityExamineMapper
.
selectPage
(
page
,
qw
);
pageInfo
.
pageCovert
(
doPage
);
pageInfo
.
setRecords
(
doPage
.
getRecords
());
}
private
LambdaQueryWrapper
<
ActivityExamineDO
>
buildWq
(
ExamineWrapper
wq
){
LambdaQueryWrapper
<
ActivityExamineDO
>
qw
=
new
LambdaQueryWrapper
<>();
if
(
Objects
.
nonNull
(
wq
.
getEmployeeId
())){
qw
.
eq
(
ActivityExamineDO:
:
getEmployeeId
,
wq
.
getEmployeeId
());
}
if
(
Objects
.
nonNull
(
wq
.
getCreateDate
())){
qw
.
eq
(
ActivityExamineDO:
:
getCreateDate
,
wq
.
getCreateDate
());
}
return
qw
;
}
private
void
arrayToStringByDo
(
ActivityExamineDO
examineDO
,
ActivityExamineDto
examineDto
){
examineDO
.
setReportedIds
(
JSONObject
.
toJSONString
(
examineDto
.
getReportedIds
()));
examineDO
.
setClockIds
(
JSONObject
.
toJSONString
(
examineDto
.
getClockIds
()));
examineDO
.
setTemWorkPhotos
(
JSONObject
.
toJSONString
(
examineDto
.
getTemWorkPhotos
()));
examineDO
.
setPosPhotos
(
JSONObject
.
toJSONString
(
examineDto
.
getPosPhotos
()));
}
}
src/main/java/com/wangxiaolu/promotion/domain/examine/mapper/ActivityExamineMapper.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
domain
.
examine
.
mapper
;
import
com.wangxiaolu.promotion.domain.examine.mapper.entity.ActivityExamineDO
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Repository
;
/**
* @author a02200059
* @description 针对表【activity_examine(活动稽查表)】的数据库操作Mapper
* @createDate 2025-04-02 13:55:18
* @Entity com.wangxiaolu.promotion.domain.examine.mapper.entity.ActivityExamineDO
*/
@Mapper
@Repository
public
interface
ActivityExamineMapper
extends
BaseMapper
<
ActivityExamineDO
>
{
ActivityExamineDO
selectByPlanId
(
Long
planId
);
}
src/main/java/com/wangxiaolu/promotion/domain/examine/mapper/entity/ActivityExamineDO.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
domain
.
examine
.
mapper
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* 活动稽查表
* @TableName activity_examine
*/
@AllArgsConstructor
@NoArgsConstructor
@TableName
(
value
=
"activity_examine"
)
@Data
public
class
ActivityExamineDO
implements
Serializable
{
/**
* 主键id
*/
@TableId
(
type
=
IdType
.
AUTO
)
private
Long
id
;
/**
* promotion_manage_employee表id
*/
private
Integer
employeeId
;
/**
* 姓名
*/
private
String
employeeName
;
/**
* 员工工号
*/
private
String
employeeNo
;
/**
* 计划ID
*/
private
Long
planId
;
/**
* 计划状态:执行/未执行
*/
private
String
planStatus
;
/**
* 上报ID
*/
private
String
reportedIds
;
/**
* 打卡ID
*/
private
String
clockIds
;
/**
* 所属战区名称
*/
private
String
deptQcOrgName
;
/**
* 负责人姓名
*/
private
String
manageName
;
/**
* 执行城市
*/
private
String
city
;
/**
* 计划日期
*/
private
Date
planDate
;
/**
* 系统名称
*/
private
String
lineName
;
/**
* 门店名称
*/
private
String
storeName
;
/**
* 经销商名称
*/
private
String
dealerName
;
/**
* 活动模式
*/
private
String
pattern
;
/**
* 创建日期
*/
private
Date
createDate
;
/**
* 门头照
*/
private
String
storePicture
;
/**
* 促销员人数
*/
private
Integer
temNum
;
/**
* 地堆:是/否
*/
private
String
storeDd
;
/**
* 促销员是否在岗:在岗/离岗
*/
private
String
temOnWork
;
/**
* 话述:达标/未达标
*/
private
String
temHs
;
/**
* 物料:齐全/缺少
*/
private
String
temWl
;
/**
* 着装:达标/未达标
*/
private
String
temZz
;
/**
* 工作取证照片
*/
private
String
temWorkPhotos
;
/**
* 特陈照
*/
private
String
storeTcPhoto
;
/**
* 主货架照
*/
private
String
storeZhjPhoto
;
/**
* POS金额
*/
private
BigDecimal
posRmb
;
/**
* pos照片
*/
private
String
posPhotos
;
/**
*
*/
private
Date
createTime
;
/**
*
*/
private
Date
modifyTime
;
/**
* 创建人
*/
private
String
createBy
;
/**
* 修改人
*/
private
String
modifyBy
;
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
src/main/java/com/wangxiaolu/promotion/domain/examine/wrapperQo/ExamineWrapper.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
domain
.
examine
.
wrapperQo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* @author : liqiulin
* @date : 2025-04-03 13
* @describe :
*/
@NoArgsConstructor
@AllArgsConstructor
@Accessors
(
chain
=
true
)
@Data
public
class
ExamineWrapper
{
/**
* 主键id
*/
private
Long
id
;
/**
* promotion_manage_employee表id
*/
private
Integer
employeeId
;
/**
* 稽查日期
*/
private
Date
createDate
;
}
src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/dto/ActivityExamineDto.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
pojo
.
activity
.
examine
.
dto
;
import
com.alibaba.fastjson2.JSONArray
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* @author : liqiulin
* @date : 2025-04-02 14
* @describe :
*/
@NoArgsConstructor
@AllArgsConstructor
@Accessors
(
chain
=
true
)
@Data
public
class
ActivityExamineDto
{
/**
* 主键id
*/
private
Long
id
;
/**
* promotion_manage_employee表id
*/
private
Integer
employeeId
;
/**
* 姓名
*/
private
String
employeeName
;
/**
* 员工工号
*/
private
String
employeeNo
;
/**
* 计划ID
*/
private
Long
planId
;
/**
* 计划状态:执行/未执行
*/
private
String
planStatus
;
/**
* 上报ID
*/
private
String
reportedIds
;
/**
* 打卡ID
*/
private
String
clockIds
;
/**
* 所属战区名称
*/
private
String
deptQcOrgName
;
/**
* 负责人姓名
*/
private
String
manageName
;
/**
* 执行城市
*/
private
String
city
;
/**
* 计划日期
*/
private
Date
planDate
;
/**
* 系统名称
*/
private
String
lineName
;
/**
* 门店名称
*/
private
String
storeName
;
/**
* 经销商名称
*/
private
String
dealerName
;
/**
* 活动模式
*/
private
String
pattern
;
/**
* 创建日期
*/
private
Date
createDate
;
/**
* 门头照
*/
private
String
storePicture
;
/**
* 促销员人数
*/
private
Integer
temNum
;
/**
* 地堆:是/否
*/
private
String
storeDd
;
/**
* 促销员是否在岗:在岗/离岗
*/
private
String
temOnWork
;
/**
* 话述:达标/未达标
*/
private
String
temHs
;
/**
* 物料:齐全/缺少
*/
private
String
temWl
;
/**
* 着装:达标/未达标
*/
private
String
temZz
;
/**
* 工作取证照片
*/
private
String
temWorkPhotos
;
/**
* 特陈照
*/
private
String
storeTcPhoto
;
/**
* 主货架照
*/
private
String
storeZhjPhoto
;
/**
* POS金额
*/
private
BigDecimal
posRmb
;
/**
* pos照片
*/
private
String
posPhotos
;
/**
*
*/
private
Date
createTime
;
/**
*
*/
private
Date
modifyTime
;
/**
* 创建人
*/
private
String
createBy
;
/**
* 修改人
*/
private
String
modifyBy
;
}
src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/vo/ExaPlanVo.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
pojo
.
activity
.
examine
.
vo
;
import
com.alibaba.fastjson2.JSONArray
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* @author : liqiulin
* @date : 2025-04-02 15
* @describe :
*/
@NoArgsConstructor
@AllArgsConstructor
@Data
public
class
ExaPlanVo
{
/**
* 主键id
*/
private
Long
id
;
/**
* promotion_manage_employee表id
*/
private
Integer
employeeId
;
/**
* 姓名
*/
private
String
employeeName
;
/**
* 员工工号
*/
private
String
employeeNo
;
/**
* 计划ID
*/
private
Long
planId
;
/**
* 计划状态:执行/未执行
*/
private
String
planStatus
;
/**
* 上报ID
*/
private
JSONArray
reportedIds
;
/**
* 打卡ID
*/
private
JSONArray
clockIds
;
/**
* 所属战区名称
*/
private
String
deptQcOrgName
;
/**
* 负责人姓名
*/
private
String
manageName
;
/**
* 执行城市
*/
private
String
city
;
/**
* 计划日期
*/
private
Date
planDate
;
/**
* 系统名称
*/
private
String
lineName
;
/**
* 门店名称
*/
private
String
storeName
;
/**
* 经销商名称
*/
private
String
dealerName
;
/**
* 活动模式
*/
private
String
pattern
;
/**
* 门头照
*/
private
String
storePicture
;
/**
* 促销员人数
*/
private
Integer
temNum
;
/**
* 地堆:是/否
*/
private
String
storeDd
;
/**
* 促销员是否在岗:在岗/离岗
*/
private
String
temOnWork
;
/**
* 话述:达标/未达标
*/
private
String
temHs
;
/**
* 物料:齐全/缺少
*/
private
String
temWl
;
/**
* 着装:达标/未达标
*/
private
String
temZz
;
/**
* 工作取证照片
*/
private
JSONArray
temWorkPhotos
;
/**
* 特陈照
*/
private
String
storeTcPhoto
;
/**
* 主货架照
*/
private
String
storeZhjPhoto
;
/**
* POS金额
*/
private
BigDecimal
posRmb
;
/**
* pos照片
*/
private
JSONArray
posPhotos
;
/**
* 操作人
*/
private
String
operName
;
}
src/main/java/com/wangxiaolu/promotion/pojo/activity/planv2/response/ActivityResponse.java
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
pojo
.
activity
.
planv2
.
response
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto
;
import
com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto
;
import
com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto
;
...
...
@@ -25,6 +26,8 @@ public class ActivityResponse {
List
<
ActivityReported
>
reporteds
;
ActivityExamineDto
examine
;
@JsonIgnore
List
<
TemporaryActivityReportedDto
>
reportedDtos
;
...
...
src/main/java/com/wangxiaolu/promotion/service/activity/examine/ExaPlanCoreService.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
service
.
activity
.
examine
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
/**
* @author : liqiulin
* @date : 2025-04-02 15
* @describe :
*/
public
interface
ExaPlanCoreService
{
void
save
(
ActivityExamineDto
examineDto
);
void
updateById
(
ActivityExamineDto
examineDto
);
}
src/main/java/com/wangxiaolu/promotion/service/activity/examine/ExaPlanQueryService.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
service
.
activity
.
examine
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
/**
* @author : liqiulin
* @date : 2025-04-02 14
* @describe :
*/
public
interface
ExaPlanQueryService
{
ActivityExamineDto
selectById
(
Long
id
);
ActivityExamineDto
selectByPlanId
(
Long
planId
);
void
page
(
PageInfo
pageInfo
);
}
src/main/java/com/wangxiaolu/promotion/service/activity/examine/impl/ExaPlanCoreServiceImpl.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
service
.
activity
.
examine
.
impl
;
import
com.wangxiaolu.promotion.domain.examine.dao.ActivityExamineDao
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.service.activity.examine.ExaPlanCoreService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
/**
* @author : liqiulin
* @date : 2025-04-02 15
* @describe :
*/
@Service
public
class
ExaPlanCoreServiceImpl
implements
ExaPlanCoreService
{
@Autowired
private
ActivityExamineDao
activityExamineDao
;
@Override
public
void
save
(
ActivityExamineDto
examineDto
)
{
activityExamineDao
.
save
(
examineDto
);
}
@Override
public
void
updateById
(
ActivityExamineDto
examineDto
)
{
activityExamineDao
.
updateById
(
examineDto
);
}
}
src/main/java/com/wangxiaolu/promotion/service/activity/examine/impl/ExaPlanQueryServiceImpl.java
0 → 100644
浏览文件 @
bfbf8f58
package
com
.
wangxiaolu
.
promotion
.
service
.
activity
.
examine
.
impl
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wangxiaolu.promotion.domain.examine.dao.ActivityExamineDao
;
import
com.wangxiaolu.promotion.domain.examine.wrapperQo.ExamineWrapper
;
import
com.wangxiaolu.promotion.pojo.PageInfo
;
import
com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto
;
import
com.wangxiaolu.promotion.service.activity.examine.ExaPlanQueryService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
/**
* @author : liqiulin
* @date : 2025-04-02 14
* @describe :
*/
@Service
public
class
ExaPlanQueryServiceImpl
implements
ExaPlanQueryService
{
@Autowired
private
ActivityExamineDao
activityExamineDao
;
@Override
public
ActivityExamineDto
selectById
(
Long
id
)
{
return
activityExamineDao
.
selectById
(
id
);
}
@Override
public
ActivityExamineDto
selectByPlanId
(
Long
planId
)
{
return
activityExamineDao
.
selectByPlanId
(
planId
);
}
@Override
public
void
page
(
PageInfo
pageInfo
)
{
ExamineWrapper
wq
=
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
pageInfo
.
getQueryParams
()),
ExamineWrapper
.
class
);
activityExamineDao
.
page
(
pageInfo
,
wq
);
}
}
src/main/resources/mapper/examine/ActivityExamineMapper.xml
0 → 100644
浏览文件 @
bfbf8f58
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.wangxiaolu.promotion.domain.examine.mapper.ActivityExamineMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.wangxiaolu.promotion.domain.examine.mapper.entity.ActivityExamineDO"
>
<id
property=
"id"
column=
"id"
jdbcType=
"BIGINT"
/>
<result
property=
"employeeId"
column=
"employee_id"
jdbcType=
"INTEGER"
/>
<result
property=
"employeeName"
column=
"employee_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"employeeNo"
column=
"employee_no"
jdbcType=
"VARCHAR"
/>
<result
property=
"planId"
column=
"plan_id"
jdbcType=
"BIGINT"
/>
<result
property=
"planStatus"
column=
"plan_status"
jdbcType=
"VARCHAR"
/>
<result
property=
"reportedIds"
column=
"reported_ids"
jdbcType=
"VARCHAR"
/>
<result
property=
"clockIds"
column=
"clock_ids"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptQcOrgName"
column=
"dept_qc_org_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"manageName"
column=
"manage_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"city"
column=
"city"
jdbcType=
"VARCHAR"
/>
<result
property=
"planDate"
column=
"plan_date"
jdbcType=
"DATE"
/>
<result
property=
"lineName"
column=
"line_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"storeName"
column=
"store_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"dealerName"
column=
"dealer_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"pattern"
column=
"pattern"
jdbcType=
"VARCHAR"
/>
<result
property=
"createDate"
column=
"create_date"
jdbcType=
"DATE"
/>
<result
property=
"storePicture"
column=
"store_picture"
jdbcType=
"VARCHAR"
/>
<result
property=
"temNum"
column=
"tem_num"
jdbcType=
"INTEGER"
/>
<result
property=
"storeDd"
column=
"store_dd"
jdbcType=
"CHAR"
/>
<result
property=
"temOnWork"
column=
"tem_on_work"
jdbcType=
"CHAR"
/>
<result
property=
"temHs"
column=
"tem_hs"
jdbcType=
"CHAR"
/>
<result
property=
"temWl"
column=
"tem_wl"
jdbcType=
"CHAR"
/>
<result
property=
"temZz"
column=
"tem_zz"
jdbcType=
"CHAR"
/>
<result
property=
"temWorkPhotos"
column=
"tem_work_photos"
jdbcType=
"VARCHAR"
/>
<result
property=
"storeTcPhoto"
column=
"store_tc_photo"
jdbcType=
"VARCHAR"
/>
<result
property=
"storeZhjPhoto"
column=
"store_zhj_photo"
jdbcType=
"VARCHAR"
/>
<result
property=
"posRmb"
column=
"pos_rmb"
jdbcType=
"DECIMAL"
/>
<result
property=
"posPhotos"
column=
"pos_photos"
jdbcType=
"VARCHAR"
/>
<result
property=
"createTime"
column=
"create_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"modifyTime"
column=
"modify_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"createBy"
column=
"create_by"
jdbcType=
"VARCHAR"
/>
<result
property=
"modifyBy"
column=
"modify_by"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
id,employee_id,employee_name,
employee_no,plan_id,plan_status,dept_qc_org_name,
manage_name,city,plan_date,
line_name,store_name,dealer_name,
pattern,create_date,store_picture,
tem_num,store_dd,tem_on_work,
tem_hs,tem_wl,tem_zz,
tem_work_photos,store_tc_photo,store_zhj_photo,
pos_rmb,pos_photos,create_time,
modify_time,create_by,modify_by
</sql>
<select
id=
"selectByPlanId"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from activity_examine
where plan_id = #{planId}
</select>
</mapper>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论