--------
This commit is contained in:
@ -13,6 +13,7 @@ import com.greenorange.promotion.constant.SystemConstant;
|
|||||||
import com.greenorange.promotion.constant.UserConstant;
|
import com.greenorange.promotion.constant.UserConstant;
|
||||||
import com.greenorange.promotion.exception.ThrowUtils;
|
import com.greenorange.promotion.exception.ThrowUtils;
|
||||||
import com.greenorange.promotion.mapper.UserInfoMapper;
|
import com.greenorange.promotion.mapper.UserInfoMapper;
|
||||||
|
import com.greenorange.promotion.mapper.UserPerformanceSummaryMapper;
|
||||||
import com.greenorange.promotion.model.dto.advancementApply.AdvancementApplyApproveRequest;
|
import com.greenorange.promotion.model.dto.advancementApply.AdvancementApplyApproveRequest;
|
||||||
import com.greenorange.promotion.model.dto.projectCommission.ProjectCommissionAddRequest;
|
import com.greenorange.promotion.model.dto.projectCommission.ProjectCommissionAddRequest;
|
||||||
import com.greenorange.promotion.model.dto.userInfo.*;
|
import com.greenorange.promotion.model.dto.userInfo.*;
|
||||||
@ -381,7 +382,6 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
|
|||||||
// 添加用户绩效记录
|
// 添加用户绩效记录
|
||||||
UserPerformanceSummary userPerformanceSummary = UserPerformanceSummary.builder().userId(myUserInfo.getId()).build();
|
UserPerformanceSummary userPerformanceSummary = UserPerformanceSummary.builder().userId(myUserInfo.getId()).build();
|
||||||
userPerformanceSummaryService.save(userPerformanceSummary);
|
userPerformanceSummaryService.save(userPerformanceSummary);
|
||||||
|
|
||||||
// 更新上级主管用户的员工数量和经理用户的员工数量
|
// 更新上级主管用户的员工数量和经理用户的员工数量
|
||||||
updateParentUserInfoEmpCount(myUserInfo.getId(), UserRoleEnum.STAFF);
|
updateParentUserInfoEmpCount(myUserInfo.getId(), UserRoleEnum.STAFF);
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@ import com.greenorange.promotion.common.PageRequest;
|
|||||||
import com.greenorange.promotion.constant.CommonConstant;
|
import com.greenorange.promotion.constant.CommonConstant;
|
||||||
import com.greenorange.promotion.constant.SystemConstant;
|
import com.greenorange.promotion.constant.SystemConstant;
|
||||||
import com.greenorange.promotion.constant.UserConstant;
|
import com.greenorange.promotion.constant.UserConstant;
|
||||||
|
import com.greenorange.promotion.mapper.UserInfoMapper;
|
||||||
import com.greenorange.promotion.model.dto.CommonStringRequest;
|
import com.greenorange.promotion.model.dto.CommonStringRequest;
|
||||||
import com.greenorange.promotion.model.dto.userPerformanceSummary.*;
|
import com.greenorange.promotion.model.dto.userPerformanceSummary.*;
|
||||||
import com.greenorange.promotion.model.entity.*;
|
import com.greenorange.promotion.model.entity.*;
|
||||||
@ -21,6 +22,7 @@ import com.greenorange.promotion.service.common.CommonService;
|
|||||||
import com.greenorange.promotion.service.course.CoursePromotionCommissionPendingService;
|
import com.greenorange.promotion.service.course.CoursePromotionCommissionPendingService;
|
||||||
import com.greenorange.promotion.service.userInfo.EmployeePromotionRecordsService;
|
import com.greenorange.promotion.service.userInfo.EmployeePromotionRecordsService;
|
||||||
import com.greenorange.promotion.service.userInfo.UserInfoService;
|
import com.greenorange.promotion.service.userInfo.UserInfoService;
|
||||||
|
import com.greenorange.promotion.service.userInfo.UserMainInfoService;
|
||||||
import com.greenorange.promotion.service.userInfo.UserPerformanceSummaryService;
|
import com.greenorange.promotion.service.userInfo.UserPerformanceSummaryService;
|
||||||
import com.greenorange.promotion.mapper.UserPerformanceSummaryMapper;
|
import com.greenorange.promotion.mapper.UserPerformanceSummaryMapper;
|
||||||
import com.greenorange.promotion.utils.SqlUtils;
|
import com.greenorange.promotion.utils.SqlUtils;
|
||||||
@ -65,7 +67,7 @@ public class UserPerformanceSummaryServiceImpl extends ServiceImpl<UserPerforman
|
|||||||
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private UserInfoService userInfoService;
|
private UserInfoMapper userInfoMapper;
|
||||||
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
@ -279,8 +281,9 @@ public class UserPerformanceSummaryServiceImpl extends ServiceImpl<UserPerforman
|
|||||||
Integer monthRefundCount;
|
Integer monthRefundCount;
|
||||||
BigDecimal monthRefundAmount;
|
BigDecimal monthRefundAmount;
|
||||||
Integer monthPromotionCount;
|
Integer monthPromotionCount;
|
||||||
|
LambdaQueryWrapper<UserInfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE, userInfoService);
|
queryWrapper.eq(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE);
|
||||||
|
List<UserInfo> userInfoList = userInfoMapper.selectList(queryWrapper);
|
||||||
List<UserPerformanceSummary> userPerformanceSummaryList = commonService.findByFieldInTargetField(userInfoList, this, UserInfo::getId, UserPerformanceSummary::getUserId);
|
List<UserPerformanceSummary> userPerformanceSummaryList = commonService.findByFieldInTargetField(userInfoList, this, UserInfo::getId, UserPerformanceSummary::getUserId);
|
||||||
superCount = userPerformanceSummaryList.size();
|
superCount = userPerformanceSummaryList.size();
|
||||||
for (UserPerformanceSummary userPerformanceSummary : userPerformanceSummaryList) {
|
for (UserPerformanceSummary userPerformanceSummary : userPerformanceSummaryList) {
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
spring:
|
spring:
|
||||||
datasource:
|
datasource:
|
||||||
# driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
# url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
|
|
||||||
# username: qingcheng
|
|
||||||
# password: Qc@8ls2jf
|
|
||||||
# hikari:
|
|
||||||
# maximum-pool-size: 300
|
|
||||||
# max-lifetime: 120000
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
url: jdbc:mysql://43.143.28.121:3306/easybbs?serverTimezone=Asia/Shanghai
|
url: jdbc:mysql://27.30.77.229:3306/qingcheng_caozhe?serverTimezone=Asia/Shanghai
|
||||||
username: easybbs
|
username: qingcheng
|
||||||
password: root
|
password: Qc@8ls2jf
|
||||||
hikari:
|
hikari:
|
||||||
maximum-pool-size: 300
|
maximum-pool-size: 300
|
||||||
max-lifetime: 120000
|
max-lifetime: 120000
|
||||||
|
# driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
# url: jdbc:mysql://43.143.28.121:3306/easybbs?serverTimezone=Asia/Shanghai
|
||||||
|
# username: easybbs
|
||||||
|
# password: root
|
||||||
|
# hikari:
|
||||||
|
# maximum-pool-size: 300
|
||||||
|
# max-lifetime: 120000
|
||||||
|
|
||||||
|
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: dev
|
active: caozhe
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user