Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
promotion-service
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
promotion
promotion-service
Commits
13979758
提交
13979758
authored
9月 20, 2024
作者:
李秋林
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
2. 管理后台:人员权限控制
上级
91ff4bcd
隐藏空白字符变更
内嵌
并排
正在显示
29 个修改的文件
包含
279 行增加
和
31 行删除
+279
-31
pom.xml
pom.xml
+1
-1
ManageEmployeeQueryController.java
...ntroller/user/employee/ManageEmployeeQueryController.java
+36
-0
WangxlEmployeeLoginController.java
...ntroller/user/employee/WangxlEmployeeLoginController.java
+1
-1
QinCeEmployeeQueryController.java
...n/controller/user/qince/QinCeEmployeeQueryController.java
+0
-3
PromotionLoginController.java
...omotion/controller/user/tem/PromotionLoginController.java
+1
-1
TemporaryInfoCoreController.java
...tion/controller/user/tem/TemporaryInfoCoreController.java
+1
-1
temporaryInfoQueryController.java
...ion/controller/user/tem/temporaryInfoQueryController.java
+1
-1
PromotionManageEmployeeDao.java
...otion/domain/activity/dao/PromotionManageEmployeeDao.java
+8
-0
PromotionManageEmployeeDaoImpl.java
...ain/activity/dao/impl/PromotionManageEmployeeDaoImpl.java
+61
-4
TemporaryActivityReportedDaoImpl.java
...n/activity/dao/impl/TemporaryActivityReportedDaoImpl.java
+3
-0
PromotionManageEmployeeMapper.java
...domain/activity/mapper/PromotionManageEmployeeMapper.java
+1
-0
PromotionManageEmployeeDO.java
...ain/activity/mapper/entity/PromotionManageEmployeeDO.java
+8
-1
ManageEmployeeWrapper.java
...tion/domain/activity/wrapperQo/ManageEmployeeWrapper.java
+25
-0
TemporaryActivityWrapper.java
...n/domain/activity/wrapperQo/TemporaryActivityWrapper.java
+2
-1
TemporaryClockWrapper.java
...tion/domain/activity/wrapperQo/TemporaryClockWrapper.java
+2
-0
QinCeEmployeeDaoImpl.java
.../promotion/domain/user/dao/impl/QinCeEmployeeDaoImpl.java
+4
-0
EmployeeWrapper.java
...aolu/promotion/domain/user/wrapperQo/EmployeeWrapper.java
+1
-0
ManageEmployeeVo.java
...u/promotion/pojo/activity/manage/vo/ManageEmployeeVo.java
+25
-0
PromotionManageEmployeeDto.java
...u/promotion/pojo/user/dto/PromotionManageEmployeeDto.java
+3
-0
QinceEmployeeQueryVo.java
...ngxiaolu/promotion/pojo/user/vo/QinceEmployeeQueryVo.java
+2
-0
TemporaryActivityCoreServiceImpl.java
...vity/temporary/impl/TemporaryActivityCoreServiceImpl.java
+0
-2
ManageEmployeeQueryService.java
...lu/promotion/service/user/ManageEmployeeQueryService.java
+18
-0
ManageEmployeeQueryServiceImpl.java
...ion/service/user/impl/ManageEmployeeQueryServiceImpl.java
+38
-0
QinCeEmployeeQueryServiceImpl.java
...tion/service/user/impl/QinCeEmployeeQueryServiceImpl.java
+3
-2
PromotionManageEmployeeMapper.xml
src/main/resources/mapper/PromotionManageEmployeeMapper.xml
+24
-9
TemporaryActivityClockMapper.xml
src/main/resources/mapper/TemporaryActivityClockMapper.xml
+6
-0
PromotionLoginControllerTest.java
...omotion/controller/user/PromotionLoginControllerTest.java
+1
-1
WeChatUserCoreControllerTest.java
...otion/controller/wechat/WeChatUserCoreControllerTest.java
+2
-2
WeChatUserQueryControllerTest.java
...tion/controller/wechat/WeChatUserQueryControllerTest.java
+1
-1
没有找到文件。
pom.xml
浏览文件 @
13979758
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
<groupId>
com.wangxiaolu
</groupId>
<groupId>
com.wangxiaolu
</groupId>
<artifactId>
wangxiaolu-promotion-service
</artifactId>
<artifactId>
wangxiaolu-promotion-service
</artifactId>
<version>
0.1.1
0
</version>
<version>
0.1.1
1
</version>
<name>
wangxiaolu-promotion-service
</name>
<name>
wangxiaolu-promotion-service
</name>
<description>
promotion-service
</description>
<description>
promotion-service
</description>
...
...
src/main/java/com/wangxiaolu/promotion/controller/user/employee/ManageEmployeeQueryController.java
0 → 100644
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
employee
;
import
com.wangxiaolu.promotion.pojo.activity.manage.vo.ManageEmployeeVo
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
com.wangxiaolu.promotion.result.basedata.R
;
import
com.wangxiaolu.promotion.service.user.ManageEmployeeQueryService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* @author : liqiulin
* @date : 2024-05-28 19
* @describe : 王小卤员工登录接口
*/
@RestController
@RequestMapping
(
"/user/employee/query"
)
public
class
ManageEmployeeQueryController
{
@Autowired
ManageEmployeeQueryService
manageEmployeeQueryService
;
@PostMapping
(
"/one"
)
public
R
findOne
(
@RequestBody
ManageEmployeeVo
manageEmployeeVo
){
PromotionManageEmployeeDto
one
=
manageEmployeeQueryService
.
findOne
(
manageEmployeeVo
);
return
R
.
success
(
one
);
}
@PostMapping
(
"/list"
)
public
R
findList
(
@RequestBody
ManageEmployeeVo
manageEmployeeVo
){
List
<
PromotionManageEmployeeDto
>
dtos
=
manageEmployeeQueryService
.
findList
(
manageEmployeeVo
);
return
R
.
success
(
dtos
);
}
}
src/main/java/com/wangxiaolu/promotion/controller/user/
login/
employee/WangxlEmployeeLoginController.java
→
src/main/java/com/wangxiaolu/promotion/controller/user/employee/WangxlEmployeeLoginController.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
login
.
employee
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
employee
;
import
com.wangxiaolu.promotion.pojo.user.vo.LoginVo
;
import
com.wangxiaolu.promotion.pojo.user.vo.LoginVo
;
import
com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam
;
import
com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam
;
...
...
src/main/java/com/wangxiaolu/promotion/controller/user/qince/QinCeEmployeeQueryController.java
浏览文件 @
13979758
...
@@ -32,9 +32,6 @@ public class QinCeEmployeeQueryController {
...
@@ -32,9 +32,6 @@ public class QinCeEmployeeQueryController {
*/
*/
@PostMapping
(
"/enroll/list"
)
@PostMapping
(
"/enroll/list"
)
public
R
getEmployeeList
(
@RequestBody
QinceEmployeeQueryVo
employeeQueryVo
){
public
R
getEmployeeList
(
@RequestBody
QinceEmployeeQueryVo
employeeQueryVo
){
if
(
StringUtils
.
isBlank
(
employeeQueryVo
.
getWaiqin365OrgId
())){
return
R
.
success
(
new
ArrayList
<>());
}
List
<
QinCeEmployeeDto
>
employees
=
qinCeEmployeeQueryService
.
getEmployeeList
(
employeeQueryVo
);
List
<
QinCeEmployeeDto
>
employees
=
qinCeEmployeeQueryService
.
getEmployeeList
(
employeeQueryVo
);
return
R
.
success
(
employees
);
return
R
.
success
(
employees
);
}
}
...
...
src/main/java/com/wangxiaolu/promotion/controller/user/
login/
tem/PromotionLoginController.java
→
src/main/java/com/wangxiaolu/promotion/controller/user/tem/PromotionLoginController.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
login
.
tem
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
tem
;
import
com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam
;
import
com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam
;
import
com.wangxiaolu.promotion.result.basedata.R
;
import
com.wangxiaolu.promotion.result.basedata.R
;
...
...
src/main/java/com/wangxiaolu/promotion/controller/user/
login/
tem/TemporaryInfoCoreController.java
→
src/main/java/com/wangxiaolu/promotion/controller/user/tem/TemporaryInfoCoreController.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
login
.
tem
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
tem
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wangxiaolu.promotion.common.redis.RedisKeys
;
import
com.wangxiaolu.promotion.common.redis.RedisKeys
;
...
...
src/main/java/com/wangxiaolu/promotion/controller/user/
login/
tem/temporaryInfoQueryController.java
→
src/main/java/com/wangxiaolu/promotion/controller/user/tem/temporaryInfoQueryController.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
login
.
tem
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
.
tem
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wangxiaolu.promotion.common.redis.RedisKeys
;
import
com.wangxiaolu.promotion.common.redis.RedisKeys
;
...
...
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/PromotionManageEmployeeDao.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
domain
.
activity
.
dao
;
package
com
.
wangxiaolu
.
promotion
.
domain
.
activity
.
dao
;
import
com.wangxiaolu.promotion.domain.activity.wrapperQo.ManageEmployeeWrapper
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
java.util.List
;
/**
/**
* @author : liqiulin
* @author : liqiulin
* @date : 2024-05-29 13
* @date : 2024-05-29 13
...
@@ -11,4 +14,9 @@ public interface PromotionManageEmployeeDao {
...
@@ -11,4 +14,9 @@ public interface PromotionManageEmployeeDao {
PromotionManageEmployeeDto
loginByEmployeeNo
(
String
employeeNo
,
String
pwd
);
PromotionManageEmployeeDto
loginByEmployeeNo
(
String
employeeNo
,
String
pwd
);
PromotionManageEmployeeDto
selectById
(
Integer
employeeId
);
PromotionManageEmployeeDto
selectById
(
Integer
employeeId
);
PromotionManageEmployeeDto
selectOne
(
ManageEmployeeWrapper
ewrap
);
List
<
PromotionManageEmployeeDto
>
selectList
(
ManageEmployeeWrapper
ewrap
);
}
}
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/PromotionManageEmployeeDaoImpl.java
浏览文件 @
13979758
...
@@ -5,13 +5,17 @@ import com.wangxiaolu.promotion.common.util.MD5Utils;
...
@@ -5,13 +5,17 @@ import com.wangxiaolu.promotion.common.util.MD5Utils;
import
com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao
;
import
com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao
;
import
com.wangxiaolu.promotion.domain.activity.mapper.PromotionManageEmployeeMapper
;
import
com.wangxiaolu.promotion.domain.activity.mapper.PromotionManageEmployeeMapper
;
import
com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO
;
import
com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO
;
import
com.wangxiaolu.promotion.domain.activity.wrapperQo.ManageEmployeeWrapper
;
import
com.wangxiaolu.promotion.exception.ParamException
;
import
com.wangxiaolu.promotion.exception.ParamException
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
com.wangxiaolu.promotion.result.basedata.RCode
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.Objects
;
/**
/**
...
@@ -27,10 +31,7 @@ public class PromotionManageEmployeeDaoImpl implements PromotionManageEmployeeDa
...
@@ -27,10 +31,7 @@ public class PromotionManageEmployeeDaoImpl implements PromotionManageEmployeeDa
@Override
@Override
public
PromotionManageEmployeeDto
loginByEmployeeNo
(
String
employeeNo
,
String
pwd
)
{
public
PromotionManageEmployeeDto
loginByEmployeeNo
(
String
employeeNo
,
String
pwd
)
{
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
lqw
=
new
LambdaQueryWrapper
();
PromotionManageEmployeeDO
promotionManageEmployeeDO
=
promotionManageEmployeeMapper
.
selectToLogin
(
employeeNo
);
lqw
.
eq
(
PromotionManageEmployeeDO:
:
getEmployeeNo
,
employeeNo
);
PromotionManageEmployeeDO
promotionManageEmployeeDO
=
promotionManageEmployeeMapper
.
selectOne
(
lqw
);
if
(
Objects
.
isNull
(
promotionManageEmployeeDO
)){
if
(
Objects
.
isNull
(
promotionManageEmployeeDO
)){
throw
new
ParamException
(
RCode
.
LOGIN_PARAM_ERROR
,
null
);
throw
new
ParamException
(
RCode
.
LOGIN_PARAM_ERROR
,
null
);
...
@@ -47,6 +48,62 @@ public class PromotionManageEmployeeDaoImpl implements PromotionManageEmployeeDa
...
@@ -47,6 +48,62 @@ public class PromotionManageEmployeeDaoImpl implements PromotionManageEmployeeDa
return
transitionDto
(
promotionManageEmployeeMapper
.
selectById
(
employeeId
));
return
transitionDto
(
promotionManageEmployeeMapper
.
selectById
(
employeeId
));
}
}
@Override
public
PromotionManageEmployeeDto
selectOne
(
ManageEmployeeWrapper
ewrap
)
{
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
qw
=
builderOneWrapper
(
ewrap
);
if
(
qw
.
isEmptyOfWhere
()){
return
null
;
}
return
transitionDto
(
promotionManageEmployeeMapper
.
selectOne
(
qw
));
}
@Override
public
List
<
PromotionManageEmployeeDto
>
selectList
(
ManageEmployeeWrapper
ewrap
)
{
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
qw
=
builderWrapper
(
ewrap
);
List
<
PromotionManageEmployeeDO
>
dos
=
promotionManageEmployeeMapper
.
selectList
(
qw
);
return
transitionDtos
(
dos
);
}
private
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
builderOneWrapper
(
ManageEmployeeWrapper
ewrap
){
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
qw
=
new
LambdaQueryWrapper
<>();
if
(
Objects
.
nonNull
(
ewrap
.
getId
())){
qw
.
eq
(
PromotionManageEmployeeDO:
:
getId
,
ewrap
.
getId
());
}
if
(
Objects
.
nonNull
(
ewrap
.
getQcId
())){
qw
.
eq
(
PromotionManageEmployeeDO:
:
getQcId
,
ewrap
.
getQcId
());
}
if
(
Objects
.
nonNull
(
ewrap
.
getEmployeeNo
())){
qw
.
eq
(
PromotionManageEmployeeDO:
:
getEmployeeNo
,
ewrap
.
getEmployeeNo
());
}
return
qw
;
}
private
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
builderWrapper
(
ManageEmployeeWrapper
ewrap
){
LambdaQueryWrapper
<
PromotionManageEmployeeDO
>
qw
=
new
LambdaQueryWrapper
<>();
if
(
ewrap
.
isHasDeptQcId
()){
qw
.
ne
(
PromotionManageEmployeeDO:
:
getDeptQcId
,
""
);
}
return
qw
;
}
/**
* DO to DTO (单个对象)
*
* @param dos DO对象List
* @return DTO对象
*/
private
List
<
PromotionManageEmployeeDto
>
transitionDtos
(
List
<
PromotionManageEmployeeDO
>
dos
)
{
if
(
CollectionUtils
.
isEmpty
(
dos
))
{
return
new
ArrayList
<>();
}
List
<
PromotionManageEmployeeDto
>
dtos
=
new
ArrayList
<>(
dos
.
size
()
*
2
);
for
(
PromotionManageEmployeeDO
edo
:
dos
)
{
dtos
.
add
(
transitionDto
(
edo
));
}
return
dtos
;
}
private
PromotionManageEmployeeDto
transitionDto
(
PromotionManageEmployeeDO
employeeDO
)
{
private
PromotionManageEmployeeDto
transitionDto
(
PromotionManageEmployeeDO
employeeDO
)
{
PromotionManageEmployeeDto
dto
=
null
;
PromotionManageEmployeeDto
dto
=
null
;
if
(
Objects
.
isNull
(
employeeDO
))
{
if
(
Objects
.
isNull
(
employeeDO
))
{
...
...
src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityReportedDaoImpl.java
浏览文件 @
13979758
...
@@ -109,6 +109,9 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
...
@@ -109,6 +109,9 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
if
(!
StringUtils
.
isEmpty
(
tw
.
getApproverId
()))
{
if
(!
StringUtils
.
isEmpty
(
tw
.
getApproverId
()))
{
queryWrapper
.
eq
(
TemporaryActivityReportedDO:
:
getApproverId
,
tw
.
getApproverId
());
queryWrapper
.
eq
(
TemporaryActivityReportedDO:
:
getApproverId
,
tw
.
getApproverId
());
}
}
if
(!
StringUtils
.
isEmpty
(
tw
.
getDeptQcId
()))
{
queryWrapper
.
eq
(
TemporaryActivityReportedDO:
:
getDeptQcId
,
tw
.
getDeptQcId
());
}
if
(!
StringUtils
.
isEmpty
(
tw
.
getNotApproveStatus
()))
{
if
(!
StringUtils
.
isEmpty
(
tw
.
getNotApproveStatus
()))
{
queryWrapper
.
ne
(
TemporaryActivityReportedDO:
:
getApproveStatus
,
tw
.
getNotApproveStatus
());
queryWrapper
.
ne
(
TemporaryActivityReportedDO:
:
getApproveStatus
,
tw
.
getNotApproveStatus
());
}
}
...
...
src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/PromotionManageEmployeeMapper.java
浏览文件 @
13979758
...
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Repository;
...
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Repository;
@Mapper
@Mapper
public
interface
PromotionManageEmployeeMapper
extends
BaseMapper
<
PromotionManageEmployeeDO
>
{
public
interface
PromotionManageEmployeeMapper
extends
BaseMapper
<
PromotionManageEmployeeDO
>
{
PromotionManageEmployeeDO
selectToLogin
(
String
employeeNo
);
}
}
...
...
src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/PromotionManageEmployeeDO.java
浏览文件 @
13979758
...
@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
...
@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.List
;
/**
/**
* 促销平台管理后台员工信息
* 促销平台管理后台员工信息
*
* @TableName promotion_manage_employee
* @TableName promotion_manage_employee
*/
*/
@TableName
(
value
=
"promotion_manage_employee"
)
@TableName
(
value
=
"promotion_manage_employee"
)
@Data
@Data
public
class
PromotionManageEmployeeDO
implements
Serializable
{
public
class
PromotionManageEmployeeDO
implements
Serializable
{
/**
/**
...
@@ -56,6 +58,10 @@ public class PromotionManageEmployeeDO implements Serializable {
...
@@ -56,6 +58,10 @@ public class PromotionManageEmployeeDO implements Serializable {
*/
*/
// private String remarks;
// private String remarks;
@TableField
(
exist
=
false
)
private
List
<
String
>
privileges
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
}
}
\ No newline at end of file
src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/ManageEmployeeWrapper.java
0 → 100644
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
domain
.
activity
.
wrapperQo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
/**
* @author : liqiulin
* @date : 2024-09-20 11
* @describe :
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Accessors
(
chain
=
true
)
public
class
ManageEmployeeWrapper
{
private
Integer
id
;
private
String
qcId
;
private
String
employeeNo
;
private
boolean
hasDeptQcId
;
}
src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryActivityWrapper.java
浏览文件 @
13979758
...
@@ -50,8 +50,9 @@ public class TemporaryActivityWrapper {
...
@@ -50,8 +50,9 @@ public class TemporaryActivityWrapper {
private
String
approveStatus
;
private
String
approveStatus
;
/**
/**
* 关联—审核人员
qc_id
* 关联—审核人员
(负责人)的战区、user
*/
*/
private
String
deptQcId
;
private
String
approverId
;
private
String
approverId
;
/**
/**
...
...
src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryClockWrapper.java
浏览文件 @
13979758
...
@@ -49,4 +49,6 @@ public class TemporaryClockWrapper {
...
@@ -49,4 +49,6 @@ public class TemporaryClockWrapper {
private
String
createDateStart
;
private
String
createDateStart
;
private
String
createDateEnd
;
private
String
createDateEnd
;
private
String
nameLike
;
private
String
nameLike
;
private
String
deptQcId
;
private
String
chargerQcId
;
}
}
src/main/java/com/wangxiaolu/promotion/domain/user/dao/impl/QinCeEmployeeDaoImpl.java
浏览文件 @
13979758
...
@@ -80,7 +80,11 @@ public class QinCeEmployeeDaoImpl implements QinCeEmployeeDao {
...
@@ -80,7 +80,11 @@ public class QinCeEmployeeDaoImpl implements QinCeEmployeeDao {
if
(
StringUtils
.
isNotBlank
(
ew
.
getWaiqin365OrgId
())){
if
(
StringUtils
.
isNotBlank
(
ew
.
getWaiqin365OrgId
())){
qw
.
eq
(
QinCeEmployeeDO:
:
getWaiqin365OrgId
,
ew
.
getWaiqin365OrgId
());
qw
.
eq
(
QinCeEmployeeDO:
:
getWaiqin365OrgId
,
ew
.
getWaiqin365OrgId
());
}
}
if
(
StringUtils
.
isNotBlank
(
ew
.
getEmpName
())){
qw
.
like
(
QinCeEmployeeDO:
:
getEmpName
,
ew
.
getEmpName
());
}
qw
.
eq
(
QinCeEmployeeDO:
:
getEmpStatus
,
1
);
qw
.
eq
(
QinCeEmployeeDO:
:
getEmpStatus
,
1
);
qw
.
last
(
"limit 50"
);
return
qw
;
return
qw
;
}
}
...
...
src/main/java/com/wangxiaolu/promotion/domain/user/wrapperQo/EmployeeWrapper.java
浏览文件 @
13979758
...
@@ -22,6 +22,7 @@ public class EmployeeWrapper {
...
@@ -22,6 +22,7 @@ public class EmployeeWrapper {
* 对应QinCeDepartmentDO.qcId
* 对应QinCeDepartmentDO.qcId
*/
*/
private
String
waiqin365OrgId
;
private
String
waiqin365OrgId
;
private
String
empName
;
/**
/**
* 员工账号状态。0:销户,1:正常,2:停用
* 员工账号状态。0:销户,1:正常,2:停用
...
...
src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/vo/ManageEmployeeVo.java
0 → 100644
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
pojo
.
activity
.
manage
.
vo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
/**
* @author : liqiulin
* @date : 2024-09-20 11
* @describe :
*/
@AllArgsConstructor
@NoArgsConstructor
@Data
@Accessors
(
chain
=
true
)
public
class
ManageEmployeeVo
{
private
Integer
id
;
private
String
qcId
;
private
String
employeeNo
;
private
boolean
hasDeptQcId
;
}
src/main/java/com/wangxiaolu/promotion/pojo/user/dto/PromotionManageEmployeeDto.java
浏览文件 @
13979758
...
@@ -5,6 +5,8 @@ import lombok.Data;
...
@@ -5,6 +5,8 @@ import lombok.Data;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
java.util.List
;
/**
/**
* @author : liqiulin
* @author : liqiulin
* @date : 2024-05-29 13
* @date : 2024-05-29 13
...
@@ -44,4 +46,5 @@ public class PromotionManageEmployeeDto {
...
@@ -44,4 +46,5 @@ public class PromotionManageEmployeeDto {
* 部门信息-勤策部门名称
* 部门信息-勤策部门名称
*/
*/
private
String
deptQcName
;
private
String
deptQcName
;
private
List
<
String
>
privileges
;
}
}
src/main/java/com/wangxiaolu/promotion/pojo/user/vo/QinceEmployeeQueryVo.java
浏览文件 @
13979758
...
@@ -14,4 +14,6 @@ public class QinceEmployeeQueryVo {
...
@@ -14,4 +14,6 @@ public class QinceEmployeeQueryVo {
* 按部门查询
* 按部门查询
*/
*/
private
String
waiqin365OrgId
;
private
String
waiqin365OrgId
;
private
String
empName
;
}
}
src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityCoreServiceImpl.java
浏览文件 @
13979758
...
@@ -127,10 +127,8 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
...
@@ -127,10 +127,8 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
}
}
// 查询促销员负责人,将人员补充到审批中
// 查询促销员负责人,将人员补充到审批中
WxTemporaryInfoDto
wxTemporaryInfoDto
=
temporaryInfoDao
.
selectOneById
(
reportedDto
.
getTemporaryId
());
TemporaryActivityReportedDto
updateDto
=
new
TemporaryActivityReportedDto
()
TemporaryActivityReportedDto
updateDto
=
new
TemporaryActivityReportedDto
()
.
setId
(
id
)
.
setId
(
id
)
.
setApproveName
(
wxTemporaryInfoDto
.
getChargerName
())
.
setApproveStatus
(
TemActApproveStatus
.
APPROVED
)
.
setApproveStatus
(
TemActApproveStatus
.
APPROVED
)
.
setApproveTime
(
new
Date
());
.
setApproveTime
(
new
Date
());
...
...
src/main/java/com/wangxiaolu/promotion/service/user/ManageEmployeeQueryService.java
0 → 100644
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
service
.
user
;
import
com.wangxiaolu.promotion.pojo.activity.manage.vo.ManageEmployeeVo
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
java.util.List
;
/**
* @author : liqiulin
* @date : 2024-09-20 11
* @describe :
*/
public
interface
ManageEmployeeQueryService
{
PromotionManageEmployeeDto
findOne
(
ManageEmployeeVo
manageEmployeeVo
);
List
<
PromotionManageEmployeeDto
>
findList
(
ManageEmployeeVo
manageEmployeeVo
);
}
src/main/java/com/wangxiaolu/promotion/service/user/impl/ManageEmployeeQueryServiceImpl.java
0 → 100644
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
service
.
user
.
impl
;
import
com.wangxiaolu.promotion.domain.activity.dao.PromotionManageEmployeeDao
;
import
com.wangxiaolu.promotion.domain.activity.wrapperQo.ManageEmployeeWrapper
;
import
com.wangxiaolu.promotion.pojo.activity.manage.vo.ManageEmployeeVo
;
import
com.wangxiaolu.promotion.pojo.user.dto.PromotionManageEmployeeDto
;
import
com.wangxiaolu.promotion.service.user.ManageEmployeeQueryService
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* @author : liqiulin
* @date : 2024-09-20 11
* @describe :
*/
@Service
public
class
ManageEmployeeQueryServiceImpl
implements
ManageEmployeeQueryService
{
@Autowired
PromotionManageEmployeeDao
promotionManageEmployeeDao
;
@Override
public
PromotionManageEmployeeDto
findOne
(
ManageEmployeeVo
manageEmployeeVo
)
{
ManageEmployeeWrapper
ewrap
=
new
ManageEmployeeWrapper
();
BeanUtils
.
copyProperties
(
manageEmployeeVo
,
ewrap
);
return
promotionManageEmployeeDao
.
selectOne
(
ewrap
);
}
@Override
public
List
<
PromotionManageEmployeeDto
>
findList
(
ManageEmployeeVo
manageEmployeeVo
)
{
ManageEmployeeWrapper
wrap
=
new
ManageEmployeeWrapper
();
BeanUtils
.
copyProperties
(
manageEmployeeVo
,
wrap
);
return
promotionManageEmployeeDao
.
selectList
(
wrap
);
}
}
src/main/java/com/wangxiaolu/promotion/service/user/impl/QinCeEmployeeQueryServiceImpl.java
浏览文件 @
13979758
...
@@ -5,6 +5,7 @@ import com.wangxiaolu.promotion.domain.user.wrapperQo.EmployeeWrapper;
...
@@ -5,6 +5,7 @@ import com.wangxiaolu.promotion.domain.user.wrapperQo.EmployeeWrapper;
import
com.wangxiaolu.promotion.pojo.activity.temporary.dto.QinCeEmployeeDto
;
import
com.wangxiaolu.promotion.pojo.activity.temporary.dto.QinCeEmployeeDto
;
import
com.wangxiaolu.promotion.pojo.user.vo.QinceEmployeeQueryVo
;
import
com.wangxiaolu.promotion.pojo.user.vo.QinceEmployeeQueryVo
;
import
com.wangxiaolu.promotion.service.user.QinCeEmployeeQueryService
;
import
com.wangxiaolu.promotion.service.user.QinCeEmployeeQueryService
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -23,8 +24,8 @@ public class QinCeEmployeeQueryServiceImpl implements QinCeEmployeeQueryService
...
@@ -23,8 +24,8 @@ public class QinCeEmployeeQueryServiceImpl implements QinCeEmployeeQueryService
@Override
@Override
public
List
<
QinCeEmployeeDto
>
getEmployeeList
(
QinceEmployeeQueryVo
employeeQueryVo
)
{
public
List
<
QinCeEmployeeDto
>
getEmployeeList
(
QinceEmployeeQueryVo
employeeQueryVo
)
{
EmployeeWrapper
ew
=
new
EmployeeWrapper
()
EmployeeWrapper
ew
=
new
EmployeeWrapper
()
;
.
setWaiqin365OrgId
(
employeeQueryVo
.
getWaiqin365OrgId
()
);
BeanUtils
.
copyProperties
(
employeeQueryVo
,
ew
);
return
qinCeEmployeeDao
.
getEmployeeList
(
ew
);
return
qinCeEmployeeDao
.
getEmployeeList
(
ew
);
}
}
}
}
src/main/resources/mapper/PromotionManageEmployeeMapper.xml
浏览文件 @
13979758
...
@@ -4,15 +4,30 @@
...
@@ -4,15 +4,30 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.wangxiaolu.promotion.domain.activity.mapper.PromotionManageEmployeeMapper"
>
<mapper
namespace=
"com.wangxiaolu.promotion.domain.activity.mapper.PromotionManageEmployeeMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO"
>
<resultMap
id=
"BaseResultMap"
<id
property=
"id"
column=
"id"
jdbcType=
"INTEGER"
/>
type=
"com.wangxiaolu.promotion.domain.activity.mapper.entity.PromotionManageEmployeeDO"
>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<id
property=
"id"
column=
"id"
jdbcType=
"INTEGER"
/>
<result
property=
"employeeNo"
column=
"employee_no"
jdbcType=
"VARCHAR"
/>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<result
property=
"passwork"
column=
"passwork"
jdbcType=
"VARCHAR"
/>
<result
property=
"employeeNo"
column=
"employee_no"
jdbcType=
"VARCHAR"
/>
<result
property=
"passwork"
column=
"passwork"
jdbcType=
"VARCHAR"
/>
<result
property=
"qcId"
column=
"qc_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptQcId"
column=
"dept_qc_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptQcName"
column=
"dept_qc_name"
jdbcType=
"VARCHAR"
/>
<collection
property=
"privileges"
ofType=
"string"
>
<result
column=
"privilege"
/>
</collection>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<!-- <sql id="Base_Column_List">-->
id,name,employee_no,
<!-- id-->
passwork
<!-- ,name,employee_no,-->
</sql>
<!-- passwork-->
<!-- </sql>-->
<select
id=
"selectToLogin"
resultMap=
"BaseResultMap"
>
select pme.*, merp.privilege
from promotion_manage_employee pme
left join manage_employee_ref_privilege merp on pme.id = merp.employee_id
where employee_no = #{employeeNo};
</select>
</mapper>
</mapper>
src/main/resources/mapper/TemporaryActivityClockMapper.xml
浏览文件 @
13979758
...
@@ -69,6 +69,12 @@
...
@@ -69,6 +69,12 @@
<if
test=
"tcw.nameLike != null"
>
<if
test=
"tcw.nameLike != null"
>
and temporary_name like concat('%',#{tcw.nameLike},'%')
and temporary_name like concat('%',#{tcw.nameLike},'%')
</if>
</if>
<if
test=
"tcw.deptQcId != null"
>
and dept_qc_id = #{tcw.deptQcId}
</if>
<if
test=
"tcw.chargerQcId != null"
>
and charger_qc_id = #{tcw.chargerQcId}
</if>
</if>
</if>
and is_delete = 1
and is_delete = 1
</where>
</where>
...
...
src/test/java/com/wangxiaolu/promotion/controller/user/PromotionLoginControllerTest.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
user
;
import
com.wangxiaolu.promotion.controller.user.
login.
tem.PromotionLoginController
;
import
com.wangxiaolu.promotion.controller.user.tem.PromotionLoginController
;
import
com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam
;
import
com.wangxiaolu.promotion.pojo.user.vo.UserLoginParam
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
...
src/test/java/com/wangxiaolu/promotion/controller/wechat/WeChatUserCoreControllerTest.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
wechat
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
wechat
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.wangxiaolu.promotion.controller.user.
login.
tem.TemporaryInfoCoreController
;
import
com.wangxiaolu.promotion.controller.user.tem.TemporaryInfoCoreController
;
import
com.wangxiaolu.promotion.controller.user.
login.
tem.temporaryInfoQueryController
;
import
com.wangxiaolu.promotion.controller.user.tem.temporaryInfoQueryController
;
import
com.wangxiaolu.promotion.pojo.user.vo.WxTemporaryEnrollVo
;
import
com.wangxiaolu.promotion.pojo.user.vo.WxTemporaryEnrollVo
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
...
src/test/java/com/wangxiaolu/promotion/controller/wechat/WeChatUserQueryControllerTest.java
浏览文件 @
13979758
package
com
.
wangxiaolu
.
promotion
.
controller
.
wechat
;
package
com
.
wangxiaolu
.
promotion
.
controller
.
wechat
;
import
com.wangxiaolu.promotion.controller.user.
login.
tem.temporaryInfoQueryController
;
import
com.wangxiaolu.promotion.controller.user.tem.temporaryInfoQueryController
;
import
com.wangxiaolu.promotion.pojo.user.vo.WxTemporaryLoginVo
;
import
com.wangxiaolu.promotion.pojo.user.vo.WxTemporaryLoginVo
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论