Skip to content

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

第一次提交

parent 24848fff
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 125 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java
View file @ dba495bc
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkTimeOrder;
import cn.wisenergy.model.dto.DayWorkTimeAndType;
import cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
/**
......@@ -32,7 +35,7 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
* @param userId
* @return
*/
MonthlyWorkingHoursStatistics collectByProjectType(Integer userId,Integer projectType, String currentMonthFirstDay);
MonthlyWorkingHoursStatistics collectByProjectType(Integer userId, Integer projectType, String currentMonthFirstDay);
/**
*
......
wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml
View file @ dba495bc
......@@ -22,20 +22,12 @@
<result column="modify_time" property="modifyTime" />
</resultMap>
<resultMap id="dayWorkTimeAndType" type="cn.wisenergy.model.dto.DayWorkTimeAndType">
<result property="day" column="day(work_day)"/>
<result property="type" column="type"/>
<result property="workTime" column="sum(work_time)"/>
</resultMap>
<resultMap id="monthlyWorkHourStatistics" type="cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics">
<result property="projectType" column="type"/>
<result property="count" column="count(1)"/>
<result property="workTime" column="sum(work_time)"/>
</resultMap>
<sql id="table">
work_time_order
<!-- 通用查询结果列 -->
<sql id="vals">
#{userId},#{userName},#{projectId},#{projectName},#{deptId},#{workTime},#{workDay},#{status},#{reviewerId},#{des},#{reason},#{type},#{isOvertime},now(),now()
</sql>
<sql id="cols_exclude_id">
user_id, user_name, project_id, project_name, dept_id, work_time, work_day, status, reviewer_id, des, reason, type, is_overtime, create_time, modify_time
</sql>
<sql id="criteria">
......@@ -57,6 +49,84 @@
<if test="modifyTime != null">and #{modifyTime} &gt;= modify_time</if>
</sql>
<resultMap id="dayWorkTimeAndType" type="cn.wisenergy.model.dto.DayWorkTimeAndType">
<result property="day" column="day(work_day)"/>
<result property="type" column="type"/>
<result property="workTime" column="sum(work_time)"/>
</resultMap>
<resultMap id="monthlyWorkHourStatistics" type="cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics">
<result property="projectType" column="type"/>
<result property="count" column="count(1)"/>
<result property="workTime" column="sum(work_time)"/>
</resultMap>
<sql id="table">
work_time_order
</sql>
<insert id="save" keyProperty="workId" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value(
<include refid="vals"/>
)
</insert>
<update id="updateByIds">
UPDATE
<include refid="table"/>
SET status = 2,reviewer_id = #{reviewerId}
WHERE work_id IN
<foreach collection="ids" item="id" open="(" close=")" separator=",">
#{id}
</foreach>
</update>
<update id="updateStatusById">
UPDATE
<include refid="table"/>
SET status = 3,reason = #{reason},reviewer_id = #{reviewerId},modify_time=now()
WHERE work_id = #{id}
</update>
<select id="getByDay" resultType="cn.wisenergy.model.app.WorkTimeOrder">
SELECT <include refid="Base_Column_List"/>
FROM <include refid="table"/>
<where>
<if test="null !=userId">
<if test="null != userId">
AND user_id = #{userId}
</if>
<if test="null != workDay">
AND DATE_FORMAT(work_day, '%Y%m%d') = DATE_FORMAT(#{workDay} ,'%Y%m%d')
</if>
</if>
</where>
</select>
<select id="queryByPage" resultType="cn.wisenergy.model.app.WorkTimeOrder">
SELECT
<include refid="Base_Column_List"/>
FROM
<include refid="table"/>
<where>
<if test="null != projectId">
AND project_id = #{projectId}
</if>
<if test="null != status">
AND status = #{status}
</if>
<if test="null != types">
AND type IN
<foreach collection="types" item="type" open="(" close=")" separator=",">
#{type}
</foreach>
</if>
</where>
ORDER BY work_day,project_name DESC
</select>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
......@@ -77,7 +147,7 @@
group by user_id,day(work_day), CASE when `type` = 3 then 1 when `type` = 4 then 2 else 0 end
order by day(work_day)
</select>
<select id="getCountByCondition" resultType="integer" parameterType="map">
select count(1)
from <include refid="table"/>
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkDept.java
View file @ dba495bc
......@@ -41,5 +41,8 @@ public class WorkDept implements Serializable {
@ApiModelProperty(name = "modifyTime",value = "修改时间")
private Date modifyTime;
@ApiModelProperty(name = "deptManagerId", value = "部门经理id")
private Integer deptManagerId;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkSbumitAdopt.java deleted 100644 → 0
View file @ 24848fff
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkSbumitAdopt", description="自动提交审核类")
public class WorkSbumitAdopt implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "submitTime",value = "工时提交时限")
private Integer submitTime;
@ApiModelProperty(name = "autoAdopt",value = "工时自动审批时限")
private Integer autoAdopt;
}
wisenergy-service/src/main/java/cn/wisenergy/service/WorkProjectService.java
View file @ dba495bc
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.dto.ProjectDto;
import java.util.List;
......@@ -34,9 +35,6 @@ public interface WorkProjectService {
List<ProjectDto> getByManagerId(Integer id);
* 获取用户管理项目
* @param userId
* @return
*/
List<WorkProject> getUserManageProjects(Integer userId);
}
wisenergy-service/src/main/java/cn/wisenergy/service/WorkSbumitAdoptService.java
View file @ dba495bc
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkSbumitAdopt;
import cn.wisenergy.model.app.WorkSubmitAdopt;
/**
* <p>
......@@ -17,5 +17,5 @@ public interface WorkSbumitAdoptService {
* @param id
* @return
*/
WorkSbumitAdopt getById(Integer id);
WorkSubmitAdopt getById(Integer id);
}
wisenergy-service/src/main/java/cn/wisenergy/service/WorkUserService.java
View file @ dba495bc
......@@ -28,6 +28,7 @@ public interface WorkUserService {
* @return
*/
WorkUser getUserById(Integer id);
WorkUser getById(Integer id);
WorkUser getDeptManagerByIds(List<Integer> ids);
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkCollectServiceImpl.java
View file @ dba495bc
......@@ -15,16 +15,16 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import cn.wisenergy.service.WorkCollectService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
import java.util.Date;
import java.util.List;
/**
* <p>
* 服务实现类
* import java.util.Date;
* import java.util.List;
* <p>
* /**
* <p>
* 服务实现类
* </p>
......@@ -55,6 +55,7 @@ public class WorkCollectServiceImpl implements WorkCollectService {
if (null == userId || StringUtils.isEmpty(workMonth)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
List<CalendarDto> calendarDtoList = workCollectMapper.getWorkMonth(userId, workMonth);
if (CollectionUtils.isEmpty(calendarDtoList)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkDeptServiceImpl.java
View file @ dba495bc
......@@ -5,7 +5,10 @@ import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkDeptMapper;
import cn.wisenergy.model.app.WorkDept;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkDeptService;
import cn.wisenergy.service.WorkUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -25,11 +28,22 @@ import java.util.List;
public class WorkDeptServiceImpl implements WorkDeptService {
@Autowired
WorkUserService workUserService;
private WorkDeptMapper workDeptMapper;
@Autowired
WorkDeptMapper workDeptMapper;
WorkUserService workUserService;
@Override
public WorkDept getById(Integer id) {
log.info("WorkDeptServiceImpl[]getById[]input.param.id" + id);
if (null == id) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkDept workDept = workDeptMapper.selectById(id);
if (null == workDept) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DEPT_IS_NULL);
}
return workDept;
}
@Override
public List<WorkDept> getDeptInfo(Integer userId, Integer deptId) {
log.info("WorkDeptServiceImpl[]getAllDeptInfo" + userId);
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkHolidayServiceImpl.java
View file @ dba495bc
package cn.wisenergy.service.impl;
import cn.wisenergy.mapper.WorkHolidayMapper;
import cn.wisenergy.model.app.WorkHoliday;
import cn.wisenergy.service.WorkHolidayService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
/**
* <p>
* 服务实现类
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
View file @ dba495bc
......@@ -5,20 +5,24 @@ import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkProjectMapper;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.dto.ProjectDto;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkProjectService;
import cn.wisenergy.service.WorkUserService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author chenqi
......@@ -31,6 +35,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
@Autowired
private WorkProjectMapper workProjectMapper;
@Autowired
private WorkUserService workUserService;
/**
* 功能：根据项目id获取项目
......@@ -40,7 +46,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
*/
@Override
public WorkProject getById(Integer id) {
log.info("WorkProjectServiceImpl[]getById[]input.param.id:"+id);
log.info("WorkProjectServiceImpl[]getById[]input.param.id:" + id);
if (null == id) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
......@@ -52,8 +58,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
}
@Override
public List<ProjectDto> getNameById(List<Integer> ids){
log.info("WorkProjectServiceImpl[]getNameById[]input.param.ids:"+ids);
public List<ProjectDto> getNameById(List<Integer> ids) {
log.info("WorkProjectServiceImpl[]getNameById[]input.param.ids:" + ids);
if (CollectionUtils.isEmpty(ids)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
......@@ -61,7 +67,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
ArrayList<ProjectDto> list = new ArrayList<>();
for (WorkProject workProject : workProjects) {
ProjectDto projectDto = new ProjectDto();
BeanUtils.copyProperties(workProject,projectDto);
BeanUtils.copyProperties(workProject, projectDto);
list.add(projectDto);
}
......@@ -76,7 +82,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
*/
@Override
public List<ProjectDto> getByManagerId(Integer id) {
log.info("WorkProjectServiceImpl[]getByManagerId[]input.param.id:"+id);
log.info("WorkProjectServiceImpl[]getByManagerId[]input.param.id:" + id);
if (null == id) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
......@@ -86,14 +92,37 @@ public class WorkProjectServiceImpl implements WorkProjectService {
if (CollectionUtils.isEmpty(workProjects)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.MANAGER_NOT_PROJECT);
}
List<ProjectDto> projectDtos = new ArrayList<>();
for (WorkProject workProject : workProjects) {
ProjectDto projectDto = new ProjectDto();
BeanUtils.copyProperties(workProject,projectDto);
BeanUtils.copyProperties(workProject, projectDto);
projectDtos.add(projectDto);
}
return projectDtos;
}
@Override
public List<WorkProject> getUserManageProjects(Integer userId) {
log.info("WorkProjectServiceImpl[]getUserManageProjects[]input.param" + userId);
if (userId == null) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkUser user = workUserService.getUserById(userId);
List<WorkProject> workProjects = new ArrayList<>();
HashMap<String, Object> map = new HashMap<>();
if (user.getLevel() == ManagerEnum.IS_PROJECT_DIRECTOR.getCode()) {
map.put("managerId", userId);
workProjects = workProjectMapper.getProjectsByCriteria(map);
}
//用户是部门级别，查询该部门下的所有项目
if (user.getLevel() == ManagerEnum.IS_DEPARTMENT_DIRECTOR.getCode()) {
map.put("deptId", user.getDeptId());
workProjects = workProjectMapper.getProjectsByCriteria(map);
}
return workProjects;
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkSbumitAdoptServiceImpl.java
View file @ dba495bc
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.WorkSbumitAdoptMapper;
import cn.wisenergy.model.app.WorkSubmitAdopt;
import cn.wisenergy.service.WorkSbumitAdoptService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
......@@ -24,12 +30,12 @@ public class WorkSbumitAdoptServiceImpl implements WorkSbumitAdoptService {
* @return
*/
@Override
public WorkSbumitAdopt getById(Integer id) {
public WorkSubmitAdopt getById(Integer id) {
log.info("WorkSbumitAdoptServiceImpl[]getById[]input.param.id:" + id);
if (null == id) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkSbumitAdopt workSbumitAdopt = workSbumitAdoptMapper.selectById(id);
WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptMapper.selectById(id);
if (null == workSbumitAdopt) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.RESOURCE_NOT_FOUND);
}
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
View file @ dba495bc
package cn.wisenergy.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkTimeOrderMapper;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.dto.CreateWorkOrderDto;
import cn.wisenergy.model.dto.ExamineGroupbyProjectDto;
import cn.wisenergy.model.dto.SubtotalDto;
import cn.wisenergy.model.dto.WorkTimeOrderDto;
import cn.wisenergy.model.dto.*;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.model.enums.ProjectTypeEnum;
import cn.wisenergy.model.enums.WorkOrderStatus;
import cn.wisenergy.model.enums.WorkOrderType;
import cn.wisenergy.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
......@@ -20,25 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.dto.ApprovalStatistics;
import cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.model.enums.ProjectTypeEnum;
import cn.wisenergy.model.enums.WorkOrderStatus;
import cn.wisenergy.model.enums.WorkOrderType;
import cn.wisenergy.service.WorkProjectService;
import cn.wisenergy.service.WorkTimeOrderService;
import cn.wisenergy.service.WorkUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
/**
......@@ -62,6 +45,25 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
@Autowired
private WorkTimeOrderMapper workTimeOrderMapper;
@Autowired
private WorkDeptService workDeptService;
@Autowired
private WorkSbumitAdoptService workSbumitAdoptService;
@Autowired
private WorkHolidayService workHolidayService;
@Autowired
private WorkCollectService workCollectService;
@Autowired
private WorkUserDeptService workUserDeptService;
@Autowired
private WorkUserProjectService workUserProjectService;
@Override
public ArrayList<Object> getMonthlyStatistics(Integer userId) {
log.info("WorkTimeOrderServiceImpl[]getMonthlyStatistics[]input.param" + userId);
......@@ -131,7 +133,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
return objects;
}
private WorkDeptService workDeptService;
/**
......@@ -167,6 +169,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
if (null == userId || StringUtils.isEmpty(workDay)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
List<WorkTimeOrder> workTimeOrders = getByDay(userId, workDay);
if (CollectionUtils.isEmpty(workTimeOrders)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
......@@ -251,7 +254,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkSbumitAdopt workSbumitAdopt = workSbumitAdoptService.getById(1);
WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptService.getById(1);
Integer submitTime = workSbumitAdopt.getSubmitTime();
for (WorkTimeOrderDto workTimeOrderDto : dto.getWorkTimeOrders()) {
if (null == workTimeOrderDto.getDes()) {
......@@ -270,10 +273,12 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
workTimeOrder.setUserName(workUserService.getById(workTimeOrder.getUserId()).getName());
workTimeOrder.setProjectName(workProjectService.getById(workTimeOrder.getProjectId()).getProjectName());
// 获取部门id
workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(workTimeOrder.getUserId()));
Date workDay = workTimeOrder.getWorkDay();
// 默认正常工时
workTimeOrder.setIsOvertime(0);
if (workHolidayService.isHoliday(workDay)) {
workTimeOrder.setIsOvertime(1);
}
......@@ -364,6 +369,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
for (WorkTimeOrder workTimeOrder : workTimeOrders) {
userId = workTimeOrder.getUserId();
workDay = workTimeOrder.getWorkDay();
WorkCollect workCollect = workCollectService.getByUserIdAndWorkDay(userId, workDay);
if (null == workCollect) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_ORDER_INFO_IS_NULL);
......@@ -465,7 +471,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
log.info("WorkOrderServiceImpl[]checkWorkOrderInfo[]input.method");
// 1、工单时间不能大于当前天
Date date = new Date();
WorkSbumitAdopt workSbumitAdopt = workSbumitAdoptService.getById(1);
WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptService.getById(1);
Integer submitTime = workSbumitAdopt.getSubmitTime();
for (WorkTimeOrderDto dto : list) {
if (null == dto.getDes()) {
......@@ -604,8 +610,8 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
}
if (1 != wto.getType() || 2 != wto.getType()) {
String ManagerName = workUserService.getById(
workDeptService.getById(wto.getDeptId()
).getDeptManagerId()).getName();
workDeptService.getById(wto.getDeptId()).getDeptManagerId())
.getName();
return ManagerName;
}
return null;
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserProjectServiceImpl.java
View file @ dba495bc
......@@ -6,11 +6,10 @@ import cn.wisenergy.mapper.WorkProjectMapper;
import cn.wisenergy.mapper.WorkUserProjectMapper;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.app.WorkUserProject;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkUserProjectService;
import cn.wisenergy.service.WorkUserService;
import cn.wisenergy.model.app.WorkUserProject;
import cn.wisenergy.service.WorkUserProjectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -18,7 +17,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -35,6 +33,13 @@ public class WorkUserProjectServiceImpl implements WorkUserProjectService {
@Autowired
private WorkUserProjectMapper workUserProjectMapper;
@Autowired
private WorkUserService workUserService;
@Autowired
WorkProjectMapper workProjectMapper;
/**
* 功能：根据userId获取项目id
*
......@@ -59,13 +64,6 @@ public class WorkUserProjectServiceImpl implements WorkUserProjectService {
}
return list;
}
private WorkUserService workUserService;
@Autowired
WorkUserProjectMapper workUserProjectMapper;
@Autowired
WorkProjectMapper workProjectMapper;
@Override
......
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
View file @ dba495bc
......@@ -18,7 +18,6 @@ import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
......@@ -31,6 +30,11 @@ import java.util.Map;
public class WorkUserServiceImpl implements WorkUserService {
@Autowired
private WorkUserMapper workUserMapper;
@Autowired
private WorkDeptMapper workDeptMapper;
private static final String LOGIN_SOURCE = "PC";
@Override
public WorkUser getById(Integer id) {
log.info("WorkUserServiceImpl[]getById[]input.param.id:{}"+id);
......@@ -52,14 +56,11 @@ public class WorkUserServiceImpl implements WorkUserService {
}
QueryWrapper<WorkUser> wrapper = new QueryWrapper<>();
wrapper.eq("level", 2);
wrapper.in("id",ids);
wrapper.in("id", ids);
WorkUser workUser = workUserMapper.selectOne(wrapper);
return workUser;
@Autowired
private WorkDeptMapper workDeptMapper;
private static final String LOGIN_SOURCE = "PC";
}
@Override
public WorkUser login(String loginName, String password, String source) {
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkOrderController.java
View file @ dba495bc
......@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
......@@ -37,7 +38,7 @@ public class WorkOrderController extends BaseController {
if (userId == null) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
ArrayList<Object> monthlyStatistics = workOrderService.getMonthlyStatistics(userId);
List<Object> monthlyStatistics = workOrderService.getMonthlyStatistics(userId);
return getResult(monthlyStatistics);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/auto/Examin.java
View file @ dba495bc
......@@ -10,7 +10,7 @@ import cn.wisenergy.mapper.WorkCollectMapper;
import cn.wisenergy.mapper.WorkSbumitAdoptMapper;
import cn.wisenergy.mapper.WorkTimeOrderMapper;
import cn.wisenergy.model.app.WorkCollect;
import cn.wisenergy.model.app.WorkSbumitAdopt;
import cn.wisenergy.model.app.WorkSubmitAdopt;
import cn.wisenergy.model.app.WorkTimeOrder;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.extern.slf4j.Slf4j;
......@@ -43,7 +43,7 @@ public class Examin {
@Scheduled(cron = "0 0 0 * * ?")
public void autoExamin() {
log.info("admin[]config[]auto[]Examin[]autoExamin");
WorkSbumitAdopt workSbumitAdopt = workSbumitAdoptMapper.selectById(1);
WorkSubmitAdopt workSbumitAdopt = workSbumitAdoptMapper.selectById(1);
Integer autoAdopt = workSbumitAdopt.getAutoAdopt();
Date yesterdayDate = getAutoExaminDay(autoAdopt);
Date now = DateUtil.getToday();
......
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