From 6365ab0a976afdd247742c9b3dca15deb3a7a7a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:21:40 +0800
Subject: [PATCH] 初始化1.0.1
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 73 ------------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 6b36bd8..ba89d09 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -141,49 +141,6 @@
}
return PageData.from(new PageInfo<>(result));
}
- @Override
- public PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
- }
- //鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
- pageWrap.getModel().setRootDepartId(user.getRootDepartment().getId());
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- List<SalaryStatisticsListVO> result = workorderRecordExtMapper.salaryStatistic(pageWrap.getModel());
- if(result!=null){
- List<DepartmentExtListVO> allDepartList = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.COM_DEPART_LIST_KEY+user.getCompany().getId(),ArrayList.class);
- for(SalaryStatisticsListVO model : result){
- //鏌ヨ鐢熶骇浜哄憳濮撳悕
-// model.setUserName(initProUser(user,model.getUserId(),allDepartList));
- model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
- }
- }
- return PageData.from(new PageInfo<>(result));
- }
- @Override
- public PageData<UserSalaryListVO> userSalaryPage(PageWrap<QueryUserSalaryListDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(!Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鎮ㄦ棤鏉冮檺杩涜璇ユ搷浣滐紒");
- }
- //鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
- pageWrap.getModel().setRootDepartId(user.getRootDepartment().getId());
- pageWrap.getModel().setRootDepartId(user.getRootDepartment().getId());
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
-
- //鏁版嵁鏉冮檺
- List<Integer> dataPermission = user.getDepartPermissionList();
- List<UserSalaryListVO> result = workorderRecordExtMapper.userSalaryPage(pageWrap.getModel());
- if(result!=null){
- List<DepartmentExtListVO> allDepartList = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.COM_DEPART_LIST_KEY+user.getCompany().getId(),ArrayList.class);
- for(UserSalaryListVO model : result){
- //鏌ヨ鐢熶骇浜哄憳濮撳悕
- model.setUserInfo(initProUser(user,model.getUserId(),allDepartList));
- }
- }
- return PageData.from(new PageInfo<>(result));
- }
private void initProUser(LoginUserInfo user, WorkorderRecordExtListVO data, List<DepartmentExtListVO> allDepartList) {
if(data.getCreateUser() ==null){
@@ -199,29 +156,6 @@
String dName =d==null?"":StringUtils.defaultString(d.getName(),"");
data.setProcedureName(comp.getName()+"-"+dName);
}
- }
- private UserBaseInfoVO initProUser(LoginUserInfo user, Integer userId, List<DepartmentExtListVO> allDepartList) {
- if(userId ==null){
- return null;
- }
-
- CompanyUser query=new CompanyUser();
- query.setUserId(userId);
- query.setRootDepartId(user.getRootDepartment().getId());
- query.setDeleted(Constants.ZERO);
- CompanyUser comp= companyUserExtMapper.selectOne(new QueryWrapper<>(query).last(" limit 1"));
- if(comp!=null){
- UserBaseInfoVO userinfo = new UserBaseInfoVO();
- DepartmentExtListVO d = departmentExtService.getModelById(user.getCompany().getId(),comp.getDepartmentId(),allDepartList);
- String dName =d==null?"":StringUtils.defaultString(d.getName(),"");
- userinfo.setNameAndDepart (comp.getName()+"-"+dName);
- userinfo.setDepartId(d.getId());
- userinfo.setUserId(userId);
- userinfo.setUserName(comp.getName());
- userinfo.setDepartName(d.getName());
- return userinfo;
- }
- return null;
}
@Override
public List<WorkorderRecordExtListVO> findAll(QueryWorkorderRecordExtDTO pageWrap) {
@@ -1404,13 +1338,6 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
- }else if(status ==Constants.WORKORDER_HISTORY_STATUS.produce){
- //鎶曟枡鎿嶄綔
- if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
- ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
- //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
- order.setStatus(Constants.WORKORDER_STATUS.producing);
- }
}
workorderExtMapper.updateById(order);
workorderHistoryExtMapper.insertBatch(whList);
--
Gitblit v1.9.3