diff --git a/jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java b/jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java index d998e0d8..b47f67bc 100644 --- a/jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java +++ b/jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java @@ -143,7 +143,7 @@ public class CommonController String uploadFile = fastdfs.uploadFile(file); AjaxResult ajax = AjaxResult.success(); ajax.put("fileName", fileName); - ajax.put("url", uploadFile); + ajax.put("url", ""); return ajax; } else { // 上传文件路径 @@ -153,7 +153,7 @@ public class CommonController String url = serverConfig.getUrl() + fileName; AjaxResult ajax = AjaxResult.success(); ajax.put("fileName", fileName); - ajax.put("url", url); + ajax.put("url", ""); return ajax; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java index 88066c7f..3210759b 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,10 +18,9 @@ import java.util.List; @Repository public interface SpecialProjectBidInfoMapper extends BaseMapper { - List getList(@Param("proNo") String proNo, - @Param("isConsolidatedBidding") String isConsolidatedBidding, - @Param("value") String value, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getList(@Param("proNo") String proNo, + @Param("isConsolidatedBidding") String isConsolidatedBidding, + @Param("value") String value, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java index 9e381e44..5a4031f8 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.earlyStage.domain.SpecialProjectInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -25,13 +27,12 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper getByUserPro(@Param("userId") String userId, - @Param("userType") String userType, - @Param("id") String id, - @Param("projectName") String projectName, - @Param("projectCode") String projectCode, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("projectCode") String projectCode, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java index 1f3ec2ec..238d55ae 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java @@ -1,6 +1,7 @@ package com.kms.earlyStage.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.earlyStage.domain.SpecialProjectInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -27,14 +28,13 @@ public interface SpecialProjectInfoMapper extends BaseMapper @Param("pageNum") int pageNum, @Param("pageSize") int pageSize);*/ - List getByUserPro(@Param("userId") String userId, + IPage getByUserPro(IPage page, + @Param("userId") String userId, @Param("userType") String userType, @Param("id") String id, @Param("projectName") String projectName, @Param("proNo") String proNO, @Param("projectType") String projectType, @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("orderBy") String orderBy); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java index ce4b12b9..7b9afe48 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.earlyStage.domain.SpecialProjectInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -25,13 +27,12 @@ public interface SpecialProjectPlanInfoMapper extends BaseMapper getByUserPro(@Param("userId") String userId, - @Param("userType") String userType, - @Param("id") String id, - @Param("planName") String planName, - @Param("planType") String planType, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("planName") String planName, + @Param("planType") String planType, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java index 6ebf23e8..1c97b953 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.earlyStage.domain.SpecialProjectInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -24,12 +26,11 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper getByUserPro(@Param("userId") String userId, - @Param("userType") String userType, - @Param("id") String id, - @Param("projectName") String projectName, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java index 6e0656ec..27795317 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java @@ -1,5 +1,7 @@ package com.kms.earlyStage.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.earlyStage.domain.SpecialProjectInfo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -28,13 +30,12 @@ public interface SpecialProjectProposalMapper extends BaseMapper getByUserPro(@Param("userId") String userId, - @Param("userType") String userType, - @Param("id") String id, - @Param("projectName") String projectName, - @Param("projectCode") String projectCode, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + IPage getByUserPro(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("projectCode") String projectCode, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java index 9996772b..6f9719d9 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java @@ -84,14 +84,11 @@ public class SpecialProjectBidInfoService extends BaseService params = sp.getParams(); - List list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(), - (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); + IPage list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(), + (String) params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + return list; } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java index 2a4ce043..9b4d0b7f 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java @@ -45,21 +45,18 @@ public class SpecialProjectFeasibilityService extends BaseService list = null; + IPage list = null; if (ObjectUtil.isNull(params)) { list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), - sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); + sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize())); }else { list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), - sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + return list; } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java index 441a227c..bc63aec0 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.entity.SysUser; import com.kms.common.utils.UserUtils; @@ -27,7 +28,7 @@ import java.util.Map; * @date 2023-09-08 */ @Service -public class SpecialProjectInfoService extends BaseService{ +public class SpecialProjectInfoService extends BaseService { @Autowired private SpecialProjectInfoMapper specialProjectInfoMapper; @@ -70,19 +71,18 @@ public class SpecialProjectInfoService extends BaseService list = null; + IPage list1 = null; - if (ObjectUtil.isNull(params)) { - list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(), - data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); - }else { - list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(), - data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); - } + if (ObjectUtil.isNull(params)) { + list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(), + data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time"); + } else { + list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(), + data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy")); + } - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + + return list1; } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java index 768fbb55..f07a2762 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java @@ -40,20 +40,18 @@ public class SpecialProjectPlanInfoService extends BaseService params = sp.getParams(); assert sysUser != null; - List list = null; + IPage list = null; if (ObjectUtil.isNull(params)) { list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(), - data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); + data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize())); }else { list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(), - data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } - Page infoPage = new Page<>(); - infoPage.setRecords(list); - infoPage.setTotal(list.size()); - return infoPage; + + return list; } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index ebf2225f..d8e7979c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java @@ -46,7 +46,7 @@ public class SpecialProjectPreDesignService extends BaseService list = null; + IPage list = null; if (ObjectUtil.isNotNull(data.getProNo())) { return specialProjectPreDesignMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); @@ -54,19 +54,15 @@ public class SpecialProjectPreDesignService extends BaseService(sp.getPageNum(),sp.getPageSize())); }else { list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), - sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - - return page; + return list; diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java index e3a492a7..b871a585 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java @@ -55,7 +55,7 @@ public class SpecialProjectProposalService extends BaseService params = sp.getParams(); assert sysUser != null; - List list = null; + IPage list = null; if (ObjectUtil.isNull(data.getGetList())) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName()) @@ -68,16 +68,14 @@ public class SpecialProjectProposalService extends BaseService(sp.getPageNum(),sp.getPageSize())); }else { list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(), - data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); + data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize())); } - Page page = new Page<>(); - page.setRecords(list); - page.setTotal(list.size()); - return page; + + return list; } diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml index 82df59e5..114a139a 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml @@ -33,7 +33,7 @@ diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml index 637416c7..5e140a01 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml @@ -45,7 +45,7 @@ order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize}; diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml index f7aea260..467405a9 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml @@ -66,7 +66,6 @@ --> diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml index f19e8377..1b255198 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml @@ -32,7 +32,6 @@ diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 5d2cc0f4..105355ff 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -47,7 +47,7 @@ diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml index 3f851091..22e52bef 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml @@ -64,7 +64,6 @@