From 8b91ce834e6ae64beb2c11a5e3ee370bbc296b97 Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Thu, 19 Sep 2024 15:26:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/CompanyController.java | 6 ++ .../admin/DlRepairStController.java | 27 ++++++- .../admin/DlRepairStiController.java | 81 ++++++------------- .../stockTransfer/entity/DlRepairSt.java | 4 + .../mapper/DlRepairStMapper.java | 12 +++ .../mapper/DlRepairStiMapper.java | 12 +++ .../service/DlRepairStService.java | 12 +++ .../service/DlRepairStiService.java | 11 +++ .../service/impl/DlRepairStServiceImpl.java | 15 ++++ .../service/impl/DlRepairStiServiceImpl.java | 15 ++++ .../mapper/stockTransfer/DlRepairStMapper.xml | 10 +++ .../stockTransfer/DlRepairStiMapper.xml | 4 + .../src/main/resources/application.yaml | 2 +- 13 files changed, 151 insertions(+), 60 deletions(-) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyController.java index 6b11660b..26837fe7 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyController.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyController.java @@ -11,6 +11,8 @@ import cn.iocoder.yudao.module.company.entity.Company; import cn.iocoder.yudao.module.company.vo.CompanyRespVO; import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import cn.iocoder.yudao.module.company.vo.CompanyReqVO; @@ -56,6 +58,10 @@ public class CompanyController { @Lazy private DeptApi deptApi; + @Resource + @Lazy + private AdminUserApi adminUserApi; + @Autowired private CompanyService companyService; diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java index 49ae9c31..37958197 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java @@ -2,16 +2,18 @@ package cn.iocoder.yudao.module.stockTransfer.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStService; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO; import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStRespVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + /** * 调拨单(DlRepairSt)表控制层 * @author 小李 @@ -40,5 +42,22 @@ public class DlRepairStController{ return CommonResult.ok(); } + /** + * 调拨单（出库、入库） 分页 + * + * @author 小李 + * @date 9:20 2024/9/19 + * @param repairStReqVO 查询对象 + * @param pageNo 页码 + * @param pageSize 条数 + **/ + @GetMapping("/page") + @Operation(summary = "调拨单（出库、入库） 分页") + public CommonResult getStPage(DlRepairStReqVO repairStReqVO, + @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){ + Page page = new Page<>(pageNo, pageSize); + return success(dlRepairStService.getStPage(repairStReqVO, page)); + } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java index 7e0ca9f2..9e63ffcc 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java @@ -1,12 +1,21 @@ package cn.iocoder.yudao.module.stockTransfer.controller.admin; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + /** * 调拨单子表(DlRepairSti)表控制层 * @author 小李 @@ -21,60 +30,22 @@ public class DlRepairStiController{ @Resource private DlRepairStiService dlRepairStiService; -// /** -// * 分页查询所有数据 -// * -// * @param page 分页对象 -// * @param dlRepairSti 查询实体 -// * @return 所有数据 -// */ -// @GetMapping -// public R selectAll(Page page, DlRepairSti dlRepairSti) { -// return success(this.dlRepairStiService.page(page, new QueryWrapper<>(dlRepairSti))); -// } -// -// /** -// * 通过主键查询单条数据 -// * -// * @param id 主键 -// * @return 单条数据 -// */ -// @GetMapping("{id}") -// public R selectOne(@PathVariable Serializable id) { -// return success(this.dlRepairStiService.getById(id)); -// } -// -// /** -// * 新增数据 -// * -// * @param dlRepairSti 实体对象 -// * @return 新增结果 -// */ -// @PostMapping -// public R insert(@RequestBody DlRepairSti dlRepairSti) { -// return success(this.dlRepairStiService.save(dlRepairSti)); -// } -// -// /** -// * 修改数据 -// * -// * @param dlRepairSti 实体对象 -// * @return 修改结果 -// */ -// @PutMapping -// public R update(@RequestBody DlRepairSti dlRepairSti) { -// return success(this.dlRepairStiService.updateById(dlRepairSti)); -// } -// -// /** -// * 删除数据 -// * -// * @param idList 主键结合 -// * @return 删除结果 -// */ -// @DeleteMapping -// public R delete(@RequestParam("idList") List idList) { -// return success(this.dlRepairStiService.removeByIds(idList)); -// } + /** + * 调拨单子表 分页 + * + * @author 小李 + * @date 14:48 2024/9/19 + * @param repairStiReqVO 查询对象 + * @param pageNo 页码 + * @param pageSize 条数 + **/ + @GetMapping("/page") + @Operation(summary = "调拨单子表 分页") + public CommonResult getStiPage(DlRepairStiReqVO repairStiReqVO, + @RequestParam(value = "pageNo", defaultValue = "1")Integer pageNo, + @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){ + Page page = new Page<>(pageNo, pageSize); + return success(dlRepairStiService.getStiPage(repairStiReqVO, page)); + } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java index 39011f1e..d5edab79 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; @@ -85,6 +87,8 @@ public class DlRepairSt extends TenantBaseDO { /** * 调拔时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date stTime; /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java index 45eaefb7..1d3efea2 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java @@ -1,8 +1,12 @@ package cn.iocoder.yudao.module.stockTransfer.mapper; import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 针对表【dl_repair_st(调拨单)】的数据库操作Mapper @@ -13,6 +17,14 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DlRepairStMapper extends BaseMapper { + /** + * 调拨单（出库、入库） 分页 + * + * @author 小李 + * @date 9:20 2024/9/19 + * @param repairStReqVO 查询对象 + **/ + IPage getStPage(@Param("map") DlRepairStReqVO repairStReqVO, Page page); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java index 996f94e5..ebb8c2dd 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java @@ -1,8 +1,12 @@ package cn.iocoder.yudao.module.stockTransfer.mapper; import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 针对表【dl_repair_sti(调拨单子表)】的数据库操作Mapper @@ -13,6 +17,14 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DlRepairStiMapper extends BaseMapper { + /** + * 调拨单子表 分页 + * + * @author 小李 + * @date 14:48 2024/9/19 + * @param repairStiReqVO 查询对象 + **/ + IPage getStiPage(@Param("map") DlRepairStiReqVO repairStiReqVO, Page page); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java index 495b8baa..ba59fcc0 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.stockTransfer.service; import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO; import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStRespVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -20,4 +23,13 @@ public interface DlRepairStService extends IService { * @param repairStRespVO 新增对象 **/ void createSt(DlRepairStRespVO repairStRespVO); + + /** + * 调拨单（出库、入库） 分页 + * + * @author 小李 + * @date 9:20 2024/9/19 + * @param repairStReqVO 查询对象 + **/ + IPage getStPage(DlRepairStReqVO repairStReqVO, Page page); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java index a47980d6..711ae2e2 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java @@ -1,6 +1,9 @@ package cn.iocoder.yudao.module.stockTransfer.service; import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -10,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService; **/ public interface DlRepairStiService extends IService { + /** + * 调拨单子表 分页 + * + * @author 小李 + * @date 14:48 2024/9/19 + * @param repairStiReqVO 查询对象 + **/ + IPage getStiPage(DlRepairStiReqVO repairStiReqVO, Page page); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java index f0e5318b..c83ed130 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java @@ -5,8 +5,11 @@ import cn.iocoder.yudao.common.RepairErrorCodeConstants; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSt; import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStReqVO; import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStRespVO; import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStService; import cn.iocoder.yudao.module.stockTransfer.mapper.DlRepairStMapper; @@ -51,6 +54,18 @@ public class DlRepairStServiceImpl extends ServiceImpl item.setStId(repairStRespVO.getId())); repairStiService.saveBatch(repairStRespVO.getGoodsList()); } + + /** + * 调拨单（出库、入库） 分页 + * + * @author 小李 + * @date 9:20 2024/9/19 + * @param repairStReqVO 查询对象 + **/ + @Override + public IPage getStPage(DlRepairStReqVO repairStReqVO, Page page){ + return baseMapper.getStPage(repairStReqVO, page); + } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java index 7572dea3..1821acce 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java @@ -3,6 +3,9 @@ package cn.iocoder.yudao.module.stockTransfer.service.impl; import cn.iocoder.yudao.module.stockTransfer.entity.DlRepairSti; import cn.iocoder.yudao.module.stockTransfer.mapper.DlRepairStiMapper; import cn.iocoder.yudao.module.stockTransfer.service.DlRepairStiService; +import cn.iocoder.yudao.module.stockTransfer.vo.DlRepairStiReqVO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -16,6 +19,18 @@ import org.springframework.stereotype.Service; public class DlRepairStiServiceImpl extends ServiceImpl implements DlRepairStiService { + /** + * 调拨单子表 分页 + * + * @author 小李 + * @date 14:48 2024/9/19 + * @param repairStiReqVO 查询对象 + **/ + @Override + public IPage getStiPage(DlRepairStiReqVO repairStiReqVO, Page page){ + return baseMapper.getStiPage(repairStiReqVO, page); + } + } diff --git a/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml index b738bc4a..6ca9c49a 100644 --- a/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml @@ -41,4 +41,14 @@ from dl_repair_st st where st.deleted = '0' + + diff --git a/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml index 0f81bd7f..690e277c 100644 --- a/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml @@ -23,4 +23,8 @@ from dl_repair_sti sti where sti.deleted = '0' + + diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 607d412d..5f80c4fc 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -68,7 +68,7 @@ flowable: mybatis-plus: configuration: map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: db-config: id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。