From c58e9be3dd01ad9e3c53bda2e38fd36fb2592c40 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 14:53:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/controller/MaTypeConfigController.java | 124 ------------ .../ma/controller/MachineController.java | 2 +- .../ma/controller/TypeController.java | 35 ++-- .../ma/{ => domain/dto}/MaTypeConfigDto.java | 2 +- .../ma/{ => domain}/vo/MaTypeConfigVo.java | 2 +- .../ma/{ => domain}/vo/MaTypeSelectVo.java | 2 +- .../vo/MaTypeVo.java} | 6 +- .../ma/{ => domain}/vo/MachineVo.java | 2 +- .../material/ma/mapper/MachineMapper.java | 3 +- .../bonus/material/ma/mapper/TypeMapper.java | 12 +- .../material/ma/service/IMachineService.java | 2 +- .../material/ma/service/ITypeService.java | 15 +- .../ma/service/MaTypeConfigService.java | 18 -- .../service/impl/MaTypeConfigServiceImpl.java | 187 ------------------ .../ma/service/impl/MachineServiceImpl.java | 2 +- .../ma/service/impl/TypeServiceImpl.java | 53 +++-- .../controller/PurchaseBindController.java | 4 +- .../PurchaseCheckDetailsController.java | 2 +- .../PurchaseCheckInfoController.java | 7 +- .../PurchaseNoticePersonController.java | 3 +- .../controller/PurchaseStorageController.java | 4 +- .../{ => domain}/dto/PurchaseAcceptDto.java | 2 +- .../{ => domain}/dto/PurchaseCheckDto.java | 2 +- .../dto/PurchaseCheckFileDto.java | 2 +- .../{ => domain}/dto/PurchaseDto.java | 2 +- .../dto/PurchaseNoticePersonDto.java | 2 +- .../{ => domain}/dto/PurchaseQueryDto.java | 2 +- .../{ => domain}/vo/PurchaseCheckFormVo.java | 2 +- .../purchase/{ => domain}/vo/PurchaseVo.java | 2 +- .../purchase/mapper/PurchaseBindMapper.java | 4 +- .../mapper/PurchaseCheckDetailsMapper.java | 2 +- .../mapper/PurchaseCheckFileMapper.java | 3 +- .../mapper/PurchaseCheckInfoMapper.java | 2 +- .../mapper/PurchaseStorageMapper.java | 4 +- .../service/IPurchaseBindService.java | 4 +- .../service/IPurchaseCheckDetailsService.java | 2 +- .../service/IPurchaseCheckInfoService.java | 6 +- .../service/IPurchaseNoticePersonService.java | 2 +- .../service/IPurchaseStorageService.java | 4 +- .../service/impl/PurchaseBindServiceImpl.java | 4 +- .../impl/PurchaseCheckDetailsServiceImpl.java | 4 +- .../impl/PurchaseCheckInfoServiceImpl.java | 6 +- .../impl/PurchaseNoticePersonServiceImpl.java | 2 +- .../impl/PurchaseStorageServiceImpl.java | 4 +- .../mapper/material/ma/MachineMapper.xml | 4 +- .../mapper/material/ma/TypeMapper.xml | 12 +- .../material/purchase/PurchaseBindMapper.xml | 10 +- .../purchase/PurchaseCheckDetailsMapper.xml | 2 +- .../purchase/PurchaseCheckFileMapper.xml | 4 +- .../purchase/PurchaseCheckInfoMapper.xml | 2 +- .../purchase/PurchaseStorageMapper.xml | 6 +- 51 files changed, 131 insertions(+), 465 deletions(-) delete mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java rename bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/{ => domain/dto}/MaTypeConfigDto.java (96%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/{ => domain}/vo/MaTypeConfigVo.java (97%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/{ => domain}/vo/MaTypeSelectVo.java (89%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/{vo/MaTypeListVo.java => domain/vo/MaTypeVo.java} (85%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/{ => domain}/vo/MachineVo.java (95%) delete mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/MaTypeConfigService.java delete mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MaTypeConfigServiceImpl.java rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/dto/PurchaseAcceptDto.java (90%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/dto/PurchaseCheckDto.java (95%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/dto/PurchaseCheckFileDto.java (96%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/dto/PurchaseDto.java (97%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/dto/PurchaseNoticePersonDto.java (95%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/dto/PurchaseQueryDto.java (95%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/vo/PurchaseCheckFormVo.java (95%) rename bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/{ => domain}/vo/PurchaseVo.java (98%) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java deleted file mode 100644 index 2707df3f..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java +++ /dev/null @@ -1,124 +0,0 @@ -//package com.bonus.material.ma.controller; -// -//import com.bonus.common.biz.domain.TreeSelect; -//import com.bonus.common.core.web.controller.BaseController; -//import com.bonus.common.core.web.domain.AjaxResult; -//import com.bonus.common.security.annotation.PreventRepeatSubmit; -//import com.bonus.common.security.annotation.RequiresPermissions; -//import com.bonus.material.ma.MaTypeConfigDto; -//import com.bonus.material.ma.domain.Type; -//import com.bonus.material.ma.domain.TypeKeeper; -//import com.bonus.material.ma.domain.TypeRepair; -//import com.bonus.material.ma.service.ITypeKeeperService; -//import com.bonus.material.ma.service.ITypeRepairService; -//import com.bonus.material.ma.service.ITypeService; -//import com.bonus.material.ma.service.MaTypeConfigService; -//import com.bonus.material.ma.vo.MaTypeConfigVo; -//import com.google.common.collect.ImmutableList; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import org.springframework.web.bind.annotation.*; -// -//import javax.annotation.Resource; -//import javax.validation.Valid; -//import javax.validation.constraints.NotNull; -//import java.util.*; -// -///** -// * @author : 阮世耀 -// * @version : 1.0 -// * @PackagePath: com.bonus.material.ma.controller -// * @CreateTime: 2024-10-16 10:52 -// * @Description: 物资类型配置API -// */ -//@Api(tags = "物资类型配置API") -//@RestController -//@RequestMapping("/ma_type_config") -//public class MaTypeConfigController extends BaseController { -// -// @Resource -// private MaTypeConfigService maTypeConfigService; -// -// @ApiOperation(value = "配置物资类型绑定信息") -// @PreventRepeatSubmit -// @RequiresPermissions("ma:typeConfig:edit") -// @PostMapping("/updateMaTypeBindInfo") -// public AjaxResult updateMaTypeBindInfo(@RequestBody @Valid @NotNull MaTypeConfigDto maTypeConfigDto) { -// // -------------------- 数据校验开始 --------------------- -// -// // 1.判断绑定标识是否为空 -// if (maTypeConfigDto.getBindFlag() == null) { -// return error("绑定标识不能为空"); -// } -// // 2.判断绑定角色类型是否为空 -// if (maTypeConfigDto.getBindRoleType() == null) { -// return error("绑定角色类型不能为空"); -// } -// // 3.判断用户id是否为空 -// if (maTypeConfigDto.getUserId() == null) { -// return error("用户id不能为空"); -// } -// -// // ---------------- 数据校验结束 --------------------- -// -// // 执行业务逻辑 -// return maTypeConfigService.updateMaTypeBindInfo(maTypeConfigDto); -// } -// -// -// -// /** -// * 查询物资类型配置右侧列表 -// */ -// @ApiOperation(value = "查询物资类型配置右侧列表") -// @RequiresPermissions("ma:typeConfig:list") -// @GetMapping("/getMaTypeConfigList") -// public AjaxResult getMaTypeConfigList(MaTypeConfigDto maTypeConfigDto) { -// // 调用service处理业务逻辑 -// return maTypeConfigService.getMaTypeConfigList(maTypeConfigDto); -// } -// -// -// /** -// * 查询物资配置左侧组织人员树-tree -// */ -// @ApiOperation(value = "查询物资配置左侧组织人员树") -// @RequiresPermissions("ma:typeConfig:list") -// @GetMapping("/getDeptUserTree") -// public AjaxResult getDeptUserTree() { -// -// // ---------- 模拟人员Tree数据 --------------- -// -// // 1.创建一个TreeSelect集合，用于外层放组织部门--公司级 -// List treeSelectList1 = new ArrayList<>(); -// TreeSelect treeSelect1 = new TreeSelect(1L, "机具设备分公司", 1, null); -// TreeSelect treeSelect2 = new TreeSelect(2L, "输电分公司", 1, null); -// TreeSelect treeSelect3 = new TreeSelect(5L, "变电分公司", 1, null); -// -// // 2. 给公司级部门添加子部门 ，创建TreeSelect集合，存放组织部门--部门级 -// TreeSelect treeSelect01 = new TreeSelect(11L, "物流库管一班", 2, 1L); -// TreeSelect treeSelect02 = new TreeSelect(12L, "物流库管二班", 2, 1L); -// TreeSelect treeSelect03 = new TreeSelect(13L, "宏源库管一班", 2, 5L); -// -// // 3. 创建部门人员 -// TreeSelect treeSelect001 = new TreeSelect(117L, "袁泷", 3, 11L); -// TreeSelect treeSelect002 = new TreeSelect(133L, "喵喵喵", 3, 11L); -// TreeSelect treeSelect003 = new TreeSelect(129L, "村上春树", 3, 12L); -// -// // 4. 把子部门人员添加到子部门中 -// treeSelect01.setChildren(Arrays.asList(treeSelect001, treeSelect002)); -// treeSelect1.setChildren(Arrays.asList(treeSelect01, treeSelect02)); -// treeSelect03.setChildren(ImmutableList.of(treeSelect003)); -// treeSelect3.setChildren(Collections.singletonList(treeSelect03)); -// -// // 3.把根节点添加到集合中 -// treeSelectList1.add(treeSelect1); -// treeSelectList1.add(treeSelect2); -// treeSelectList1.add(treeSelect3); -// -// // -------------- 模拟人员Tree数据结束 ------------------ -// -// return success(treeSelectList1); -// } -// -//} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index b6025c79..02bf727a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.vo.MachineVo; +import com.bonus.material.ma.domain.vo.MachineVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java index a77561bf..114ab25a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java @@ -8,17 +8,14 @@ import javax.validation.constraints.NotNull; import cn.hutool.core.convert.Convert; import com.bonus.common.biz.config.ListPagingUtil; -import com.bonus.common.biz.domain.TreeSelect; import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.ma.MaTypeConfigDto; -import com.bonus.material.ma.vo.MaTypeListVo; -import com.bonus.material.ma.vo.MaTypeSelectVo; -import com.bonus.material.warehouse.domain.WhHouseSet; -import com.bonus.material.warehouse.service.IWhHouseSetService; +import com.bonus.material.ma.domain.vo.MaTypeVo; +import com.bonus.material.ma.domain.vo.MaTypeSelectVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.BooleanUtils; import org.springframework.web.bind.annotation.*; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; @@ -47,38 +44,42 @@ public class TypeController extends BaseController { @ApiOperation(value = "查询物资类型管理列表") @RequiresPermissions("ma:type:list") @GetMapping("/list") - public TableDataInfo list(MaTypeListVo type) { + public TableDataInfo list(MaTypeVo type) { startPage(); - List list = typeService.selectTypeListAndParentInfo(type); + List list = typeService.selectTypeListAndParentInfo(type); return getDataTable(list); } // @ApiOperation(value = "查询物资类型管理列表(无分页)") // @RequiresPermissions("ma:type:list") // @GetMapping("/listNoPage") -// public AjaxResult listNoPage(MaTypeListVo type) { -// List list = typeService.selectTypeListAndParentInfo(type); +// public AjaxResult listNoPage(MaTypeVo type) { +// List list = typeService.selectTypeListAndParentInfo(type); // return typeService.getMyTypeAndBindUsers(list); // } /** * 根据左列表类型id查询右表格 * - * @param type + * @param maTypeVo * @return */ @ApiOperation(value = "根据左列表类型id查询右表格") @GetMapping("/getListByMaType") - public AjaxResult getListByMaType(MaTypeListVo type) { - List parentIds = typeService.selectParentId(type); - List myTypeList = new ArrayList<>(); + public AjaxResult getListByMaType(MaTypeVo maTypeVo) { + List parentIds = typeService.selectParentId(maTypeVo); + List maTypeVos = new ArrayList<>(); for (Integer parentId : parentIds) { - myTypeList.addAll(typeService.getListByParentId(parentId.longValue(), type)); + maTypeVos.addAll(typeService.getListByParentId(parentId.longValue(), maTypeVo)); } Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); - List result = typeService.getMyTypeAndBindUsers(myTypeList); - return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, result)); + if (BooleanUtils.isTrue(maTypeVo.getDisplayBindRelationship())) { + List newMaTypeVos = typeService.getMyTypeAndBindUsers(maTypeVos); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, newMaTypeVos)); + } else { + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, maTypeVos)); + } } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/MaTypeConfigDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/dto/MaTypeConfigDto.java similarity index 96% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/MaTypeConfigDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/dto/MaTypeConfigDto.java index 4919a6cf..b23f34ab 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/MaTypeConfigDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/dto/MaTypeConfigDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.ma; +package com.bonus.material.ma.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeConfigVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeConfigVo.java similarity index 97% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeConfigVo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeConfigVo.java index 19fe1fa2..acc4abbf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeConfigVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeConfigVo.java @@ -1,4 +1,4 @@ -package com.bonus.material.ma.vo; +package com.bonus.material.ma.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeSelectVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeSelectVo.java similarity index 89% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeSelectVo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeSelectVo.java index 2e247f91..6c4c0b92 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeSelectVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeSelectVo.java @@ -1,4 +1,4 @@ -package com.bonus.material.ma.vo; +package com.bonus.material.ma.domain.vo; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java similarity index 85% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeListVo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java index 5a8c018b..b7913fc1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MaTypeListVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MaTypeVo.java @@ -1,4 +1,4 @@ -package com.bonus.material.ma.vo; +package com.bonus.material.ma.domain.vo; import com.bonus.common.core.annotation.Excel; import com.bonus.material.ma.domain.Type; @@ -15,7 +15,7 @@ import lombok.Setter; */ @Getter @Setter -public class MaTypeListVo extends Type { +public class MaTypeVo extends Type { @Excel(name = "施工类型") @ApiModelProperty(value = "施工类型") @@ -41,4 +41,6 @@ public class MaTypeListVo extends Type { @ApiModelProperty(value = "维修员姓名") private String repairUserName; + @ApiModelProperty(value = "是否显示绑定关系") + private Boolean displayBindRelationship; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MachineVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java similarity index 95% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MachineVo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java index ef000232..f13d357c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/vo/MachineVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java @@ -1,4 +1,4 @@ -package com.bonus.material.ma.vo; +package com.bonus.material.ma.domain.vo; import com.bonus.material.ma.domain.Machine; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java index 9daab902..128b8318 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java @@ -2,10 +2,9 @@ package com.bonus.material.ma.mapper; import java.util.List; -import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.ma.domain.Machine; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.vo.MachineVo; +import com.bonus.material.ma.domain.vo.MachineVo; /** * 机具设备管理Mapper接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java index 4bcb2401..508cbed8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeMapper.java @@ -2,9 +2,9 @@ package com.bonus.material.ma.mapper; import java.util.List; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.vo.MaTypeConfigVo; -import com.bonus.material.ma.vo.MaTypeListVo; -import com.bonus.material.ma.vo.MaTypeSelectVo; +import com.bonus.material.ma.domain.vo.MaTypeConfigVo; +import com.bonus.material.ma.domain.vo.MaTypeVo; +import com.bonus.material.ma.domain.vo.MaTypeSelectVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -29,7 +29,7 @@ public interface TypeMapper { * 根据level层级和typeID 查询父级ID * @param type */ - List selectParentId(MaTypeListVo type); + List selectParentId(MaTypeVo type); /** * 根据物资仓库的ID查询物资类型列表 @@ -37,7 +37,7 @@ public interface TypeMapper { */ List selectMaTypeListByHouseId(Long houseId); - List getListByTypeName(@Param("typeId") Long typeId, @Param("type") MaTypeListVo type); + List getListByTypeName(@Param("typeId") Long typeId, @Param("type") MaTypeVo type); /** * 查询物资类型下拉树结构--根据上级ID @@ -66,7 +66,7 @@ public interface TypeMapper { * @param typeListVo 物资类型 * @return 物资类型集合 */ - List selectTypeListAndParent(Type typeListVo); + List selectTypeListAndParent(Type typeListVo); /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java index 5f031680..06b1a47e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java @@ -5,7 +5,7 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.ma.domain.Machine; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.vo.MachineVo; +import com.bonus.material.ma.domain.vo.MachineVo; /** * 机具设备管理Service接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java index 94740f4a..1e36e423 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeService.java @@ -4,11 +4,10 @@ import java.util.List; import com.bonus.common.biz.domain.TreeSelect; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.material.ma.MaTypeConfigDto; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.vo.MaTypeConfigVo; -import com.bonus.material.ma.vo.MaTypeListVo; -import com.bonus.material.ma.vo.MaTypeSelectVo; +import com.bonus.material.ma.domain.vo.MaTypeConfigVo; +import com.bonus.material.ma.domain.vo.MaTypeVo; +import com.bonus.material.ma.domain.vo.MaTypeSelectVo; /** * 物资类型Service接口 @@ -23,13 +22,13 @@ public interface ITypeService { */ Type selectTypeByTypeId(Long typeId); - List selectParentId(MaTypeListVo type); + List selectParentId(MaTypeVo type); List getEquipmentType(Long typeId, String typeName); List selectMaTypeListByHouseId(Long houseId); - List getListByParentId(Long typeId, MaTypeListVo type); + List getListByParentId(Long typeId, MaTypeVo type); /** * 查询物资类型下拉树结构--根据上级ID @@ -45,7 +44,7 @@ public interface ITypeService { */ List selectTypeList(Type type); - List selectTypeListAndParentInfo(Type type); + List selectTypeListAndParentInfo(Type type); /** @@ -100,5 +99,5 @@ public interface ITypeService { // AjaxResult getMaTypeConfigList(MaTypeConfigDto maTypeConfigDto); - List getMyTypeAndBindUsers(List list); + List getMyTypeAndBindUsers(List list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/MaTypeConfigService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/MaTypeConfigService.java deleted file mode 100644 index 57cde1a9..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/MaTypeConfigService.java +++ /dev/null @@ -1,18 +0,0 @@ -//package com.bonus.material.ma.service; -// -//import com.bonus.common.core.web.domain.AjaxResult; -//import com.bonus.material.ma.MaTypeConfigDto; -// -///** -// * @author : 阮世耀 -// * @version : 1.0 -// * @PackagePath: com.bonus.material.ma.service -// * @CreateTime: 2024-10-16 18:50 -// * @Description: 物资类型配置Service -// */ -//public interface MaTypeConfigService{ -// -// AjaxResult updateMaTypeBindInfo(MaTypeConfigDto maTypeConfigDto); -// -// AjaxResult getMaTypeConfigList(MaTypeConfigDto maTypeConfigDto); -//} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MaTypeConfigServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MaTypeConfigServiceImpl.java deleted file mode 100644 index 6021d8b7..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MaTypeConfigServiceImpl.java +++ /dev/null @@ -1,187 +0,0 @@ -//package com.bonus.material.ma.service.impl; -// -//import com.bonus.common.core.web.domain.AjaxResult; -//import com.bonus.material.ma.MaTypeConfigDto; -//import com.bonus.material.ma.domain.Type; -//import com.bonus.material.ma.domain.TypeKeeper; -//import com.bonus.material.ma.domain.TypeRepair; -//import com.bonus.material.ma.service.ITypeKeeperService; -//import com.bonus.material.ma.service.ITypeRepairService; -//import com.bonus.material.ma.service.ITypeService; -//import com.bonus.material.ma.service.MaTypeConfigService; -//import com.bonus.material.ma.vo.MaTypeConfigVo; -//import org.springframework.stereotype.Service; -// -//import javax.annotation.Resource; -//import java.util.ArrayList; -//import java.util.List; -// -///** -// * @author : 阮世耀 -// * @version : 1.0 -// * @PackagePath: com.bonus.material.ma.service.impl -// * @CreateTime: 2024-10-16 18:50 -// * @Description: 描述 -// */ -//@Service -//public class MaTypeConfigServiceImpl implements MaTypeConfigService { -// -// /** -// * 物资类型库管员配置Service -// */ -// @Resource -// private ITypeKeeperService typeKeeperService; -// -// /** -// * 物资类型维修员配置Service -// */ -// @Resource -// private ITypeRepairService typeRepairService; -// -// // 物资类型Service -// @Resource -// private ITypeService typeService; -// -// -// @Override -// public AjaxResult updateMaTypeBindInfo(MaTypeConfigDto maTypeConfigDto) { -// int result; -// switch (maTypeConfigDto.getBindFlag()) { -// case 1: -// result = handleBind(maTypeConfigDto.getBindRoleType(), maTypeConfigDto.getTypeId(), maTypeConfigDto.getUserId()); -// return result == 1 ? AjaxResult.success("绑定成功") : AjaxResult.error("绑定失败"); -// case 2: -// result = handleUnBind(maTypeConfigDto.getBindRoleType(), maTypeConfigDto.getTypeId(), maTypeConfigDto.getUserId()); -// return result == 1 ? AjaxResult.success("解绑成功") : AjaxResult.error("解绑失败"); -// default: -// // 处理其他情况或抛出异常 -// return AjaxResult.error("输入值不合法 bindFlag: " + maTypeConfigDto.getBindFlag()); -// } -// } -// -// @Override -// public AjaxResult getMaTypeConfigList(MaTypeConfigDto maTypeConfigDto) { -// // 1.把所有物资类型查出来 -// List list = typeService.selectThreeFourLevelTypeListAndParent(new Type()); -// // 2.把维修配置信息查出来 -// List typeRepairList = typeRepairService.selectTypeRepairListAndUserName(new TypeRepair()); -// // 3.把库管配置信息查出来 -// List typeKeeperList = typeKeeperService.selectTypeKeeperListAndUserName(new TypeKeeper()); -// -// // ------------------- 开启数据处理 --------------------- -// -// // 4.循环所有物资类型,重型数据集合保障只循环一次，减少性能损失 -// for (MaTypeConfigVo typeConfigVo1 : list) { -// // 1.外层 先对比维修班组 -// for (TypeRepair typeRepair : typeRepairList) { -// // 2.判断当前维修配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id -// if (typeRepair.getTypeId().equals(typeConfigVo1.getTypeId())) { -// // 3.如果相等，把维修员信息设置到物资类型配置信息中 -// typeConfigVo1.setRepairUserId(typeRepair.getUserId()); -// typeConfigVo1.setRepairUserName(typeRepair.getUserName()); -// break; -// } -// } -// // 1.外层 再对比库管班组 -// for (TypeKeeper typeKeeper : typeKeeperList) { -// // 2.判断当前库管配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id -// if (typeKeeper.getTypeId().equals(typeConfigVo1.getTypeId())) { -// // 3.如果相等，把库管员信息设置到物资类型配置信息中 -// typeConfigVo1.setKeeperUserId(typeKeeper.getUserId()); -// typeConfigVo1.setKeeperUserName(typeKeeper.getUserName()); -// } -// } -// -// // 5.判断当前物资类型配置信息是否有子节点 -// if (typeConfigVo1.getChildren() != null) { -// // 6.有子节点，继续循环子节点，判断子节点是否有维修配置信息 -// for (MaTypeConfigVo typeConfigVo2 : typeConfigVo1.getChildren()) { -// // 7.有维修配置信息，把维修员信息设置到子节点中 -// for (TypeRepair typeRepair : typeRepairList) { -// if (typeRepair.getTypeId().equals(typeConfigVo2.getTypeId())) { -// typeConfigVo2.setRepairUserId(typeRepair.getUserId()); -// typeConfigVo2.setRepairUserName(typeRepair.getUserName()); -// } -// } -// } -// -// // 8.有子节点，继续循环子节点， -// for (MaTypeConfigVo typeConfigVo3 : typeConfigVo1.getChildren()) { -// // 9.判断子节点是否有库管配置信息 -// for (TypeKeeper typeKeeper : typeKeeperList) { -// if (typeKeeper.getTypeId().equals(typeConfigVo3.getTypeId())) { -// typeConfigVo3.setKeeperUserId(typeKeeper.getUserId()); -// typeConfigVo3.setKeeperUserName(typeKeeper.getUserName()); -// } -// } -// } -// } -// -// } -// -// // -------------------- 数据处理结束 --------------------- -// -// // TODO: 先暂时取消后续过滤流程 -// if (true) { -// return AjaxResult.success(list); -// } -// -// -// // ------------------- 数据过滤开始 --------------------- -// if (maTypeConfigDto == null || maTypeConfigDto.getUserId() == null || maTypeConfigDto.getUserId() == 0L) { -// // 如果参数无效，则返回原始列表 -// return AjaxResult.success(list); -// } -// -// List filteredList = new ArrayList<>(); -// -// for (MaTypeConfigVo maTypeConfigVo : list) { -// if ( -// maTypeConfigVo.getKeeperUserId().equals(maTypeConfigDto.getUserId()) || -// maTypeConfigVo.getRepairUserId().equals(maTypeConfigDto.getUserId()) -// ) -// { -// filteredList.add(maTypeConfigVo); -// } -// } -// -// // ------------------- 数据过滤结束 --------------------- -// -// -// // 返回前端 -// return AjaxResult.success(filteredList); -// } -// -// -// private int handleBind(int bindRoleType, Long typeId, Long userId) { -// switch (bindRoleType) { -// case 1: -// // 处理 bindFlag 为 1:绑定 且 bindRoleType 为 1:库管员 的情况 -// // TODO: 实现具体逻辑 -// return typeKeeperService.insertTypeKeeper(new TypeKeeper(typeId, userId)); -// case 2: -// // 处理 bindFlag 为 1:绑定 且 bindRoleType 为 2:维修员 的情况 -// // TODO: 实现具体逻辑 -// return typeRepairService.insertTypeRepair(new TypeRepair(typeId, userId)); -// default: -// // 处理其他情况或抛出异常 -// throw new IllegalArgumentException("Unsupported bindRoleType: " + bindRoleType); -// } -// } -// -// private int handleUnBind(int bindRoleType, Long typeId, Long userId) { -// switch (bindRoleType) { -// case 1: -// // 处理 bindFlag 为 2:解绑 且 bindRoleType 为 1:库管员 的情况 -// // TODO: 实现具体逻辑 -// return typeKeeperService.deleteTypeKeeperByUserIdAndTypeId(new TypeKeeper(typeId, userId)); -// case 2: -// // 处理 bindFlag 为 2:解绑 且 bindRoleType 为 2:维修员 的情况 -// // TODO: 实现具体逻辑 -// return typeRepairService.deleteTypeRepairByUserIdAndTypeId(new TypeRepair(typeId, userId)); -// default: -// // 处理其他情况或抛出异常 -// throw new IllegalArgumentException("Unsupported bindRoleType: " + bindRoleType); -// } -// } -//} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java index 8cacab5c..defa1a4b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java @@ -12,7 +12,7 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.ma.domain.Type; -import com.bonus.material.ma.vo.MachineVo; +import com.bonus.material.ma.domain.vo.MachineVo; import com.bonus.material.purchase.config.RemoteConfig; import com.bonus.system.api.RemoteUserService; import com.bonus.system.api.domain.SysUser; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java index c98f2e93..f835869b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeServiceImpl.java @@ -11,14 +11,13 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.ma.MaTypeConfigDto; import com.bonus.material.ma.domain.TypeKeeper; import com.bonus.material.ma.domain.TypeRepair; import com.bonus.material.ma.service.ITypeKeeperService; import com.bonus.material.ma.service.ITypeRepairService; -import com.bonus.material.ma.vo.MaTypeConfigVo; -import com.bonus.material.ma.vo.MaTypeListVo; -import com.bonus.material.ma.vo.MaTypeSelectVo; +import com.bonus.material.ma.domain.vo.MaTypeConfigVo; +import com.bonus.material.ma.domain.vo.MaTypeVo; +import com.bonus.material.ma.domain.vo.MaTypeSelectVo; import com.bonus.material.warehouse.domain.WhHouseSet; import com.bonus.material.warehouse.service.IWhHouseSetService; import org.apache.commons.collections4.CollectionUtils; @@ -64,7 +63,7 @@ public class TypeServiceImpl implements ITypeService { } @Override - public List selectParentId(MaTypeListVo type) { + public List selectParentId(MaTypeVo type) { return typeMapper.selectParentId(type); } @@ -103,7 +102,7 @@ public class TypeServiceImpl implements ITypeService { * @param type 名称筛选 */ @Override - public List getListByParentId(Long typeId, MaTypeListVo type) { + public List getListByParentId(Long typeId, MaTypeVo type) { return typeMapper.getListByTypeName(typeId, type); } @@ -140,54 +139,54 @@ public class TypeServiceImpl implements ITypeService { * @return 物资类型管理 */ @Override - public List selectTypeListAndParentInfo(Type type) { + public List selectTypeListAndParentInfo(Type type) { // 如果是顶级节点，则查询所有子节点 if (type != null && type.getLevel() != null && "0".equals(type.getLevel())) { type.setLevel(null); } // 拿到数据要处理一下上级信息 - List maTypeListVos; + List maTypeVos; try { - maTypeListVos = typeMapper.selectTypeListAndParent(type); + maTypeVos = typeMapper.selectTypeListAndParent(type); } catch (Exception e) { throw new RuntimeException(e.getMessage()); } // 检查Mapper集合 - if (maTypeListVos == null || maTypeListVos.isEmpty()) { + if (maTypeVos == null || maTypeVos.isEmpty()) { return new ArrayList<>(); } - for (MaTypeListVo maTypeListVo : maTypeListVos) { + for (MaTypeVo maTypeVo : maTypeVos) { // ------------ 检查 ----------- // object对象是空的，忽略处理 - if (maTypeListVo == null) { + if (maTypeVo == null) { continue; } // 没有上级就不需要处理，或者level等级不清晰的也不进行处理 - if (maTypeListVo.getParentId() == null || maTypeListVo.getLevel() == null) { + if (maTypeVo.getParentId() == null || maTypeVo.getLevel() == null) { continue; } // 1级节点已经是顶级，无上级，所以不需要处理 - if ("1".equals(maTypeListVo.getLevel())) { + if ("1".equals(maTypeVo.getLevel())) { continue; } // ------------ 检查结束 ----------- // 进行数据处理 - switch (maTypeListVo.getLevel()) { + switch (maTypeVo.getLevel()) { case "2": // 二级节点父级是一级节点，所以要拿到父节点名称，并赋值至ONE_LEVEL_NAME字段 - maTypeListVo.setItemType(maTypeListVo.getMaterialName() == null ? "" : maTypeListVo.getMaterialName()); + maTypeVo.setItemType(maTypeVo.getMaterialName() == null ? "" : maTypeVo.getMaterialName()); break; case "3": // 三级节点父级是二级节点和一级节点， 要把祖父类型名称放入一级字段，把父类型名称存入二级字段 - maTypeListVo.setItemType(maTypeListVo.getMaterialType() == null ? "" : maTypeListVo.getMaterialType()); - maTypeListVo.setMaterialType(maTypeListVo.getMaterialName() == null ? "" : maTypeListVo.getMaterialName()); + maTypeVo.setItemType(maTypeVo.getMaterialType() == null ? "" : maTypeVo.getMaterialType()); + maTypeVo.setMaterialType(maTypeVo.getMaterialName() == null ? "" : maTypeVo.getMaterialName()); break; case "4": // 四级节点父级是三级节点和二级节点和一级节点， 要把祖父类型名称放入一级字段，把父类型名称存入二级字段，子类型名称存入三级字段 @@ -196,7 +195,7 @@ public class TypeServiceImpl implements ITypeService { } } - return maTypeListVos; + return maTypeVos; } /** @@ -548,24 +547,24 @@ public class TypeServiceImpl implements ITypeService { // } @Override - public List getMyTypeAndBindUsers(List list) { + public List getMyTypeAndBindUsers(List list) { List typeRepairList = typeRepairService.selectTypeRepairListAndUserName(new TypeRepair()); List typeKeeperList = typeKeeperService.selectTypeKeeperListAndUserName(new TypeKeeper()); - for (MaTypeListVo maTypeListVo : list) { + for (MaTypeVo maTypeVo : list) { if (CollectionUtils.isNotEmpty(typeRepairList)) { for (TypeRepair typeRepair : typeRepairList) { - if (Objects.nonNull(typeRepair.getTypeId()) && typeRepair.getTypeId().equals(maTypeListVo.getTypeId())) { - maTypeListVo.setRepairUserId(typeRepair.getUserId()); - maTypeListVo.setRepairUserName(typeRepair.getUserName()); + if (Objects.nonNull(typeRepair.getTypeId()) && typeRepair.getTypeId().equals(maTypeVo.getTypeId())) { + maTypeVo.setRepairUserId(typeRepair.getUserId()); + maTypeVo.setRepairUserName(typeRepair.getUserName()); break; } } } if (CollectionUtils.isNotEmpty(typeKeeperList)) { for (TypeKeeper typeKeeper : typeKeeperList) { - if (Objects.nonNull(typeKeeper.getTypeId()) && typeKeeper.getTypeId().equals(maTypeListVo.getTypeId())) { - maTypeListVo.setKeeperUserId(typeKeeper.getUserId()); - maTypeListVo.setKeeperUserName(typeKeeper.getUserName()); + if (Objects.nonNull(typeKeeper.getTypeId()) && typeKeeper.getTypeId().equals(maTypeVo.getTypeId())) { + maTypeVo.setKeeperUserId(typeKeeper.getUserId()); + maTypeVo.setKeeperUserName(typeKeeper.getUserName()); } } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java index daf5bbc1..83687b5c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java @@ -8,9 +8,9 @@ import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.material.purchase.dto.PurchaseDto; +import com.bonus.material.purchase.domain.dto.PurchaseDto; import com.bonus.material.purchase.service.IPurchaseBindService; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java index b3f3f83f..287b0407 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.purchase.dto.PurchaseCheckFileDto; +import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index bc6a6642..9611c33e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -9,12 +9,11 @@ import javax.validation.constraints.NotNull; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.purchase.dto.PurchaseCheckDto; -import com.bonus.material.purchase.dto.PurchaseQueryDto; -import com.bonus.material.purchase.vo.PurchaseCheckFormVo; +import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; +import com.bonus.material.purchase.domain.dto.PurchaseQueryDto; +import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java index adf61651..8c298420 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java @@ -8,10 +8,9 @@ import javax.validation.constraints.NotNull; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.purchase.dto.PurchaseNoticePersonDto; +import com.bonus.material.purchase.domain.dto.PurchaseNoticePersonDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java index d3c65457..53f507e2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java @@ -8,9 +8,9 @@ import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.purchase.dto.PurchaseDto; +import com.bonus.material.purchase.domain.dto.PurchaseDto; import com.bonus.material.purchase.service.IPurchaseStorageService; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseAcceptDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseAcceptDto.java similarity index 90% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseAcceptDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseAcceptDto.java index 58f5066f..d6c78700 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseAcceptDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseAcceptDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.dto; +package com.bonus.material.purchase.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseCheckDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckDto.java similarity index 95% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseCheckDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckDto.java index c8c65134..bb5a378e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseCheckDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.dto; +package com.bonus.material.purchase.domain.dto; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.PurchaseCheckInfo; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseCheckFileDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java similarity index 96% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseCheckFileDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java index da0240f7..6fb93b5d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseCheckFileDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.dto; +package com.bonus.material.purchase.domain.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java similarity index 97% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java index 9e184331..86aaefae 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.dto; +package com.bonus.material.purchase.domain.dto; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseNoticePersonDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseNoticePersonDto.java similarity index 95% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseNoticePersonDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseNoticePersonDto.java index 1e1bcccf..ef6f2cd2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseNoticePersonDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseNoticePersonDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.dto; +package com.bonus.material.purchase.domain.dto; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseQueryDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java similarity index 95% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseQueryDto.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java index 98523f95..bfb26ff2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/dto/PurchaseQueryDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseQueryDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.dto; +package com.bonus.material.purchase.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/vo/PurchaseCheckFormVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseCheckFormVo.java similarity index 95% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/vo/PurchaseCheckFormVo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseCheckFormVo.java index a117a45b..1eb30397 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/vo/PurchaseCheckFormVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseCheckFormVo.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.vo; +package com.bonus.material.purchase.domain.vo; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/vo/PurchaseVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java similarity index 98% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/vo/PurchaseVo.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java index 4d2927af..fc31ba8d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/vo/PurchaseVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java @@ -1,4 +1,4 @@ -package com.bonus.material.purchase.vo; +package com.bonus.material.purchase.domain.vo; import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java index 6aa90310..3db18fc2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseBindMapper.java @@ -1,7 +1,7 @@ package com.bonus.material.purchase.mapper; -import com.bonus.material.purchase.dto.PurchaseDto; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.dto.PurchaseDto; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index 30373990..8d72eadc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.purchase.mapper; import java.util.List; import com.bonus.material.purchase.domain.PurchaseCheckDetails; -import com.bonus.material.purchase.dto.PurchaseQueryDto; +import com.bonus.material.purchase.domain.dto.PurchaseQueryDto; import org.apache.ibatis.annotations.Param; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java index 1ad2f10c..c4b4afc6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java @@ -1,7 +1,6 @@ package com.bonus.material.purchase.mapper; -import com.bonus.material.purchase.domain.PurchaseCheckDetails; -import com.bonus.material.purchase.dto.PurchaseCheckFileDto; +import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java index 30c6e22f..bf641ea6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java @@ -2,7 +2,7 @@ package com.bonus.material.purchase.mapper; import java.util.List; import com.bonus.material.purchase.domain.PurchaseCheckInfo; -import com.bonus.material.purchase.vo.PurchaseCheckFormVo; +import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; /** * 新购验收任务Mapper接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java index 1e83eee9..15d50a8a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseStorageMapper.java @@ -1,7 +1,7 @@ package com.bonus.material.purchase.mapper; -import com.bonus.material.purchase.dto.PurchaseDto; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.dto.PurchaseDto; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java index 852feb6b..7e7c7bc3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java @@ -1,8 +1,8 @@ package com.bonus.material.purchase.service; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.material.purchase.dto.PurchaseDto; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.dto.PurchaseDto; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java index e56515d4..924732b3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java @@ -4,7 +4,7 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.purchase.domain.PurchaseCheckDetails; -import com.bonus.material.purchase.dto.PurchaseCheckFileDto; +import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; import org.apache.ibatis.annotations.Param; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java index d02b91d6..7d39fa8f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java @@ -4,9 +4,9 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.purchase.domain.PurchaseCheckInfo; -import com.bonus.material.purchase.dto.PurchaseCheckDto; -import com.bonus.material.purchase.dto.PurchaseQueryDto; -import com.bonus.material.purchase.vo.PurchaseCheckFormVo; +import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; +import com.bonus.material.purchase.domain.dto.PurchaseQueryDto; +import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; /** * 新购验收任务Service接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java index e80db601..61ac332a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseNoticePersonService.java @@ -4,7 +4,7 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.purchase.domain.PurchaseNoticePerson; -import com.bonus.material.purchase.dto.PurchaseNoticePersonDto; +import com.bonus.material.purchase.domain.dto.PurchaseNoticePersonDto; /** * 新购短信通知人员Service接口 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseStorageService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseStorageService.java index 84eee556..f169ce33 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseStorageService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseStorageService.java @@ -1,8 +1,8 @@ package com.bonus.material.purchase.service; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.material.purchase.dto.PurchaseDto; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.dto.PurchaseDto; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index e69d9297..095fa4bf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -10,10 +10,10 @@ import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.purchase.config.RemoteConfig; -import com.bonus.material.purchase.dto.PurchaseDto; +import com.bonus.material.purchase.domain.dto.PurchaseDto; import com.bonus.material.purchase.mapper.PurchaseBindMapper; import com.bonus.material.purchase.service.IPurchaseBindService; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import com.bonus.material.task.mapper.TmTaskMapper; import com.google.zxing.WriterException; import lombok.extern.slf4j.Slf4j; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java index 7b99f508..55aded46 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -5,10 +5,8 @@ import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.purchase.dto.PurchaseCheckFileDto; +import com.bonus.material.purchase.domain.dto.PurchaseCheckFileDto; import com.bonus.material.purchase.mapper.PurchaseCheckFileMapper; -import com.bonus.material.purchase.mapper.PurchaseCheckInfoMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.purchase.mapper.PurchaseCheckDetailsMapper; import com.bonus.material.purchase.domain.PurchaseCheckDetails; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 54dd92ad..ee261d38 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -14,10 +14,10 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.purchase.config.PurchaseTaskEnum; import com.bonus.material.purchase.domain.PurchaseCheckDetails; -import com.bonus.material.purchase.dto.PurchaseCheckDto; -import com.bonus.material.purchase.dto.PurchaseQueryDto; +import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; +import com.bonus.material.purchase.domain.dto.PurchaseQueryDto; import com.bonus.material.purchase.mapper.PurchaseCheckDetailsMapper; -import com.bonus.material.purchase.vo.PurchaseCheckFormVo; +import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.mapper.TmTaskMapper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java index f11233cb..0b0328f3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseNoticePersonServiceImpl.java @@ -7,7 +7,7 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.sms.SmsUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.purchase.config.PurchaseTaskEnum; -import com.bonus.material.purchase.dto.PurchaseNoticePersonDto; +import com.bonus.material.purchase.domain.dto.PurchaseNoticePersonDto; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.mapper.TmTaskMapper; import org.springframework.stereotype.Service; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java index 30cca06a..5003092b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -7,11 +7,11 @@ import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.ma.mapper.MachineMapper; import com.bonus.material.purchase.config.RemoteConfig; -import com.bonus.material.purchase.dto.PurchaseDto; +import com.bonus.material.purchase.domain.dto.PurchaseDto; import com.bonus.material.purchase.mapper.PurchaseBindMapper; import com.bonus.material.purchase.mapper.PurchaseStorageMapper; import com.bonus.material.purchase.service.IPurchaseStorageService; -import com.bonus.material.purchase.vo.PurchaseVo; +import com.bonus.material.purchase.domain.vo.PurchaseVo; import com.bonus.material.task.mapper.TmTaskMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index ffba0dc9..6adb0c31 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ma_id, type_id, ma_code, pre_code, ma_status, qr_code, buy_price, ma_vender, out_fac_time, out_fac_code, assets_code, check_man, this_check_time, next_check_time, gps_code, rfid_code, erp_code, transfer_code, in_out_num, buy_task, own_house, company_id, create_time, update_time, inspect_man, inspect_status, phone from ma_machine - SELECT ma.ma_id as maId, ma.type_id as typeId, @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by ma.create_time desc - SELECT ma.ma_id as maId, ma.type_id as typeId, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index a5faa174..9dc83c17 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = 0 and level != #{level} - SELECT a.*, -- 当前层级的所有字段 b.type_name AS parentThreeLevelName, -- 父层级名称 @@ -320,7 +320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select wh_house_set.type_id AS typeId, mt.type_name AS typeName,mt.parent_id AS parentId,mt.level @@ -332,7 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" wh_house_set.house_id = #{mouseId} and wh_house_set.del_flag = 0 - select type_id as typeId, type_name as typeName, @@ -406,7 +406,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT DISTINCT m3.type_name AS itemType, m2.type_name AS materialType, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index 1d72459a..2826b558 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT pci.task_id as taskId, pci.arrival_time as arrivalTime, @@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pci.arrival_time DESC - SELECT pm.task_id AS taskId, pcd.id AS purchaseId, @@ -202,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT pcd.task_id AS taskId, pcd.id AS purchaseId, @@ -244,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.type_id - SELECT qr_code as qrCode FROM @@ -255,7 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" qr_code DESC - SELECT task_id as taskId, type_id as typeId, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index 9de1e6d4..ab814a07 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where pcd.task_id = #{taskId} - where pcd.task_id = #{taskId} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml index 30bc29bb..7f33a0b6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into bm_file_info model_id, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index 4cfcfce3..552f033d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml index c93a5b3d..5aed2901 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_id = #{typeId} - SELECT pci.task_id as taskId, pci.arrival_time as arrivalTime, @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT pcd.task_id AS taskId, pcd.id AS purchaseId, @@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.type_id - SELECT pcd.task_id as taskId, pcd.status as STATUS From 3cbe0af7d394e9a2fae5aae4bfbee54198473f01 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 15:44:44 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/ma/controller/TypeController.java | 8 ++++++-- .../src/main/resources/mapper/material/ma/TypeMapper.xml | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java index 114ab25a..010f89ff 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java @@ -16,6 +16,7 @@ import com.bonus.material.ma.domain.vo.MaTypeSelectVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.BooleanUtils; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; @@ -68,12 +69,15 @@ public class TypeController extends BaseController { @GetMapping("/getListByMaType") public AjaxResult getListByMaType(MaTypeVo maTypeVo) { List parentIds = typeService.selectParentId(maTypeVo); + if (CollectionUtils.isEmpty(parentIds)) { + return AjaxResult.success(new ArrayList<>()); + } List maTypeVos = new ArrayList<>(); + Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); for (Integer parentId : parentIds) { maTypeVos.addAll(typeService.getListByParentId(parentId.longValue(), maTypeVo)); } - Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); - Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); if (BooleanUtils.isTrue(maTypeVo.getDisplayBindRelationship())) { List newMaTypeVos = typeService.getMyTypeAndBindUsers(maTypeVos); return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, newMaTypeVos)); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index 9dc83c17..03db2353 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -138,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id + LEFT JOIN wh_house_set mhs on mt4.type_id = mhs.type_id and mt4.type_id = #{typeId} @@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mt.level = 4 and mt2.type_id is not null + and mhs.house_id = #{houseId} and mhs.del_flag = 0 From 0b18bac4dd809857f705ce96deea35d0f39fb6dc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 16:10:55 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/ma/controller/TypeController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java index 010f89ff..01f022de 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeController.java @@ -2,6 +2,7 @@ package com.bonus.material.ma.controller; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; @@ -78,11 +79,16 @@ public class TypeController extends BaseController { for (Integer parentId : parentIds) { maTypeVos.addAll(typeService.getListByParentId(parentId.longValue(), maTypeVo)); } + List updatedMaTypeVos = maTypeVos.stream() + .map(obj -> { + obj.setHouseId(maTypeVo.getHouseId()); + return obj; + }).collect(Collectors.toList()); if (BooleanUtils.isTrue(maTypeVo.getDisplayBindRelationship())) { - List newMaTypeVos = typeService.getMyTypeAndBindUsers(maTypeVos); - return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, newMaTypeVos)); + List finalMaTypeVos = typeService.getMyTypeAndBindUsers(updatedMaTypeVos); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, finalMaTypeVos)); } else { - return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, maTypeVos)); + return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, updatedMaTypeVos)); } } From 6f832bd06d75d092911b5538df2098901646cc4f Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 16:30:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/constant/BmConfigItems.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java index cbc8f32e..03aa47cb 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java @@ -6,13 +6,13 @@ package com.bonus.common.biz.constant; */ public class BmConfigItems { - public static final String KU_GUAN_ROLE_IDS = "KuGuanRoleIDs"; + public static final String KU_GUAN_ROLE_IDS = "ku_guan_role_ids"; - public static final String WEI_XIU_ROLE_IDS = "KuGuanRoleIDs"; + public static final String WEI_XIU_ROLE_IDS = "wei_xiu_role_ids"; - public static final String LEASE_TASK_AUDIT_ROLE_IDS = "LeaseTaskAuditRoleIDs"; + public static final String LEASE_TASK_AUDIT_ROLE_IDS = "lease_task_audit_role_ids"; - public static final String BACK_TASK_AUDIT_ROLE_IDS = "BackTaskAuditRoleIDs"; + public static final String BACK_TASK_AUDIT_ROLE_IDS = "back_task_audit_role_ids"; From 27b36422fec52c5759f4496c167b5aa1dc2f85a8 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 17:16:46 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseCheckDetails.java | 11 ++++++++--- .../purchase/PurchaseCheckDetailsMapper.xml | 13 +++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java index 498a8bde..4c4b13cc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java @@ -43,11 +43,16 @@ public class PurchaseCheckDetails extends BaseEntity { @ApiModelProperty(value = "物资名称--规格parent类型") private String maTypeName; - /** 采购单价 */ - @Excel(name = "采购单价") - @ApiModelProperty(value = "采购单价") + /** 采购单价(不含税) */ + @Excel(name = "采购单价(不含税)") + @ApiModelProperty(value = "采购单价(不含税)") private BigDecimal purchasePrice; + /** 采购单价(含税) */ + @Excel(name = "采购单价(含税)") + @ApiModelProperty(value = "采购单价(含税)") + private BigDecimal purchaseTaxPrice; + /** 采购数量 */ @Excel(name = "采购数量") @ApiModelProperty(value = "采购数量") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index ab814a07..67d9fc17 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -34,11 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, task_id, type_id, purchase_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id from purchase_check_details + select id, task_id, type_id, purchase_price, purchase_tax_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id from purchase_check_details - select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result, + select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_tax_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result, pcd.supplier_id, pcd.status, pcd.create_by, pcd.production_time, pcd.create_time, pcd.update_by, pcd.update_time, pcd.remark, pcd.check_url_name, pcd.check_url, pcd.input_num, pcd.input_status, pcd.input_time, pcd.file_name, pcd.file_url, pcd.company_id, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name @@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and task_id = #{taskId} and type_id = #{typeId} and purchase_price = #{purchasePrice} + and purchase_tax_price = #{purchaseTaxPrice} and purchase_num = #{purchaseNum} and check_num = #{checkNum} and bind_num = #{bindNum} @@ -109,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" task_id, type_id, purchase_price, + purchase_tax_price, purchase_num, check_num, bind_num, @@ -134,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{taskId}, #{typeId}, #{purchasePrice}, + #{purchaseTaxPrice}, #{purchaseNum}, #{checkNum}, #{bindNum}, @@ -163,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" task_id = #{taskId}, type_id = #{typeId}, purchase_price = #{purchasePrice}, + purchase_tax_price = #{purchaseTaxPrice}, purchase_num = #{purchaseNum}, check_num = #{checkNum}, bind_num = #{bindNum}, @@ -219,8 +224,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into purchase_check_details(task_id,type_id,purchase_price,purchase_num,check_num,bind_num,check_result,supplier_id,status,production_time,create_by,create_time,update_by,update_time,remark,check_url_name,check_url,input_num,input_status,input_time,file_name,file_url,company_id) - values(#{item.taskId},#{item.typeId},#{item.purchasePrice},#{item.purchaseNum},#{item.checkNum},#{item.bindNum},#{item.checkResult},#{item.supplierId},#{item.status},#{item.productionTime},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.checkUrlName},#{item.checkUrl},#{item.inputNum},#{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId}) + insert into purchase_check_details(task_id,type_id,purchase_price,purchase_tax_price,purchase_num,check_num,bind_num,check_result,supplier_id,status,production_time,create_by,create_time,update_by,update_time,remark,check_url_name,check_url,input_num,input_status,input_time,file_name,file_url,company_id) + values(#{item.taskId},#{item.typeId},#{item.purchasePrice},#{item.purchaseTaxPrice},#{item.purchaseNum},#{item.checkNum},#{item.bindNum},#{item.checkResult},#{item.supplierId},#{item.status},#{item.productionTime},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.checkUrlName},#{item.checkUrl},#{item.inputNum},#{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId}) From c2eb7afc08ad4b953daba2fbd994b4e70cbdf9c8 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 17:31:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/purchase/domain/PurchaseCheckInfo.java | 2 +- .../service/impl/PurchaseCheckInfoServiceImpl.java | 10 +++++----- .../material/purchase/PurchaseCheckInfoMapper.xml | 10 ++++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index 8726cd0b..75db7091 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -84,7 +84,7 @@ public class PurchaseCheckInfo extends BaseEntity { * 采购不含税价格 */ @ApiModelProperty(value = "采购不含税价格--外层Table字段") - private BigDecimal purchaseNoTaxPrice; + private BigDecimal purchasePrice; /** * 税率 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index ee261d38..cce05603 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -105,7 +105,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { // 采购物资数量 AtomicLong purchaseMaTotalNumber = new AtomicLong(0L); // 采购物资不含税价格 - AtomicReference purchaseMaTotalNoTaxPrice = new AtomicReference<>(BigDecimal.ZERO); + AtomicReference purchaseMaTotalPrice = new AtomicReference<>(BigDecimal.ZERO); // 执行for循环统计采购物资数量、价格 for (PurchaseCheckDetails detail : purchaseCheckDetails) { @@ -119,17 +119,17 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { // 统计采购数量 purchaseMaTotalNumber.addAndGet(detail.getPurchaseNum()); // 采购物资数量乘以采购不含税价格 - purchaseMaTotalNoTaxPrice.updateAndGet(v -> v.add(new BigDecimal(detail.getPurchaseNum()).multiply(detail.getPurchasePrice()))); + purchaseMaTotalPrice.updateAndGet(v -> v.add(new BigDecimal(detail.getPurchaseNum()).multiply(detail.getPurchasePrice()))); } // 赋值统计出来的采购物资数量、不含税价格 purchaseCheckInfo.setPurchaseMaNumber(purchaseMaTotalNumber.get()); - purchaseCheckInfo.setPurchaseNoTaxPrice(purchaseMaTotalNoTaxPrice.get()); + purchaseCheckInfo.setPurchasePrice(purchaseMaTotalPrice.get()); // 通过不含税价格及税率，计算出含税价格并赋值 - if (purchaseCheckInfo.getTaxRate() != null && purchaseCheckInfo.getPurchaseNoTaxPrice() != null) { + if (purchaseCheckInfo.getTaxRate() != null && purchaseCheckInfo.getPurchasePrice() != null) { purchaseCheckInfo.setPurchaseTaxPrice( - calculateTaxPrice(purchaseMaTotalNoTaxPrice.get(), new BigDecimal(purchaseCheckInfo.getTaxRate())) + calculateTaxPrice(purchaseMaTotalPrice.get(), new BigDecimal(purchaseCheckInfo.getTaxRate())) ); } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index 552f033d..278415ea 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - id, task_id, purchase_time, arrival_time, purchaser, create_by, + id, task_id, purchase_time, arrival_time, purchaser, tax_rate, reate_by, create_time, update_by, update_time, remark, company_id from purchase_check_info @@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, + pci.id, pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.tax_rate, pci.create_by, pci.create_time, pci.update_by, pci.update_time, pci.remark, pci.company_id, t.task_status, t.task_type, t.code, su.user_name as create_user_name from @@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and purchase_time = #{purchaseTime} and arrival_time = #{arrivalTime} and purchaser = #{purchaser} + and tax_rate = #{taxRate} and company_id = #{companyId} @@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_time, arrival_time, purchaser, + tax_rate, create_by, create_time, update_by, @@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{purchaseTime}, #{arrivalTime}, #{purchaser}, + #{taxRate}, #{createBy}, #{createTime}, #{updateBy}, @@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_time = #{purchaseTime}, arrival_time = #{arrivalTime}, purchaser = #{purchaser}, + tax_rate = #{taxRate}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, @@ -124,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pci.purchase_time = #{purchaseTime} and pci.arrival_time = #{arrivalTime} and pci.purchaser = #{purchaser} + and pci.tax_rate = #{taxRate} From ba8c4630940311683e141f67e122e79c7f945d9c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 17:38:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/domain/PurchaseCheckInfo.java | 16 ++++++++-------- .../impl/PurchaseCheckInfoServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index 75db7091..76f72edf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -75,23 +75,23 @@ public class PurchaseCheckInfo extends BaseEntity { private Long purchaseMaNumber; /** - * 采购含税价格 + * 采购单价(不含税) */ - @ApiModelProperty(value = "采购含税价格--外层Table字段") - private BigDecimal purchaseTaxPrice; + @ApiModelProperty(value = "采购单价(不含税)--外层Table字段") + private BigDecimal purchasePrice; /** - * 采购不含税价格 + * 采购单价(含税) */ - @ApiModelProperty(value = "采购不含税价格--外层Table字段") - private BigDecimal purchasePrice; + @ApiModelProperty(value = "采购单价(含税)--外层Table字段") + private BigDecimal purchaseTaxPrice; /** * 税率 */ - @ApiModelProperty(value = "税率--Int整形 0~100") + @ApiModelProperty(value = "税率 0~100") @Size(max = 100, message = "税率长度必须介于 0 和 100 之间") - private Integer taxRate; + private BigDecimal taxRate; @ApiModelProperty(value = "操作人名称") private String createUserName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index cce05603..a9480ee6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -129,7 +129,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { // 通过不含税价格及税率，计算出含税价格并赋值 if (purchaseCheckInfo.getTaxRate() != null && purchaseCheckInfo.getPurchasePrice() != null) { purchaseCheckInfo.setPurchaseTaxPrice( - calculateTaxPrice(purchaseMaTotalPrice.get(), new BigDecimal(purchaseCheckInfo.getTaxRate())) + calculateTaxPrice(purchaseMaTotalPrice.get(), purchaseCheckInfo.getTaxRate()) ); } } From a3bab5db4a868e47c56ef193ba46e9d902e53b89 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 17:46:30 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/purchase/PurchaseCheckInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index 278415ea..98771f7f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - id, task_id, purchase_time, arrival_time, purchaser, tax_rate, reate_by, + id, task_id, purchase_time, arrival_time, purchaser, tax_rate, create_by, create_time, update_by, update_time, remark, company_id from purchase_check_info From 3b62cf4c24711c585e6673a85e45e913bcffbc8f Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 17:53:43 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/PurchaseCheckFileDto.java | 4 ++-- .../purchase/PurchaseCheckFileMapper.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java index 6fb93b5d..290c139b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java @@ -21,11 +21,11 @@ public class PurchaseCheckFileDto { @ApiModelProperty(value = "附件名称") @NotBlank(message = "附件名称不能为空") - private String fileName; + private String name; @ApiModelProperty(value = "附件地址url") @NotBlank(message = "附件地址url不能为空") - private String fileUrl; + private String url; @ApiModelProperty(value = "任务ID") @NotBlank(message = "任务ID不能为空") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml index 7f33a0b6..8cdd713b 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml @@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + @@ -15,11 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT sdd.dict_code,sdd.dict_label, - bfi.id,bfi.file_name,bfi.file_url + bfi.id,bfi.name,bfi.url FROM sys_dict_data sdd LEFT JOIN - bm_file_info bfi ON bfi.dic_id = sdd.dict_code and bfi.task_id = #{taskId} and bfi.model_id = #{typeId} + bm_file_info bfi ON bfi.dic_id = sdd.dict_code and bfi.task_type = #{taskType} and bfi.model_id = #{typeId} WHERE sdd.dict_type = 'purchase_check_report_type' @@ -33,8 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bm_file_info model_id, - file_name, - file_url, + name, + url, dic_id, create_by, create_time, @@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{modelId,jdbcType=INTEGER}, - #{fileName,jdbcType=VARCHAR}, - #{fileUrl,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{url,jdbcType=VARCHAR}, #{dictCode}, #{createBy,jdbcType=VARCHAR}, now(), From b01b199ed591996228250af3868ca6157f47123b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 5 Nov 2024 18:03:12 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchaseCheckDetailsController.java | 2 +- .../purchase/domain/dto/PurchaseCheckFileDto.java | 8 ++++++++ .../material/purchase/mapper/PurchaseCheckFileMapper.java | 4 ++-- .../purchase/service/IPurchaseCheckDetailsService.java | 2 +- .../service/impl/PurchaseCheckDetailsServiceImpl.java | 6 +++--- .../mapper/material/purchase/PurchaseCheckFileMapper.xml | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java index 287b0407..5152bf8f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckDetailsController.java @@ -121,7 +121,7 @@ public class PurchaseCheckDetailsController extends BaseController { @GetMapping("/fileList") @SysLog(title = "新购验收任务明细报告查询", businessType = OperaType.QUERY, module = "物资新购->根据任务id查询物资报告附件") public AjaxResult getFileList(PurchaseCheckFileDto purchaseCheckFileDto) { - return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskId(Long.valueOf(purchaseCheckFileDto.getTaskId()), purchaseCheckFileDto.getTypeId())); + return success(purchaseCheckDetailsService.selectPurchaseCheckFileListByTaskType(purchaseCheckFileDto.getTaskType(), purchaseCheckFileDto.getTypeId())); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java index 290c139b..281b6e04 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseCheckFileDto.java @@ -31,6 +31,14 @@ public class PurchaseCheckFileDto { @NotBlank(message = "任务ID不能为空") private String taskId; + @ApiModelProperty(value = "任务类型") + @NotBlank(message = "任务类型不能为空") + private Long taskType; + + @ApiModelProperty(value = "文件类型") + @NotBlank(message = "文件类型不能为空") + private String fileType; + @ApiModelProperty(value = "物资类型ID") @NotNull(message = "物资类型ID不能为空") private Long typeId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java index c4b4afc6..749f1cb3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckFileMapper.java @@ -15,10 +15,10 @@ public interface PurchaseCheckFileMapper { /** * 根据任务id查询新购验收任务详细报告列表--Join查询 - * @param taskId 任务id + * @param taskType 任务id * @param typeId 规格id */ - List selectPurchaseCheckFileListByTaskId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); + List selectPurchaseCheckFileListByTaskType(@Param("taskType") Long taskType, @Param("typeId") Long typeId); /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java index 924732b3..83c73cd7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckDetailsService.java @@ -34,7 +34,7 @@ public interface IPurchaseCheckDetailsService { * 根据任务ID查询报告附件列表 * @param taskId 任务id */ - List selectPurchaseCheckFileListByTaskId(Long taskId, Long typeId); + List selectPurchaseCheckFileListByTaskType(Long taskId, Long typeId); /** * 新增报告附件 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java index 55aded46..b390ab61 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckDetailsServiceImpl.java @@ -54,12 +54,12 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer /** * 根据任务ID查询报告附件列表 * - * @param taskId 任务id + * @param taskType 任务类型 */ @Override - public List selectPurchaseCheckFileListByTaskId(Long taskId, Long typeId) { + public List selectPurchaseCheckFileListByTaskType(Long taskType, Long typeId) { try { - return purchaseCheckFileMapper.selectPurchaseCheckFileListByTaskId(taskId, typeId); + return purchaseCheckFileMapper.selectPurchaseCheckFileListByTaskType(taskType, typeId); } catch (Exception e) { throw new RuntimeException("SQL执行错误:" + e.getMessage()); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml index 8cdd713b..88299788 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckFileMapper.xml @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -