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

三期内容优化

Browse Source
This commit is contained in:
hdka
2025-03-20 18:19:31 +08:00
parent ed7012e2dd
commit 72036bc7bd
44 changed files with 780 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java
View File

@@ -3,17 +3,14 @@ package com.ruoyi.oa.controller;
import java.util.Date;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.alibaba.excel.util.DateUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.oa.domain.CalendarDay;
import com.ruoyi.oa.domain.vo.SysHolidayVo;
import com.ruoyi.oa.domain.vo.SysOaHolidayListVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -23,7 +20,6 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.SysOaHolidayVo;
@@ -141,4 +137,9 @@ public class SysOaHolidayController extends BaseController {
public R<List<SysHolidayVo>> queryList(SysOaHolidayBo bo){
return R.ok(iSysOaHolidayService.queryVoList(bo));
}
@GetMapping("/queryOwnList")
public List<CalendarDay> queryOwnList(SysOaHolidayBo bo, PageQuery pageQuery){
return iSysOaHolidayService.queryOwnList(bo,pageQuery);
}
}

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
View File

@@ -3,10 +3,9 @@ package com.ruoyi.oa.controller;
import java.util.Date;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo;
import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
import com.ruoyi.oa.mapper.SysOaTaskMapper;
import lombok.RequiredArgsConstructor;
@@ -22,7 +21,6 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
@@ -142,7 +140,7 @@ public class SysOaProjectController extends BaseController {
*/
@SaCheckPermission("oa:project:list")
@GetMapping("/outWare/list")
public TableDataInfo<SysOaOutWarehouseListVo> outWareList(SysOaOutWarehouseBo bo, PageQuery pageQuery) {
public TableDataInfo<SysOaOutWarehouseListVo> outWareList(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
return iSysOaProjectService.queryOutWarePageList(bo, pageQuery);
}
}

22
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
View File

@@ -6,7 +6,11 @@ import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.oa.domain.SysOaWarehouseMaster;
import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo;
import com.ruoyi.oa.listener.SysOaWarehouseListener;
import com.ruoyi.oa.service.ISysOaWarehouseMasterService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -44,6 +48,8 @@ public class SysOaWarehouseController extends BaseController {
private final ISysOaWarehouseService iSysOaWarehouseService;
private final ISysOaWarehouseMasterService iSysOaWarehouseMasterService;
/**
* 查询仓库管理列表
*/
@@ -98,6 +104,8 @@ public class SysOaWarehouseController extends BaseController {
return toAjax(iSysOaWarehouseService.insertByBo(bo));
}
/**
* 修改仓库管理
*/
@@ -130,12 +138,24 @@ public class SysOaWarehouseController extends BaseController {
* @param file 导入文件
* @param updateSupport 是否更新已存在数据
*/
@Log(title = "投诉工单导入", businessType = BusinessType.IMPORT)
@Log(title = "入库工单导入", businessType = BusinessType.IMPORT)
@SaCheckPermission("complaint:complaint:import")
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
ExcelResult<SysOaWarehouseVo> result = ExcelUtil.importExcel(file.getInputStream(), SysOaWarehouseVo.class,
new SysOaWarehouseListener(true));
SysOaWarehouseMasterBo sysOaWarehouseMaster = new SysOaWarehouseMasterBo();
sysOaWarehouseMaster.setType(1L);
List<SysOaWarehouseDetailBo> list = new ArrayList<>();
result.getList().forEach(item -> {
SysOaWarehouseDetailBo bo = new SysOaWarehouseDetailBo();
bo.setWarehouseId(item.getId());
bo.setAmount(item.getInventory());
bo.setSignPrice(item.getPrice());
list.add(bo);
});
sysOaWarehouseMaster.setWarehouseList(list);
iSysOaWarehouseMasterService.insertByBo(sysOaWarehouseMaster);
return R.ok(result.getAnalysis());
}

56
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaOutWarehouseController.java → ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseDetailController.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBoList;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo;
@@ -19,12 +18,11 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo;
import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo;
import com.ruoyi.oa.service.ISysOaOutWarehouseService;
import com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo;
import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo;
import com.ruoyi.oa.service.ISysOaWarehouseDetailService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
@@ -37,9 +35,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/oaOutWarehouse")
public class SysOaOutWarehouseController extends BaseController {
public class SysOaWarehouseDetailController extends BaseController {
private final ISysOaOutWarehouseService iSysOaOutWarehouseService;
private final ISysOaWarehouseDetailService iSysOaWarehouseDetailService;
@@ -48,8 +46,8 @@ public class SysOaOutWarehouseController extends BaseController {
*/
@SaCheckPermission("oa:oaOutWarehouse:list")
@GetMapping("/list")
public TableDataInfo<SysOaOutWarehouseListVo> list(SysOaOutWarehouseBo bo, PageQuery pageQuery) {
return iSysOaOutWarehouseService.queryPageList(bo, pageQuery);
public TableDataInfo<SysOaOutWarehouseListVo> list(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
return iSysOaWarehouseDetailService.queryPageList(bo, pageQuery);
}
/**
@@ -58,9 +56,9 @@ public class SysOaOutWarehouseController extends BaseController {
@SaCheckPermission("oa:oaOutWarehouse:export")
@Log(title = "仓库出库", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaOutWarehouseBo bo, HttpServletResponse response) {
List<SysOaOutWarehouseVo> list = iSysOaOutWarehouseService.queryList(bo);
ExcelUtil.exportExcel(list, "仓库出库", SysOaOutWarehouseVo.class, response);
public void export(SysOaWarehouseDetailBo bo, HttpServletResponse response) {
List<SysOaWarehouseDetailVo> list = iSysOaWarehouseDetailService.queryList(bo);
ExcelUtil.exportExcel(list, "仓库出库", SysOaWarehouseDetailVo.class, response);
}
/**
@@ -70,9 +68,9 @@ public class SysOaOutWarehouseController extends BaseController {
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/{id}")
public R<SysOaOutWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
public R<SysOaWarehouseDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iSysOaOutWarehouseService.queryById(id));
return R.ok(iSysOaWarehouseDetailService.queryById(id));
}
/**
@@ -82,9 +80,9 @@ public class SysOaOutWarehouseController extends BaseController {
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/WarehouseIdList/{WarehouseId}")
public TableDataInfo<SysOaOutWarehouseVo> ListByWarehouseId(@NotNull(message = "出库产品ID不能为空")
public TableDataInfo<SysOaWarehouseDetailVo> ListByWarehouseId(@NotNull(message = "出库产品ID不能为空")
@PathVariable Long WarehouseId) {
return iSysOaOutWarehouseService.queryWarehouseIdList(WarehouseId);
return iSysOaWarehouseDetailService.queryWarehouseIdList(WarehouseId);
}
/**
@@ -94,9 +92,9 @@ public class SysOaOutWarehouseController extends BaseController {
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/project/{projectId}")
public TableDataInfo<SysOaOutWarehouseVo> queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空")
public TableDataInfo<SysOaWarehouseDetailVo> queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空")
@PathVariable Long projectId) {
return iSysOaOutWarehouseService.queryOutWarehouseByProjectId(projectId);
return iSysOaWarehouseDetailService.queryOutWarehouseByProjectId(projectId);
}
@@ -108,22 +106,10 @@ public class SysOaOutWarehouseController extends BaseController {
@Log(title = "仓库出库", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaOutWarehouseBo bo) {
return toAjax(iSysOaOutWarehouseService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaWarehouseDetailBo bo) {
return toAjax(iSysOaWarehouseDetailService.insertByBo(bo));
}
/**
* 批量新增仓库出库
*/
@SaCheckPermission("oa:oaOutWarehouse:add")
@Log(title = "仓库批量出库",businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/insertOutBatch")
public R<Void> addAll(@Validated(AddGroup.class) @RequestBody SysOaOutWarehouseBoList boList) {
return toAjax(iSysOaOutWarehouseService.insertByBoList(boList));
}
/**
* 修改仓库出库
*/
@@ -131,8 +117,8 @@ public class SysOaOutWarehouseController extends BaseController {
@Log(title = "仓库出库", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaOutWarehouseBo bo) {
return toAjax(iSysOaOutWarehouseService.updateByBo(bo));
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaWarehouseDetailBo bo) {
return toAjax(iSysOaWarehouseDetailService.updateByBo(bo));
}
/**
@@ -145,6 +131,6 @@ public class SysOaOutWarehouseController extends BaseController {
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iSysOaOutWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true));
return toAjax(iSysOaWarehouseDetailService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}

14
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
View File

@@ -1,9 +1,13 @@
package com.ruoyi.oa.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -82,6 +86,16 @@ public class SysOaWarehouseMasterController extends BaseController {
return toAjax(iSysOaWarehouseMasterService.insertByBo(bo));
}
/**
* 新增仓库管理
*/
@Log(title = "仓库管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/in")
public R<Void> addIn(@Validated(AddGroup.class) @RequestBody SysOaWarehouseBo bo) {
return toAjax(iSysOaWarehouseMasterService.insertInWarehouse(bo));
}
/**
* 修改出库单管理
*/