DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oa初步完成

Browse Source
This commit is contained in:
hdka
2024-11-16 20:08:00 +08:00
parent 17ef95ebae
commit 76403c1cf8
35 changed files with 1157 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java
View File

@@ -1,8 +1,12 @@
package com.ruoyi.oa.controller;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.oa.domain.LaborCostData;
import com.ruoyi.oa.domain.vo.SysUserVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
@@ -38,10 +42,35 @@ public class SysOaAttendanceController extends BaseController {
private final ISysOaAttendanceService iSysOaAttendanceService;
/**
* 获取当前月的天数
* @return
*/
@GetMapping("/date")
public R<Long> date() {
Calendar calendar = Calendar.getInstance();
calendar.setTime(DateUtils.getNowDate());
Long dateLength = (long) calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
return R.ok(dateLength);
}
/**
* 获取当前月的天数
* @return
*/
@GetMapping("/calc/{time}")
public R<List<LaborCostData>> calc(@PathVariable("time") Date time) {
return R.ok(iSysOaAttendanceService.workerCalc(time));
}
/**
* 查询人员考勤列表
*/
@SaCheckPermission("system:oaAttendance:list")
@GetMapping("/list")
public TableDataInfo<SysOaAttendanceVo> list(SysOaAttendanceBo bo, PageQuery pageQuery) {
return iSysOaAttendanceService.queryPageList(bo, pageQuery);
@@ -52,7 +81,6 @@ public class SysOaAttendanceController extends BaseController {
/**
* 查询人员考勤列表
*/
@SaCheckPermission("system:oaAttendance:list")
@GetMapping("/worker/list")
public R<List<SysUserVo>> workerList(SysOaAttendanceBo bo) {
@@ -63,7 +91,6 @@ public class SysOaAttendanceController extends BaseController {
/**
* 导出人员考勤列表
*/
@SaCheckPermission("system:oaAttendance:export")
@Log(title = "人员考勤", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaAttendanceBo bo, HttpServletResponse response) {
@@ -76,7 +103,6 @@ public class SysOaAttendanceController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("system:oaAttendance:query")
@GetMapping("/{id}")
public R<SysOaAttendanceVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@@ -86,7 +112,6 @@ public class SysOaAttendanceController extends BaseController {
/**
* 新增人员考勤
*/
@SaCheckPermission("system:oaAttendance:add")
@Log(title = "人员考勤", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -97,7 +122,6 @@ public class SysOaAttendanceController extends BaseController {
/**
* 修改人员考勤
*/
@SaCheckPermission("system:oaAttendance:edit")
@Log(title = "人员考勤", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -110,7 +134,6 @@ public class SysOaAttendanceController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("system:oaAttendance:remove")
@Log(title = "人员考勤", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -122,7 +145,6 @@ public class SysOaAttendanceController extends BaseController {
/**
* 新增人员考勤
*/
@SaCheckPermission("system:oaAttendance:add")
@Log(title = "人员考勤", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/insertBatch")

31
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/LaborCostData.java Normal file
View File

@@ -0,0 +1,31 @@
package com.ruoyi.oa.domain;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
import com.ruoyi.oa.domain.vo.SysUserVo;
import lombok.Data;
import java.util.List;
@Data
public class LaborCostData extends BaseEntity {
// 对应用户
private SysUserVo sysUser;
// 计算月份
private Long generateMonth;
// 当前月的工作量
private Double workTimes;
// 捆绑的项目列表
private List<SysOaProjectVo> projects;
// 当月的所有签到信息
private List<SysOaAttendanceVo> attendances;
}

4
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaAttendance.java
View File

@@ -39,11 +39,11 @@ public class SysOaAttendance extends BaseEntity {
/**
* 时长（天）1|0.5
*/
private Long dayLength;
private Double dayLength;
/**
* 时长（小时）
*/
private Long hour;
private Double hour;
/**
* 备注
*/

1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java
View File

@@ -33,7 +33,6 @@ public class SysOaOutWarehouseBo extends BaseEntity {
/**
* 出库后对应的项目id
*/
@NotNull(message = "项目id不能为空",groups = { AddGroup.class })
private Long projectId;
/**

13
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaAttendanceVo.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.oa.domain.SysOaAttendance;
import com.ruoyi.oa.domain.SysOaProject;
import lombok.Data;
@@ -17,7 +18,7 @@ import lombok.Data;
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaAttendanceVo {
public class SysOaAttendanceVo extends SysOaAttendance {
private static final long serialVersionUID = 1L;
@@ -50,14 +51,14 @@ public class SysOaAttendanceVo {
*/
@ExcelProperty(value = "时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "天=")
private Long dayLength;
private Double dayLength;
/**
* 时长（小时）
*/
@ExcelProperty(value = "时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时")
private Long hour;
private Double hour;
/**
* 备注
@@ -71,5 +72,11 @@ public class SysOaAttendanceVo {
private String color;
private Long count;
// 单个工作时间
private Double workTimes;
private String projectName;
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.List;
@@ -15,7 +16,7 @@ import java.util.List;
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaOutWarehouseListVo {
public class SysOaOutWarehouseListVo extends BaseEntity {
/**
* ID 编号
*/

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java
View File

@@ -55,5 +55,10 @@ public class SysOaOutWarehouseVo extends BaseEntity {
/** 项目名 */
private String projectName;
/** 库存信息 */
private SysOaWarehouseVo warehouse;
/** 项目信息 */
private SysOaProjectVo project;
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
View File

@@ -186,4 +186,9 @@ public class SysOaProjectVo {
*/
private String color;
/**
* 此项目数量 用户报工功能
*/
private Long count;
}

4
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java
View File

@@ -108,5 +108,9 @@ public class SysOaTaskVo {
* */
private List<SysUser> workerList;
/**
* 此任务总成本
*/
private Double projectCostTotal;
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.oa.domain.SysOaWarehouse;
import lombok.Data;
import java.util.Date;
@@ -17,7 +18,7 @@ import java.util.Date;
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaWarehouseVo {
public class SysOaWarehouseVo extends SysOaWarehouse {
private static final long serialVersionUID = 1L;

5
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java
View File

@@ -3,6 +3,10 @@ package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.SysOaAttendance;
import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* 人员考勤Mapper接口
@@ -12,4 +16,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
*/
public interface SysOaAttendanceMapper extends BaseMapperPlus<SysOaAttendanceMapper, SysOaAttendance, SysOaAttendanceVo> {
List<SysOaAttendanceVo> selectVoListAndTime(@Param("userId") Long userId, @Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay);
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java
View File

@@ -22,4 +22,5 @@ public interface SysOaProjectMapper extends BaseMapperPlus<SysOaProjectMapper, S
Page<SysOaOutWarehouseListVo> selectPageOutList(@Param("page") Page<SysOaOutWarehouseListVo> page,@Param(Constants.WRAPPER) Wrapper<SysOaProject> queryWrapper);
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMapper.java
View File

@@ -12,4 +12,11 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
*/
public interface SysOaWarehouseMapper extends BaseMapperPlus<SysOaWarehouseMapper, SysOaWarehouse, SysOaWarehouseVo> {
/**
*
* 查询已经被逻辑删除的数据
* @param warehouseId
* @return
*/
SysOaWarehouseVo selectVoByIdAndXml(Long warehouseId);
}

20
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaAttendanceService.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.LaborCostData;
import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
import com.ruoyi.oa.domain.bo.SysOaAttendanceBo;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -7,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.oa.domain.vo.SysUserVo;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@@ -47,7 +49,25 @@ public interface ISysOaAttendanceService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 工人列表
* @param bo
* @return
*/
List<SysUserVo> workerList(SysOaAttendanceBo bo);
/**
* 批量插入
* @param bo
* @return
*/
int insertBatch(SysOaAttendanceBo bo);
/**
* 人力成本计算接口
*
* @param time 时间
*/
List<LaborCostData> workerCalc(Date time);
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java
View File

@@ -49,4 +49,6 @@ public interface ISysOaProjectService {
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
TableDataInfo<SysOaOutWarehouseListVo> queryOutWarePageList(SysOaOutWarehouseBo bo, PageQuery pageQuery);
}

65
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java
View File

@@ -6,12 +6,15 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.oa.domain.LaborCostData;
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
import com.ruoyi.oa.domain.vo.SysUserVo;
import com.ruoyi.oa.service.ISysOaProjectService;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.SysOaAttendanceBo;
@@ -22,6 +25,7 @@ import com.ruoyi.oa.service.ISysOaAttendanceService;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
/**
* 人员考勤Service业务层处理
@@ -29,6 +33,7 @@ import java.util.*;
* @author hdka
* @date 2024-11-05
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
@@ -182,4 +187,64 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
}
return 1;
}
/**
* 计算人力成本
*
* @param time 月份
* @return
*/
@Override
public List<LaborCostData> workerCalc(Date time) {
String firstDay = DateUtils.parseDateToStr("yyyy-MM-01", time);
String format = "yyyy-MM-";
// 计算某月的天数
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
String dateLength = String.valueOf(calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
// 将字符串拼接
format +=dateLength;
String lastDay = DateUtils.parseDateToStr(format, time);
// 查询所有的工人
List<Long> userIds = sysUserRoleMapper.selectUserIdsByRoleId(1852970465740505090L);
List<LaborCostData> costDataList = new ArrayList<>();
for (Long userId : userIds) {
SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserById(userId), SysUserVo.class);
SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo();
sysOaAttendanceVo.setUserId(sysUser.getUserId());
// 查询某月记录
List<SysOaAttendanceVo> sysOaAttendanceVos = baseMapper.selectVoListAndTime(userId, DateUtils.parseDate(firstDay),DateUtils.parseDate(lastDay));
List<SysOaProjectVo> projectVos = new ArrayList<>();
Double workTimes = 0.0;
System.out.println(sysOaAttendanceVos);
for (SysOaAttendanceVo oaAttendanceVo : sysOaAttendanceVos) {
SysOaProjectVo sysOaProjectVo = projectService.queryById(oaAttendanceVo.getProjectId());
oaAttendanceVo.setColor(sysOaProjectVo.getColor());
oaAttendanceVo.setSysOaProjectVo(sysOaProjectVo);
oaAttendanceVo.setProjectName(sysOaProjectVo.getProjectName());
projectVos.add(sysOaProjectVo);
workTimes+=oaAttendanceVo.getWorkTimes();
}
projectVos.stream().distinct().collect(Collectors.toList());
LaborCostData laborCostData = new LaborCostData();
laborCostData.setProjects(projectVos);
laborCostData.setAttendances(sysOaAttendanceVos);
laborCostData.setSysUser(sysUser);
laborCostData.setWorkTimes(workTimes);
costDataList.add(laborCostData);
}
return costDataList;
}
}

60
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java
View File

@@ -15,11 +15,14 @@ import com.ruoyi.oa.domain.SysOaWarehouse;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo2;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBoList;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
import com.ruoyi.oa.mapper.SysOaProjectMapper;
import com.ruoyi.oa.mapper.SysOaWarehouseMapper;
import com.ruoyi.oa.service.ISysOaWarehouseService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.security.SecurityUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo;
@@ -28,10 +31,7 @@ import com.ruoyi.oa.domain.SysOaOutWarehouse;
import com.ruoyi.oa.mapper.SysOaOutWarehouseMapper;
import com.ruoyi.oa.service.ISysOaOutWarehouseService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
import static cn.hutool.core.bean.BeanUtil.*;
@@ -61,7 +61,16 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
*/
@Override
public SysOaOutWarehouseVo queryById(Long id){
return baseMapper.selectVoById(id);
SysOaOutWarehouseVo sysOaOutWarehouseVo = baseMapper.selectVoById(id);
SysOaWarehouseVo sysOaWarehouse = warehouseMapper.selectVoByIdAndXml(sysOaOutWarehouseVo.getWarehouseId());
SysOaProjectVo sysOaProject = projectMapper.selectVoById(sysOaOutWarehouseVo.getProjectId());
sysOaOutWarehouseVo.setWarehouse(sysOaWarehouse);
// 出库可能不关联项目
if (Objects.nonNull(sysOaProject)){
sysOaOutWarehouseVo.setProject(sysOaProject);
}
return sysOaOutWarehouseVo;
}
@@ -104,13 +113,11 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
pageQuery.setPageSize(Integer.MAX_VALUE);
}
pageQuery.setPageNum((pageQuery.getPageNum() - 1)*pageQuery.getPageSize());
List<SysOaOutWarehouseListVo> selectList = baseMapper.defineSelectList(bo, pageQuery);
IPage<SysOaOutWarehouseListVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
page.setRecords(selectList);
page.setTotal(total);
log.info(String.valueOf(total));
return TableDataInfo.build(page);
}
@@ -140,7 +147,10 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
*/
@Override
public Boolean insertByBo(SysOaOutWarehouseBo bo) {
bo.setCreateTime(new Date());
bo.setUpdateTime(new Date());
SysOaOutWarehouse decrease = toBean(bo, SysOaOutWarehouse.class);
validEntityBeforeSave(decrease);
SysOaWarehouse warehouse = warehouseMapper.selectById(decrease.getWarehouseId());
// 1 如果对应仓库表项目数量-将要出库数量<0，出库失败, 繁殖 ， 增加该条
@@ -152,6 +162,7 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
}
else {
warehouse.setInventory(warehouse.getInventory() - decrease.getAmount());
warehouse.setUpdateTime(new Date());
warehouseMapper.updateById(warehouse);
}
@@ -167,17 +178,21 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
Long projectId = boList.getProjectId();
if (projectId == null) {
throw new Error("项目ID不能为空,新增出库失败");
}
List<SysOaOutWarehouseBo2> list = boList.getOutWareHouseList();
if (projectId != null) {
list.forEach((sysOaOutWarehouseBo2 -> {
sysOaOutWarehouseBo2.setProjectId(projectId);
SysOaOutWarehouseBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaOutWarehouseBo.class);
insertByBo(sysOaOutWarehouse);
}));
list.forEach((sysOaOutWarehouseBo2 -> {
}else{
list.forEach((sysOaOutWarehouseBo2 -> {
SysOaOutWarehouseBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaOutWarehouseBo.class);
insertByBo(sysOaOutWarehouse);
}));
}
sysOaOutWarehouseBo2.setProjectId(projectId);
SysOaOutWarehouseBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaOutWarehouseBo.class);
insertByBo(sysOaOutWarehouse);
}));
return true;
}
@@ -251,12 +266,10 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
//需要增加的对应物料数量
LambdaQueryWrapper<SysOaOutWarehouse> lqw = Wrappers.lambdaQuery();
lqw.in(SysOaOutWarehouse::getId, ids.toArray());
List<SysOaOutWarehouse> sysOaOutWarehouses = baseMapper.selectList(lqw); //出库表中的所有删除的数据
sysOaOutWarehouses.forEach(sysOaOutWarehouse -> { //其中一条
//出库表中的所有删除的数据
List<SysOaOutWarehouse> sysOaOutWarehouses = baseMapper.selectList(lqw);
//其中一条
sysOaOutWarehouses.forEach(sysOaOutWarehouse -> {
//选出相对应的 库存表中那一条的数据
LambdaQueryWrapper<SysOaWarehouse> lqw2 = Wrappers.lambdaQuery();
lqw2.eq(SysOaWarehouse::getId, sysOaOutWarehouse.getWarehouseId());
@@ -266,8 +279,7 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
warehouse.setInventory(warehouse.getInventory() + sysOaOutWarehouse.getAmount());
warehouseMapper.updateById(warehouse);
});
boolean flag = baseMapper.deleteBatchIds(ids) > 0;
return flag;
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
@@ -281,7 +293,7 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService {
lqw.eq(SysOaOutWarehouse::getProjectId, projectId);
List<SysOaOutWarehouseVo> sysOaOutWarehouseVos = baseMapper.selectVoList(lqw);
for (SysOaOutWarehouseVo sysOaOutWarehouseVo :sysOaOutWarehouseVos) {
sysOaOutWarehouseVo.setWarehouseName(warehouseMapper.selectById(sysOaOutWarehouseVo.getWarehouseId()).getName());
sysOaOutWarehouseVo.setWarehouseName(warehouseMapper.selectVoByIdAndXml((sysOaOutWarehouseVo.getWarehouseId())).getName());
}
return TableDataInfo.build(sysOaOutWarehouseVos);
}

30
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java
View File

@@ -14,11 +14,15 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.domain.SysOaAttendance;
import com.ruoyi.oa.domain.SysOaTaskUser;
import com.ruoyi.oa.domain.bo.SysOaAttendanceBo;
import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
import com.ruoyi.oa.domain.vo.SysOaTaskUserVo;
import com.ruoyi.oa.domain.vo.SysUserVo;
import com.ruoyi.oa.mapper.SysOaTaskUserMapper;
import com.ruoyi.oa.service.ISysOaAttendanceService;
import com.ruoyi.oa.service.ISysOaTaskUserService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.ISysUserService;
@@ -58,6 +62,9 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
@Autowired
private ISysUserService userService;
@Autowired
private ISysOaAttendanceService attendanceService;
/**
* 查询任务管理
*/
@@ -129,6 +136,7 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
lqw.eq(StringUtils.isNotEmpty(bo.getProjectId().toString()), SysOaTask::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getTaskType()),SysOaTask::getTaskType, bo.getTaskType());
List<SysOaTaskVo> sysOaTaskVos = baseMapper.selectVoList(lqw);
Long projectId = bo.getProjectId();
// 添加负责人列表
for (SysOaTaskVo sysOaTaskVo : sysOaTaskVos) {
@@ -136,11 +144,33 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService {
lambdaQueryWrapper.eq(SysOaTaskUser::getTaskId, sysOaTaskVo.getTaskId());
List<SysOaTaskUserVo> sysOaTaskUserVos = taskUserMapper.selectVoList(lambdaQueryWrapper);
List<SysUser> sysUserList = new ArrayList<>();
// 计算总成本
Double projectCostTotal = 0.0;
for (SysOaTaskUserVo sysOaTaskUserVo : sysOaTaskUserVos) {
SysUser sysUser = userService.selectUserById(sysOaTaskUserVo.getUserId());
// 查询当前用户对于此项目的工作时长
SysOaAttendanceBo attendance = new SysOaAttendanceBo();
attendance.setUserId(sysOaTaskUserVo.getUserId());
attendance.setProjectId(projectId);
List<SysOaAttendanceVo> sysOaAttendanceVos = attendanceService.queryList(attendance);
// 写入时间
Double workTime = 0.0;
for (SysOaAttendanceVo sysOaAttendanceVo : sysOaAttendanceVos) {
workTime+=sysOaAttendanceVo.getDayLength();
}
projectCostTotal+=workTime*sysUser.getLaborCost();
sysUser.setWorkTime(workTime);
sysUserList.add(sysUser);
}
sysOaTaskVo.setWorkerList(sysUserList);
sysOaTaskVo.setProjectCostTotal(projectCostTotal);
}
return sysOaTaskVos;
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java
View File

@@ -127,13 +127,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
LambdaQueryWrapper<SysOaWarehouse> lqw = Wrappers.lambdaQuery();
lqw.in(SysOaWarehouse::getId, ids);
List<SysOaWarehouse> sysOaWarehouses = baseMapper.selectList(lqw);
sysOaWarehouses.forEach(sysOaWarehouse -> {
sysOaWarehouse.setDelFlag(1L);
});
return baseMapper.updateBatchById(sysOaWarehouses);
return baseMapper.deleteBatchIds(ids)>0;
}
}