分页调整

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -1,5 +1,7 @@
 package com.ozs.web.controller.plan;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
@@ -35,18 +37,17 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "查询年度计划")
     @PostMapping("/list")
-    public TableDataInfo list(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        startPage();
-        List<PlanYears> list = planYearsService.selectPlanYearsList(yearsStandardVo);
-        return getDataTable(list);
+    public AjaxResult list(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        //List<PlanYears> list = planYearsService.selectPlanYearsList(yearsStandardVo);
+        PageInfo<PlanYears> page = planYearsService.selectPlanYearsList(yearsStandardVo);
+        return AjaxResult.success(page);
     }
 
     @ApiOperation(value = "审核单位查询年度计划")
     @PostMapping("/examineList")
-    public TableDataInfo examineList(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        startPage();
-        List<PlanYears> list = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
-        return getDataTable(list);
+    public AjaxResult examineList(@RequestBody PlanYearsStandardVo yearsStandardVo) {
+        PageInfo<PlanYears> page = planYearsService.selectPlanYearsExamineList(yearsStandardVo);
+        return AjaxResult.success(page);
     }
 
     @ApiOperation(value = "创建年度计划")

purchase-admin/src/main/resources/application-dev.yml

@@ -9,8 +9,8 @@ purchase:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/purchase/uploadPath，Linux配置 /home/purchase/uploadPath）
-  # profile: C:/purchase/uploadPath
-  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
+  profile: D:/purchase/uploadPath
+  #  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanYearsStandardVo.java

@@ -3,6 +3,7 @@ package com.ozs.plan.doman.vo.requestVo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
+import com.ozs.common.vo.PageVo;
 import com.ozs.system.domain.SysFileRef;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +16,7 @@ import java.util.List;
  * @author buzhanyi
  */
 @Data
-public class PlanYearsStandardVo extends BaseEntity {
+public class PlanYearsStandardVo extends PageVo {
 
     /**
      * 主键编号

purchase-system/src/main/java/com/ozs/plan/mapper/PlanYearsMapper.java

@@ -37,7 +37,7 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
      *
      * @param planYears 年度计划请求对象
      */
-    public Long insertPlanYears(PlanYears planYears);
+    public Integer insertPlanYears(PlanYears planYears);
 
     /**
      * 批量删除年度计划
@@ -45,7 +45,7 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
      * @param planIds 需要删除的年度计划ID
      * @return 结果
      */
-    public int deletePlanYearsByIds(Long[] planIds);
+    public Integer deletePlanYearsByIds(Long[] planIds);
 
     /**
      * 查询项目名称是否存在
@@ -69,7 +69,7 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
      * @param projectName 项目名称
      * @return 结果
      */
-    public int countProjectNameOther(@Param("projectName") String projectName, @Param("planYearId") String planYearId);
+    public Integer countProjectNameOther(@Param("projectName") String projectName, @Param("planYearId") String planYearId);
 
     /**
      * 修改年度计划
@@ -77,13 +77,13 @@ public interface PlanYearsMapper extends BaseMapper<PlanYears> {
      * @param ofYears 年度计划
      * @return 结果
      */
-    public int updateInfoById(PlanYears ofYears);
+    public Integer updateInfoById(PlanYears ofYears);
 
-    public int deletePlanYearsById(Long planId);
+    public Integer deletePlanYearsById(Long planId);
 
-    public int commit(Long planYearId);
+    public Integer commit(Long planYearId);
 
-    public int review(PlanYears ofYears);
+    public Integer review(PlanYears ofYears);
 
-    int sendLetter(Long planYearId);
+    Integer sendLetter(Long planYearId);
 }

purchase-system/src/main/java/com/ozs/plan/service/PlanYearsService.java

@@ -1,6 +1,8 @@
 package com.ozs.plan.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.plan.doman.PlanYears;
@@ -21,7 +23,7 @@ public interface PlanYearsService {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
+    public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo);
 
     /**
      * 查询年度计划记录集合
@@ -29,7 +31,7 @@ public interface PlanYearsService {
      * @param vo 年度计划请求对象
      * @return 年度计划记录集合
      */
-    public List<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo);
+    public PageInfo<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo);
 
     /**
      * 创建年度计划

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ozs.plan.service.impl;
 
-import com.ozs.common.constant.UserConstants;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
@@ -24,10 +27,7 @@ import com.ozs.system.mapper.SysFileRefMapper;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.system.service.SysFileService;
-import com.ozs.system.service.impl.SysUserServiceImpl;
-import io.netty.util.internal.ObjectUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,8 +46,8 @@ import java.util.Map;
  * @author buzhanyi
  */
 @Service
+@Slf4j
 public class PlanYearsServiceImpl implements PlanYearsService {
-    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
     PlanYearsMapper planYearsMapper;
@@ -65,11 +65,11 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     private SysFileService fileService;
 
     @Override
-    public List<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
+    public PageInfo<PlanYears> selectPlanYearsList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         List<PlanYears> planYears = new ArrayList<>();
         List<PlanYears> planYearsList = new ArrayList<>();
-
+        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         try {
             BeanUtils.copyProperties(vo, ofYears);
             planYears = planYearsMapper.selectPlanYearsList(ofYears);
@@ -81,12 +81,14 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return planYearsList;
+        PageInfo<PlanYears> pageInfo = new PageInfo<PlanYears>(planYearsList);
+        return pageInfo;
     }
 
     @Override
-    public List<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo) {
+    public PageInfo<PlanYears> selectPlanYearsExamineList(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
+        PageHelper.startPage(vo.getPageNum().intValue(), vo.getPageSize().intValue());
         List<PlanYears> planYears = new ArrayList<>();
         try {
             BeanUtils.copyProperties(vo, ofYears);
@@ -98,7 +100,8 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return planYears;
+        PageInfo<PlanYears> pageInfo = new PageInfo<PlanYears>(planYears);
+        return pageInfo;
     }
 
     @Transactional
@@ -118,11 +121,12 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         ofYears.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
         ofYears.setSendLetter("0");
         ofYears.setCreateTime(new Date());
-        Long insertId = planYearsMapper.insertPlanYears(ofYears);
+        planYearsMapper.insertPlanYears(ofYears);
+        log.info("id:{}", ofYears.getPlanYearId());
         List<SysFileRef> sysFileRefs = yearsStandardVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
-                ref.setRedId(insertId);
+                ref.setRedId(ofYears.getPlanYearId());
                 ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
                 ref.setCreated(ofYears.getCreated());
                 ref.setCreateTime(new Date());
@@ -172,6 +176,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
         return AjaxResult.success(responseVo);
     }
 
+    @Transactional
     @Override
     public AjaxResult update(PlanYearsStandardVo yearsStandardVo) {
         if (planYearsMapper.countProjectNameOther(yearsStandardVo.getProjectName(), String.valueOf(yearsStandardVo.getPlanYearId())) > 0) {
@@ -196,9 +201,9 @@ public class PlanYearsServiceImpl implements PlanYearsService {
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(ofYears.getPlanYearId());
                 ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
-                ref.setCreated(ofYears.getCreated());
+                ref.setCreated(yearsStandardVo.getUpdated());
                 ref.setCreateTime(new Date());
-                ref.setUpdated(ofYears.getCreated());
+                ref.setUpdated(yearsStandardVo.getUpdated());
                 ref.setUpdateTime(new Date());
                 sysFileRefMapper.insert(ref);
             }
@@ -316,6 +321,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     }
 
     @Override
+    @Transactional
     public AjaxResult reviewTo(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         BeanUtils.copyProperties(vo, ofYears);
@@ -325,6 +331,7 @@ public class PlanYearsServiceImpl implements PlanYearsService {
     }
 
     @Override
+    @Transactional
     public AjaxResult reviewReturn(PlanYearsStandardVo vo) {
         PlanYears ofYears = new PlanYears();
         BeanUtils.copyProperties(vo, ofYears);