Skip to content

W
work_service
Commit 96357dfe authored by cq990612's avatar cq990612
Browse files
Options

优化代码结构

parent 76701bf5
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 245 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTypeManagerMapper.java deleted 100644 → 0
View file @ 76701bf5
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkTypeManager;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
public interface WorkTypeManagerMapper extends BaseMapper<WorkTypeManager> {
List<WorkTypeManager> getListByManagerId(Integer userId);
}
wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml
View file @ 96357dfe
......@@ -303,7 +303,7 @@
<include refid="table"/>
<where>
status IN (1,4)
AND TIMESTAMPDIFF(HOUR,modify_time,now()) > #{autoExamine}
AND TIMESTAMPDIFF(HOUR,create_time,now()) > #{autoExamine}
</where>
......
wisenergy-mapper/src/main/resources/mapper/WorkTypeManagerMapper.xml deleted 100644 → 0
View file @ 76701bf5
<?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="cn.wisenergy.mapper.WorkTypeManagerMapper">
<select id="getListByManagerId" resultType="cn.wisenergy.model.app.WorkTypeManager">
select id,dept_id,manager_id,type
from work_type_manager
where manager_id = #{userId}
</select>
</mapper>
\ No newline at end of file
wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkTypeManager.java deleted 100644 → 0
View file @ 76701bf5
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkTypeManager", description="其他类型对应管理类")
public class WorkTypeManager {
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "deptId",value = "部门id")
private Integer deptId;
@ApiModelProperty(name = "managerId",value = "manager_id")
private Integer managerId;
@ApiModelProperty(name = "type",value = "5：外部商务、技术交流 6：内部培训、技术准备、管理 7：其他非项目/商机工作")
private Integer type;
// 附加字段
@TableField(exist = false)
@ApiModelProperty(name = "name",value = "类型名")
private String name;
}
wisenergy-service/src/main/java/cn/wisenergy/service/WorkTypeManagerService.java deleted 100644 → 0
View file @ 76701bf5
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkTypeManager;
import java.util.List;
/**
* @Authotr:陈奇
* @QQ1799796883
*/
public interface WorkTypeManagerService {
/**
* 功能：根据审核人id获取
* @param userId
* @return
*/
List<WorkTypeManager> getByManagerId(Integer userId);
/**
* 功能：根据部门id获取
* @param deptId
* @return
*/
List<WorkTypeManager> getByDeptId(Integer deptId);
/**
* 功能： 根据类型获取
* @param type
* @return
*/
List<WorkTypeManager> getByType(Integer type);
/**
* 功能：查看有哪些其他Type
* @return
*/
List<WorkTypeManager> getType();
Boolean deleteByType(Integer type);
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java
View file @ 96357dfe
......@@ -70,8 +70,7 @@ public class StatisticsServiceImpl implements StatisticsService {
@Autowired
private WorkDeptMapper workDeptMapper;
@Autowired
private WorkTypeManagerMapper workTypeManagerMapper;
@Autowired
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @ 96357dfe
......@@ -80,8 +80,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
@Autowired
private WorkUserProjectService workUserProjectService;
@Autowired
private WorkTypeManagerService workTypeManagerService;
// 工单状态
private final static Integer COMPLETED = StatusEnum.COMPLETED.getCode();
......@@ -186,7 +185,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
/**
* 功能：测试添加
* 功能：添加工单
*
* @param createWorkOrderDto dto
* @return dto
......@@ -198,7 +197,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (null == createWorkOrderDto || CollectionUtils.isEmpty(createWorkOrderDto.getWorkTimeOrders())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
}
WorkUser user = workUserService.getById(createWorkOrderDto.getWorkTimeOrders().get(0).getUserId());
List<WorkTimeOrderDto> workTimeOrders = createWorkOrderDto.getWorkTimeOrders();
Date date = new Date();
WorkSubmitAdopt workSubmitAdopt = workSubmitAdoptService.getById(1);
......@@ -225,7 +224,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
dto.setManagerName(workUserService.getById(workProjectService.getById(dto.getProjectId()).getManagerId()).getName());
}
if (!typeIds.contains(type)) {
dto.setManagerName(workUserService.getById(workTypeManagerService.getByDeptId(workUserService.getById(dto.getUserId()).getDeptId()).get(0).getManagerId()).getName());
/* dto.setManagerName(workUserService.getById(workTypeManagerService.getByDeptId(workUserService.getById(dto.getUserId()).getDeptId()).get(0).getManagerId()).getName());*/
dto.setManagerName(workUserService.getById(workDeptService.getById(user.getDeptId()).getDeptManagerId()).getName());
}
}
// 设置状态
......@@ -393,6 +393,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
AppletsPendApprovalDto dto = new AppletsPendApprovalDto();
dto.setWorkDay(date);
appletsPendApprovalDtos.add(dto);
WorkUser user = workUserService.getById(workTimeOrders.get(0).getUserId());
for (WorkTimeOrder workTimeOrder : workTimeOrders) {
if (date.compareTo(workTimeOrder.getWorkDay()) != 0) {
date = workTimeOrder.getWorkDay();
......@@ -411,7 +412,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (approvalDto.getWorkDay().compareTo(workTimeOrder.getWorkDay()) == 0) {
WorkTimeOrderDto workTimeOrderDto = new WorkTimeOrderDto();
BeanUtils.copyProperties(workTimeOrder, workTimeOrderDto);
workTimeOrderDto.setManagerName(workUserService.getById(workTypeManagerService.getByDeptId(workTimeOrder.getDeptId()).get(0).getManagerId()).getName());
/* workTimeOrderDto.setManagerName(workUserService.getById(workTypeManagerService.getByDeptId(workTimeOrder.getDeptId()).get(0).getManagerId()).getName());*/
workTimeOrderDto.setManagerName(workUserService.getById(workDeptService.getById(user.getDeptId()).getDeptManagerId()).getName());
workTimeOrderDto.setUserName(workUserService.getById(workTimeOrderDto.getUserId()).getName());
if (!CollectionUtils.isEmpty(typeIds)) {
if (typeIds.contains(workTimeOrder.getType())) {
......@@ -569,10 +571,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(userRoleLevelDto.getRank()) || LevelRankEnum.CENTRAL_LEVEL.getRank().equals(userRoleLevelDto.getRank())) {
List<WorkTypeManager> workTypeManagers = workTypeManagerService.getByManagerId(userId);
if (!CollectionUtils.isEmpty(workTypeManagers)) {
Set<Integer> set = new TreeSet<>();
List<WorkType> managerTypes = new ArrayList<>();
if (!CollectionUtils.isEmpty(managerTypes)) {
Set<Integer> set = new TreeSet<>();
workTypes.forEach(type -> {
if (3 == type.getReviewer()) {
set.add(type.getId());
......@@ -655,12 +656,14 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
@Override
public List<WorkTimeOrderDto> wtoToWtod(List<WorkTimeOrder> workTimeOrders) {
List<WorkTimeOrderDto> dtos = new ArrayList<>();
WorkUser user = workUserService.getById(workTimeOrders.get(0).getUserId());
List<Integer> typeIds = workTypeService.getIdByReviewer(1);
for (WorkTimeOrder workTimeOrder : workTimeOrders) {
WorkTimeOrderDto dto = new WorkTimeOrderDto();
BeanUtils.copyProperties(workTimeOrder, dto);
dto.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
dto.setManagerName(workUserService.getById(workTypeManagerService.getByDeptId(workTimeOrder.getDeptId()).get(0).getManagerId()).getName());
/*dto.setManagerName(workUserService.getById(workTypeManagerService.getByDeptId(workTimeOrder.getDeptId()).get(0).getManagerId()).getName());*/
dto.setManagerName(workUserService.getById(workDeptService.getById(user.getDeptId()).getDeptManagerId()).getName());
if (!CollectionUtils.isEmpty(typeIds)) {
if (typeIds.contains(workTimeOrder.getType())) {
dto.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTypeManagerServiceImpl.java deleted 100644 → 0
View file @ 76701bf5
package cn.wisenergy.service.impl;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkTypeManagerMapper;
import cn.wisenergy.mapper.WorkTypeMapper;
import cn.wisenergy.model.app.WorkType;
import cn.wisenergy.model.app.WorkTypeManager;
import cn.wisenergy.service.WorkTypeManagerService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class WorkTypeManagerServiceImpl implements WorkTypeManagerService {
@Autowired
private WorkTypeManagerMapper workTypeManagerMapper;
@Autowired
private WorkTypeMapper workTypeMapper;
/**
* 功能：根据审核人id获取
*
* @param userId
* @return
*/
@Override
public List<WorkTypeManager> getByManagerId(Integer userId) {
log.info("WorkTypeManagerServiceImpl[]getByManagerId[]input.param.userId:{}" + userId);
return getWorkTypes(userId, "manager_id");
}
/**
* 功能：根据部门id获取
*
* @param deptId
* @return
*/
@Override
public List<WorkTypeManager> getByDeptId(Integer deptId) {
log.info("WorkTypeManagerServiceImpl[]getByDeptId[]input.param.deptId:{}" + deptId);
return getWorkTypes(deptId, "dept_id");
}
/**
* 功能： 根据类型获取
*
* @param type
* @return
*/
@Override
public List<WorkTypeManager> getByType(Integer type) {
log.info("WorkTypeManagerServiceImpl[]getByType[]input.param.type:{}" + type);
return getWorkTypes(type, "type");
}
/**
* 功能：查看有哪些其他Type
*
* @return
*/
@Override
public List<WorkTypeManager> getType() {
log.info("WorkTypeManagerServiceImpl[]getType");
QueryWrapper<WorkTypeManager> wrapper = new QueryWrapper<>();
wrapper.groupBy("type");
wrapper.orderByAsc("type");
List<WorkTypeManager> workTypeManagers = workTypeManagerMapper.selectList(wrapper);
return addName(workTypeManagers);
}
@Override
public Boolean deleteByType(Integer type) {
log.info("WorkTypeManagerServiceImpl[]deleteByType[]input.param.type:{}"+type);
if (null == type) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
Map<String, Object> map = new HashMap<>(2);
map.put("type", type);
int i = workTypeManagerMapper.deleteByMap(map);
return i>0;
}
private List<WorkTypeManager> getWorkTypes(Integer userId, String column) {
if (null == userId) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
QueryWrapper<WorkTypeManager> wrapper = new QueryWrapper<>();
wrapper.eq(column, userId);
List<WorkTypeManager> workTypeManagers = workTypeManagerMapper.selectList(wrapper);
return addName(workTypeManagers);
}
public List<WorkTypeManager> addName(List<WorkTypeManager> workTypeManagers) {
if (!CollectionUtils.isEmpty(workTypeManagers)) {
List<WorkType> types = workTypeMapper.getAll();
if (!CollectionUtils.isEmpty(types)) {
for (WorkType type : types) {
for (WorkTypeManager workTypeManager : workTypeManagers) {
if (type.getId().equals(workTypeManager.getType())) {
workTypeManager.setName(type.getName());
}
}
}
}
return workTypeManagers;
}
return null;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTypeServiceImpl.java
View file @ 96357dfe
......@@ -4,7 +4,6 @@ import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkTypeMapper;
import cn.wisenergy.model.app.WorkType;
import cn.wisenergy.service.WorkTypeManagerService;
import cn.wisenergy.service.WorkTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,9 +27,6 @@ public class WorkTypeServiceImpl implements WorkTypeService {
@Autowired
private WorkTypeMapper workTypeMapper;
@Autowired
private WorkTypeManagerService workTypeManagerService;
@Override
public List<WorkType> getAll(Integer isSort) {
......@@ -88,10 +84,8 @@ public class WorkTypeServiceImpl implements WorkTypeService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
int i = workTypeMapper.deleteById(id);
if (i == 0) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.FAILEDTO_DELETE_DATA);
}
return workTypeManagerService.deleteByType(id);
return i>0;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
View file @ 96357dfe
......@@ -125,6 +125,7 @@ public class WorkUserServiceImpl implements WorkUserService {
@Override
public List<OrganizationStructureDto> getOrganizationStructure() {
log.info("WorkUserServiceImpl[]getOrganizationStructure[]");
PageHelper.clearPage();
List<OrganizationStructureDto> allDeptByAllCentreId = workDeptService.getAllDeptByAllCentreId();
QueryWrapper<WorkUser> wrapper = new QueryWrapper<>();
wrapper.eq("status", 1);
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java
View file @ 96357dfe
......@@ -167,7 +167,6 @@ public class WorkTimeOrderController extends BaseController {
@PostMapping(value = "/managerOrderPageInfo")
public Result<PageInfo> managerOrderPageInfo(@RequestBody ManagerOrderVo managerOrderVo) {
log.info("WorkTimeOrderController[]managerOrderPageInfo[]input.param.ManagerOrderVo" + managerOrderVo);
return getResult(null);
}
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkUserController.java
View file @ 96357dfe
......@@ -79,6 +79,7 @@ public class WorkUserController extends BaseController {
@ApiOperation(value = "组织架构", notes = "组织架构", httpMethod = "GET")
@GetMapping(value = "/getOrganizationStructureDto")
public Result<List<OrganizationStructureDto>> getOrganizationStructureDto(){
log.info("WorkUserController[]getOrganizationStructureDto[]");
List<OrganizationStructureDto> organizationStructure = workUserService.getOrganizationStructure();
return getResult(organizationStructure);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment