dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/CompanyController.java

@@ -11,8 +11,6 @@ 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;
@@ -58,10 +56,6 @@ public class CompanyController {
     @Lazy
     private DeptApi deptApi;
 
-    @Resource
-    @Lazy
-    private AdminUserApi adminUserApi;
-
     @Autowired
     private CompanyService companyService;
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStController.java

@@ -2,18 +2,16 @@ 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.*;
+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 javax.annotation.Resource;
 
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 /**
  * 调拨单(DlRepairSt)表控制层
  * @author 小李
@@ -42,22 +40,5 @@ 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<DlRepairSt> page = new Page<>(pageNo, pageSize);
-        return success(dlRepairStService.getStPage(repairStReqVO, page));
-    }
 }
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/controller/admin/DlRepairStiController.java

@@ -1,21 +1,12 @@
 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 小李
@@ -30,22 +21,60 @@ public class DlRepairStiController{
     @Resource
     private DlRepairStiService dlRepairStiService;
 
-    /**
+//    /**
-     * 调拨单子表 分页
+//     * 分页查询所有数据
-     *
+//     *
-     * @author 小李
+//     * @param page 分页对象
-     * @date 14:48 2024/9/19
+//     * @param dlRepairSti 查询实体
-     * @param repairStiReqVO 查询对象
+//     * @return 所有数据
-     * @param pageNo 页码
+//     */
-     * @param pageSize 条数
+//    @GetMapping
-    **/
+//    public R selectAll(Page<DlRepairSti> page, DlRepairSti dlRepairSti) {
-    @GetMapping("/page")
+//        return success(this.dlRepairStiService.page(page, new QueryWrapper<>(dlRepairSti)));
-    @Operation(summary = "调拨单子表 分页")
+//    }
-    public CommonResult<?> getStiPage(DlRepairStiReqVO repairStiReqVO,
+//
-                                      @RequestParam(value = "pageNo", defaultValue = "1")Integer pageNo,
+//    /**
-                                      @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize){
+//     * 通过主键查询单条数据
-        Page<DlRepairSti> page = new Page<>(pageNo, pageSize);
+//     *
-        return success(dlRepairStiService.getStiPage(repairStiReqVO, page));
+//     * @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<Long> idList) {
+//        return success(this.dlRepairStiService.removeByIds(idList));
+//    }
 }
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/entity/DlRepairSt.java

@@ -5,10 +5,8 @@ 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;
@@ -87,8 +85,6 @@ public class DlRepairSt extends TenantBaseDO {
     /**
      * 调拔时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date stTime;
 
     /**

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStMapper.java

@@ -1,12 +1,8 @@
 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
@@ -17,14 +13,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface DlRepairStMapper extends BaseMapper<DlRepairSt> {
 
-    /**
-     * 调拨单（出库、入库） 分页
-     *
-     * @author 小李
-     * @date 9:20 2024/9/19
-     * @param repairStReqVO 查询对象
-     **/
-    IPage<DlRepairSt> getStPage(@Param("map") DlRepairStReqVO repairStReqVO, Page<DlRepairSt> page);
 }
 
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/mapper/DlRepairStiMapper.java

@@ -1,12 +1,8 @@
 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
@@ -17,14 +13,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface DlRepairStiMapper extends BaseMapper<DlRepairSti> {
 
-    /**
-     * 调拨单子表 分页
-     *
-     * @author 小李
-     * @date 14:48 2024/9/19
-     * @param repairStiReqVO 查询对象
-     **/
-    IPage<DlRepairSti> getStiPage(@Param("map") DlRepairStiReqVO repairStiReqVO, Page<DlRepairSti> page);
 }
 
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStService.java

@@ -1,10 +1,7 @@
 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;
 
 /**
@@ -23,13 +20,4 @@ public interface DlRepairStService extends IService<DlRepairSt> {
      * @param repairStRespVO 新增对象
      **/
     void createSt(DlRepairStRespVO repairStRespVO);
-
-    /**
-     * 调拨单（出库、入库） 分页
-     *
-     * @author 小李
-     * @date 9:20 2024/9/19
-     * @param repairStReqVO 查询对象
-     **/
-    IPage<DlRepairSt> getStPage(DlRepairStReqVO repairStReqVO, Page<DlRepairSt> page);
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/DlRepairStiService.java

@@ -1,9 +1,6 @@
 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;
 
 /**
@@ -13,12 +10,4 @@ import com.baomidou.mybatisplus.extension.service.IService;
 **/
 public interface DlRepairStiService extends IService<DlRepairSti> {
 
-    /**
-     * 调拨单子表 分页
-     *
-     * @author 小李
-     * @date 14:48 2024/9/19
-     * @param repairStiReqVO 查询对象
-     **/
-    IPage<DlRepairSti> getStiPage(DlRepairStiReqVO repairStiReqVO, Page<DlRepairSti> page);
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStServiceImpl.java

@@ -5,11 +5,8 @@ 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;
@@ -54,18 +51,6 @@ public class DlRepairStServiceImpl extends ServiceImpl<DlRepairStMapper, DlRepai
         repairStRespVO.getGoodsList().forEach(item -> item.setStId(repairStRespVO.getId()));
         repairStiService.saveBatch(repairStRespVO.getGoodsList());
     }
-
-    /**
-     * 调拨单（出库、入库） 分页
-     *
-     * @author 小李
-     * @date 9:20 2024/9/19
-     * @param repairStReqVO 查询对象
-     **/
-    @Override
-    public IPage<DlRepairSt> getStPage(DlRepairStReqVO repairStReqVO, Page<DlRepairSt> page){
-        return baseMapper.getStPage(repairStReqVO, page);
-    }
 }
 
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockTransfer/service/impl/DlRepairStiServiceImpl.java

@@ -3,9 +3,6 @@ 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;
 
@@ -19,18 +16,6 @@ import org.springframework.stereotype.Service;
 public class DlRepairStiServiceImpl extends ServiceImpl<DlRepairStiMapper, DlRepairSti>
         implements DlRepairStiService {
 
-    /**
-     * 调拨单子表 分页
-     *
-     * @author 小李
-     * @date 14:48 2024/9/19
-     * @param repairStiReqVO 查询对象
-     **/
-    @Override
-    public IPage<DlRepairSti> getStiPage(DlRepairStiReqVO repairStiReqVO, Page<DlRepairSti> page){
-        return baseMapper.getStiPage(repairStiReqVO, page);
-    }
-
 }
 
 

dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStMapper.xml

@@ -41,14 +41,4 @@
         from dl_repair_st st
         where st.deleted = '0'
     </sql>
-
-    <select id="getStPage" resultMap="BaseResultMap">
-        <include refid="Base_SQL" />
-        <if test="map.outCorpId != null and map.outCorpId != ''">
-            and st.out_corp_id = #{map.outCorpId}
-        </if>
-        <if test="map.inCorpId != null and map.inCorpId != ''">
-            and st.in_corp_id = #{map.inCorpId}
-        </if>
-    </select>
 </mapper>

dl-module-repair/src/main/resources/mapper/stockTransfer/DlRepairStiMapper.xml

@@ -23,8 +23,4 @@
         from dl_repair_sti sti
         where sti.deleted = '0'
     </sql>
-
-    <select id="getStiPage" resultMap="BaseResultMap">
-        <include refid="Base_SQL" />
-    </select>
 </mapper>

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 模式。