From 1e3f5a682e9bf6270123242491b62dc56b0b6621 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 20 Mar 2025 09:11:53 +0800 Subject: [PATCH] bugfix --- .../BasicInformationController.java | 38 ++++-- .../BuildingInformationController.java | 44 +++++-- .../ruoyi/gysl/controller/MxController.java | 14 +-- .../controller/PlanInformationController.java | 41 ++----- .../controller/ProjectLegendController.java | 95 +++++++++++++++ .../ProjectMonthInfoController.java | 108 ++++++++++++++++++ .../ProjectOtherInfoController.java | 81 +++++++++++++ .../controller/ProjectRemarkController.java | 95 +++++++++++++++ .../controller/QyrzInformationController.java | 81 +++++++++++++ .../ruoyi/gysl/controller/XmxlController.java | 95 +++++++++++++++ .../ruoyi/gysl/entity/BasicInformation.java | 65 ++++++----- .../gysl/entity/BuildingInformation.java | 32 +++++- .../main/java/com/ruoyi/gysl/entity/Mx.java | 2 +- .../ruoyi/gysl/entity/PlanInformation.java | 7 ++ .../com/ruoyi/gysl/entity/ProjectLegend.java | 41 +++++++ .../ruoyi/gysl/entity/ProjectMonthInfo.java | 50 ++++++++ .../ruoyi/gysl/entity/ProjectOtherInfo.java | 33 ++++++ .../com/ruoyi/gysl/entity/ProjectRemark.java | 32 ++++++ .../ruoyi/gysl/entity/QyrzInformation.java | 53 +++++++++ .../main/java/com/ruoyi/gysl/entity/Xmxl.java | 42 +++++++ .../request/BasicInformationPageReq.java | 38 ++++++ .../gysl/entity/request/RemarkPageReq.java | 30 +++++ .../gysl/entity/request/ZwIdPageReq.java | 15 +++ .../gysl/mapper/BasicInformationMapper.java | 13 ++- .../gysl/mapper/BuildingInformationDao.java | 15 --- .../mapper/BuildingInformationMapper.java | 25 ++++ ...terpriseDao.java => EnterpriseMapper.java} | 2 +- .../gysl/mapper/{MxDao.java => MxMapper.java} | 2 +- .../mapper/{PjpzDao.java => PjpzMapper.java} | 2 +- .../ruoyi/gysl/mapper/PlanInformationDao.java | 15 --- .../gysl/mapper/PlanInformationMapper.java | 24 ++++ .../gysl/mapper/ProjectLegendMapper.java | 27 +++++ .../gysl/mapper/ProjectMonthInfoMapper.java | 30 +++++ .../gysl/mapper/ProjectOtherInfoMapper.java | 24 ++++ .../gysl/mapper/ProjectRemarkMapper.java | 24 ++++ .../gysl/mapper/QyrzInformationMapper.java | 23 ++++ ...onDao.java => WysmxInformationMapper.java} | 2 +- .../com/ruoyi/gysl/mapper/XmxlMapper.java | 27 +++++ .../gysl/service/BasicInformationService.java | 18 ++- .../service/BuildingInformationService.java | 10 ++ .../gysl/service/PlanInformationService.java | 8 ++ .../gysl/service/ProjectLegendService.java | 25 ++++ .../gysl/service/ProjectMonthInfoService.java | 29 +++++ .../gysl/service/ProjectOtherInfoService.java | 23 ++++ .../gysl/service/ProjectRemarkService.java | 22 ++++ .../gysl/service/QyrzInformationService.java | 23 ++++ .../com/ruoyi/gysl/service/XmxlService.java | 25 ++++ .../impl/BasicInformationServiceImpl.java | 20 +++- .../impl/BuildingInformationServiceImpl.java | 17 ++- .../service/impl/EnterpriseServiceImpl.java | 4 +- .../gysl/service/impl/MxServiceImpl.java | 4 +- .../gysl/service/impl/PjpzServiceImpl.java | 4 +- .../impl/PlanInformationServiceImpl.java | 16 ++- .../impl/ProjectLegendServiceImpl.java | 32 ++++++ .../impl/ProjectMonthInfoServiceImpl.java | 42 +++++++ .../impl/ProjectOtherInfoServiceImpl.java | 30 +++++ .../impl/ProjectRemarkServiceImpl.java | 30 +++++ .../impl/QyrzInformationServiceImpl.java | 30 +++++ .../impl/WysmxInformationServiceImpl.java | 4 +- .../gysl/service/impl/XmxlServiceImpl.java | 32 ++++++ .../mapper/BasicInformationMapper.xml | 21 ++++ .../mapper/BuildingInformationMapper.xml | 15 +++ .../mapper/PlanInformationMapper.xml | 17 +++ .../resources/mapper/ProjectLegendMapper.xml | 15 +++ .../mapper/ProjectMonthInfoMapper.xml | 14 +++ .../mapper/ProjectOtherInfoMapper.xml | 10 ++ .../resources/mapper/ProjectRemarkMapper.xml | 20 ++++ .../mapper/QyrzInformationMapper.xml | 13 +++ .../src/main/resources/mapper/XmxlMapper.xml | 14 +++ .../framework/config/MyMetaObjectHandler.java | 65 +++++++++++ 70 files changed, 1890 insertions(+), 149 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{EnterpriseDao.java => EnterpriseMapper.java} (78%) rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{MxDao.java => MxMapper.java} (81%) rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{PjpzDao.java => PjpzMapper.java} (81%) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java rename ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/{WysmxInformationDao.java => WysmxInformationMapper.java} (77%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java index 47c2370..7101568 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BasicInformationController.java @@ -1,13 +1,15 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.poi.ChangeExcelUtil; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import com.ruoyi.gysl.service.BasicInformationService; @@ -15,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.xssf.usermodel.*; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; @@ -46,15 +49,16 @@ public class BasicInformationController extends BaseController { * 分页查询所有数据 * * @param page 分页对象 - * @param basicInformation 查询实体 + * @param basicInformationPageReq 查询实体 * @return 所有数据 */ @ApiOperation(value = "分页查询所有数据", response = BasicInformation.class) @GetMapping("/page") - public AjaxResult selectAll(Page page, BasicInformation basicInformation) { - return success(this.basicInformationService.page(page, new QueryWrapper<>(basicInformation))); + public AjaxResult selectAll(Page page, BasicInformationPageReq basicInformationPageReq) { + return success(basicInformationService.page(page, basicInformationPageReq)); } + /** * 通过主键查询单条数据 * @@ -64,7 +68,7 @@ public class BasicInformationController extends BaseController { @ApiOperation(value = "通过主键查询单条数据", response = BasicInformation.class) @GetMapping("{id}") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.basicInformationService.getById(id)); + return success(basicInformationService.getById(id)); } /** @@ -76,7 +80,7 @@ public class BasicInformationController extends BaseController { @ApiOperation("新增数据") @PostMapping("/add") public AjaxResult insert(@RequestBody BasicInformation basicInformation) { - return success(this.basicInformationService.save(basicInformation)); + return success(basicInformationService.save(basicInformation)); } /** @@ -88,7 +92,7 @@ public class BasicInformationController extends BaseController { @ApiOperation("修改数据") @PostMapping("/edit") public AjaxResult update(@RequestBody BasicInformation basicInformation) { - return success(this.basicInformationService.updateById(basicInformation)); + return success(basicInformationService.updateById(basicInformation)); } /** @@ -100,7 +104,25 @@ public class BasicInformationController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.basicInformationService.removeByIds(idList)); + return success(basicInformationService.removeByIds(idList)); + } + + /** + * 项目基本信息批量导入 + */ + @ApiOperation(value = "项目基本信息批量导入") + @PostMapping(value = "/import", consumes = "multipart/form-data") + public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(BasicInformation.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("项目导入数据不能为空"); + } else { + basicInformationService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java index df75ec1..ef5db2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/BuildingInformationController.java @@ -5,11 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.BuildingInformationService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.Serializable; @@ -32,16 +39,15 @@ public class BuildingInformationController extends BaseController { private BuildingInformationService buildingInformationService; /** - * 分页查询所有数据 + * 查询所有数据 * - * @param page 分页对象 - * @param buildingInformation 查询实体 + * @param zwIdPageReq 查询实体 * @return 所有数据 */ @GetMapping("/page") - @ApiOperation(value = "分页查询所有数据",response =BuildingInformation.class ) - public AjaxResult selectAll(Page page, BuildingInformation buildingInformation) { - return success(this.buildingInformationService.page(page, new QueryWrapper<>(buildingInformation))); + @ApiOperation(value = "查询所有数据",response = BuildingInformation.class ) + public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + return success(buildingInformationService.selectAll(zwIdPageReq)); } /** @@ -53,7 +59,7 @@ public class BuildingInformationController extends BaseController { @GetMapping("{id}") @ApiOperation(value = "通过主键查询单条数据",response =BuildingInformation.class) public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.buildingInformationService.getById(id)); + return success(buildingInformationService.getById(id)); } /** @@ -65,7 +71,7 @@ public class BuildingInformationController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody BuildingInformation buildingInformation) { - return success(this.buildingInformationService.save(buildingInformation)); + return success(buildingInformationService.save(buildingInformation)); } /** @@ -77,7 +83,7 @@ public class BuildingInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody BuildingInformation buildingInformation) { - return success(this.buildingInformationService.updateById(buildingInformation)); + return success(buildingInformationService.updateById(buildingInformation)); } /** @@ -89,7 +95,25 @@ public class BuildingInformationController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.buildingInformationService.removeByIds(idList)); + return success(buildingInformationService.removeByIds(idList)); + } + + /** + * 导入项目建筑信息 + */ + @ApiOperation(value = "导入项目建筑信息") + @PostMapping(value = "/importProjectBuilding", consumes = "multipart/form-data") + public AjaxResult importTemplateProject(@RequestPart("file") MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(BuildingInformation.class); + List proList = util.importExcel(file.getInputStream()); + StringBuilder successMsg = new StringBuilder(); + if (proList == null || proList.isEmpty()) { + throw new ServiceException("项目建筑信息导入数据不能为空"); + } else { + buildingInformationService.saveBatch(proList); + successMsg.append("导入成功"); + } + return AjaxResult.success(successMsg); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java index 60bdc7e..e9ffe08 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/MxController.java @@ -1,7 +1,6 @@ package com.ruoyi.gysl.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -35,13 +34,12 @@ public class MxController extends BaseController { * 分页查询所有数据 * * @param page 分页对象 - * @param mx 查询实体 * @return 所有数据 */ @GetMapping("/page") @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, Mx mx) { - return success(this.mxService.page(page, new QueryWrapper<>(mx))); + public AjaxResult selectAll(Page page) { + return success(mxService.page(page)); } /** @@ -53,7 +51,7 @@ public class MxController extends BaseController { @GetMapping("{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.mxService.getById(id)); + return success(mxService.getById(id)); } /** @@ -65,7 +63,7 @@ public class MxController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody Mx mx) { - return success(this.mxService.save(mx)); + return success(mxService.save(mx)); } /** @@ -77,7 +75,7 @@ public class MxController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody Mx mx) { - return success(this.mxService.updateById(mx)); + return success(mxService.updateById(mx)); } /** @@ -89,7 +87,7 @@ public class MxController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.mxService.removeByIds(idList)); + return success(mxService.removeByIds(idList)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java index df8206e..cc28b74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/PlanInformationController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.gysl.entity.PlanInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.PlanInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,29 +33,17 @@ public class PlanInformationController extends BaseController { private PlanInformationService planInformationService; /** - * 分页查询所有数据 + * 根据项目id查询规划信息 * - * @param page 分页对象 - * @param planInformation 查询实体 + * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @GetMapping("/page") - @ApiOperation("分页查询所有数据") - public AjaxResult selectAll(Page page, PlanInformation planInformation) { - return success(this.planInformationService.page(page, new QueryWrapper<>(planInformation))); + @GetMapping("/selectAll") + @ApiOperation("根据项目id查询规划信息") + public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) { + return success(planInformationService.selectAll(zwIdPageReq)); } - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - @ApiOperation("通过主键查询单条数据") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(this.planInformationService.getById(id)); - } /** * 新增数据 @@ -65,7 +54,7 @@ public class PlanInformationController extends BaseController { @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody PlanInformation planInformation) { - return success(this.planInformationService.save(planInformation)); + return success(planInformationService.save(planInformation)); } /** @@ -77,19 +66,7 @@ public class PlanInformationController extends BaseController { @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody PlanInformation planInformation) { - return success(this.planInformationService.updateById(planInformation)); - } - - /** - * 删除数据 - * - * @param idList 主键结合 - * @return 删除结果 - */ - @ApiOperation("删除数据") - @DeleteMapping("/delete") - public AjaxResult delete(@RequestParam("idList") List idList) { - return success(this.planInformationService.removeByIds(idList)); + return success(planInformationService.updateById(planInformation)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java new file mode 100644 index 0000000..5da248d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.ProjectLegendService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目图例(ProjectLegend)表控制层 + * + * @author makejava + * @since 2025-03-19 10:12:34 + */ +@Api(tags = "项目图例") +@RestController +@RequestMapping("/gysl/projectLegend") +public class ProjectLegendController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectLegendService projectLegendService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, ZwIdPageReq projectLegend) { + return success(projectLegendService.page(page, projectLegend)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(projectLegendService.getById(id)); + } + + /** + * 新增数据 + * + * @param projectLegend 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectLegend projectLegend) { + return success(projectLegendService.save(projectLegend)); + } + + /** + * 修改数据 + * + * @param projectLegend 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectLegend projectLegend) { + return success(projectLegendService.updateById(projectLegend)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectLegendService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java new file mode 100644 index 0000000..3c3df4a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java @@ -0,0 +1,108 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.ProjectMonthInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表控制层 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +@Api(tags = "月度进展详情") +@RestController +@RequestMapping("/gysl/projectMonthInfo") +public class ProjectMonthInfoController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectMonthInfoService projectMonthInfoService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { + return success(projectMonthInfoService.page(page, zwIdPageReq)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(projectMonthInfoService.getById(id)); + } + + /** + * 新增数据 + * + * @param projectMonthInfo 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectMonthInfo projectMonthInfo) { + return success(projectMonthInfoService.save(projectMonthInfo)); + } + + /** + * 修改数据 + * + * @param projectMonthInfo 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectMonthInfo projectMonthInfo) { + return success(projectMonthInfoService.updateById(projectMonthInfo)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectMonthInfoService.removeByIds(idList)); + } + + /** + * 根据条件导出月度进展详情 + */ + @ApiOperation(value = "根据条件导出月度进展详情") + @PostMapping(value = "/export") + public void export(HttpServletResponse response, ZwIdPageReq zwIdPageReq) throws Exception { + List filteredList = projectMonthInfoService.page(zwIdPageReq); + ExcelUtil util = new ExcelUtil<>(ProjectMonthInfo.class); + util.exportExcel(response, filteredList, "企业名录数据"); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java new file mode 100644 index 0000000..e59bc20 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectOtherInfoController.java @@ -0,0 +1,81 @@ +package com.ruoyi.gysl.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.ProjectOtherInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 项目其他信息(ProjectOtherInfo)表控制层 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +@Api(tags = "项目其他信息") +@RestController +@RequestMapping("/gysl/projectOtherInfo") +public class ProjectOtherInfoController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectOtherInfoService projectOtherInfoService; + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("根据项目id查询项目其他信息") + @GetMapping("/searchId") + public AjaxResult selectAll(ZwIdPageReq zwIdPageReq) { + return success(projectOtherInfoService.searchId(zwIdPageReq)); + } + + + /** + * 新增数据 + * + * @param projectOtherInfo 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectOtherInfo projectOtherInfo) { + return success(projectOtherInfoService.save(projectOtherInfo)); + } + + /** + * 修改数据 + * + * @param projectOtherInfo 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectOtherInfo projectOtherInfo) { + return success(projectOtherInfoService.updateById(projectOtherInfo)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectOtherInfoService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java new file mode 100644 index 0000000..6f78158 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import com.ruoyi.gysl.service.ProjectRemarkService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表控制层 + * + * @author makejava + * @since 2025-03-19 10:49:35 + */ +@Api(tags = "项目备忘录") +@RestController +@RequestMapping("/gysl/projectRemark") +public class ProjectRemarkController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ProjectRemarkService projectRemarkService; + + /** + * 查询所有数据 + * + * @param projectRemark 查询实体 + * @return 所有数据 + */ + @ApiOperation("查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll( RemarkPageReq projectRemark) { + return success(projectRemarkService.list(projectRemark)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(projectRemarkService.getById(id)); + } + + /** + * 新增数据 + * + * @param projectRemark 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody ProjectRemark projectRemark) { + return success(projectRemarkService.save(projectRemark)); + } + + /** + * 修改数据 + * + * @param projectRemark 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody ProjectRemark projectRemark) { + return success(projectRemarkService.updateById(projectRemark)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(projectRemarkService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java new file mode 100644 index 0000000..9d689ac --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyrzInformationController.java @@ -0,0 +1,81 @@ +package com.ruoyi.gysl.controller; + + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.QyrzInformationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 企业入驻信息(QyrzInformation)表控制层 + * + * @author makejava + * @since 2025-03-19 15:25:17 + */ +@Api(tags = "企业入驻信息") +@RestController +@RequestMapping("/gysl/qyrzInformation") +public class QyrzInformationController extends BaseController { + /** + * 服务对象 + */ + @Resource + private QyrzInformationService qyrzInformationService; + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("根据项目id查询企业入驻基本信息") + @GetMapping("/list") + public AjaxResult selectAll( ZwIdPageReq zwIdPageReq) { + return success(qyrzInformationService.selectAll(zwIdPageReq)); + } + + + /** + * 新增数据 + * + * @param qyrzInformation 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody QyrzInformation qyrzInformation) { + return success(qyrzInformationService.save(qyrzInformation)); + } + + /** + * 修改数据 + * + * @param qyrzInformation 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody QyrzInformation qyrzInformation) { + return success(qyrzInformationService.updateById(qyrzInformation)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(qyrzInformationService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java new file mode 100644 index 0000000..20faf9b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -0,0 +1,95 @@ +package com.ruoyi.gysl.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.XmxlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 项目巡礼(Xmxl)表控制层 + * + * @author makejava + * @since 2025-03-19 14:19:21 + */ +@Api(tags = "项目巡礼") +@RestController +@RequestMapping("/gysl/xmxl") +public class XmxlController extends BaseController { + /** + * 服务对象 + */ + @Resource + private XmxlService xmxlService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @ApiOperation("分页查询所有数据") + @GetMapping("/page") + public AjaxResult selectAll(Page page, ZwIdPageReq zwIdPageReq) { + return success(xmxlService.page(page, zwIdPageReq)); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("通过主键查询单条数据") + @GetMapping("/{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(xmxlService.getById(id)); + } + + /** + * 新增数据 + * + * @param xmxl 实体对象 + * @return 新增结果 + */ + @ApiOperation("新增数据") + @PostMapping("/add") + public AjaxResult insert(@RequestBody Xmxl xmxl) { + return success(xmxlService.save(xmxl)); + } + + /** + * 修改数据 + * + * @param xmxl 实体对象 + * @return 修改结果 + */ + @ApiOperation("修改数据") + @PutMapping("/edit") + public AjaxResult update(@RequestBody Xmxl xmxl) { + return success(xmxlService.updateById(xmxl)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @ApiOperation("删除数据") + @DeleteMapping("/delete") + public AjaxResult delete(@RequestParam("idList") List idList) { + return success(xmxlService.removeByIds(idList)); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index b403892..4a16301 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -1,10 +1,12 @@ package com.ruoyi.gysl.entity; 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.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,7 +26,6 @@ import java.util.Date; @Data @ApiModel("基本信息") @TableName(value = "basic_information") -@SuppressWarnings("serial") public class BasicInformation extends Model { @ApiModelProperty("主键id") @@ -32,116 +33,118 @@ public class BasicInformation extends Model { private Integer id; - //项目名称 @NotBlank + @Excel(name = "项目名称") @ApiModelProperty("项目名称") private String name; + @ApiModelProperty("总用地面积") + @TableField(exist = false) + private BigDecimal zydmj; + - //项目法人单位 @NotBlank + @Excel(name = "项目法人单位") @ApiModelProperty("项目法人单位") private String xmfrdwxz; - //项目法人单位性质 @NotBlank + @Excel(name = "项目法人单位性质") @ApiModelProperty("项目法人单位性质") private Integer nature; - //施工单位 @ApiModelProperty("施工单位") + @Excel(name = "施工单位") private String sgdw; - - //设计单位 @ApiModelProperty("设计单位") + @Excel(name = "设计单位") private String sjdw; - - //总投资额 @ApiModelProperty("总投资额") + @Excel(name = "总投资额") private BigDecimal ztze; - - //所属功能区 @NotBlank + @Excel(name = "所属功能区") @ApiModelProperty("所属功能区") private Integer ssgnq; - //建设起止时间 - @ApiModelProperty("建设起止时间") + @ApiModelProperty("建设开始时间") + @Excel(name = "建设开始时间",dateFormat="yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date begainTime; + @ApiModelProperty("建设结束时间") + @Excel(name = "建设结束时间",dateFormat="yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; - //现状分类 @NotBlank + @Excel(name = "现状分类") @ApiModelProperty("现状分类") private Integer xzfl; - - //建设地点 @NotBlank + @Excel(name = "建设地点") @ApiModelProperty("建设地点") private String jsdd; - //重点发展产业 @NotBlank + @Excel(name = "重点发展产业") @ApiModelProperty("重点发展产业") private String prioritize; - - //建设模式 @NotBlank + @Excel(name = "建设模式") @ApiModelProperty("建设模式") private Integer jsms; - //标签 + @Excel(name = "项目标签") @ApiModelProperty("项目标签") private String label; - - //项目负责人 @NotBlank + @Excel(name = "项目负责人") @ApiModelProperty("项目负责人") private String projectLeader; - - //联系方式 @NotBlank + @Excel(name = "联系方式") @ApiModelProperty("联系方式") private String phone; - //施工许可证发放时间 @ApiModelProperty("施工许可证发放时间") + @Excel(name = "施工许可证发放时间") // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String issuingTime; - //竣工验收时间 - @ApiModelProperty("竣工验收时间") + @ApiModelProperty("施工许可证发放时间") + @Excel(name = "施工许可证发放时间") // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String acceptanceTime; - //建设进度 @ApiModelProperty("建设进度") + @Excel(name = "建设进度") private String jsjd; - //项目法人单位简介 @NotBlank + @Excel(name = "项目法人单位简介") @ApiModelProperty("项目法人单位简介") private String unitIntroduction; - //项目简介 @NotBlank @ApiModelProperty("项目简介") private String introduction; - //附件 @ApiModelProperty("附件") private String fj; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java index 9c1bb83..4c79c74 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BuildingInformation.java @@ -5,6 +5,7 @@ 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 com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +37,7 @@ public class BuildingInformation implements Serializable { /** * 楼栋名称 */ + @Excel(name = "楼栋名称") @ApiModelProperty(value = "楼栋名称") @TableField("name") private String name; @@ -50,6 +52,7 @@ public class BuildingInformation implements Serializable { /** * 层数 */ + @Excel(name = "层数") @ApiModelProperty(value = "层数") @TableField("floor") private Integer floor; @@ -57,6 +60,7 @@ public class BuildingInformation implements Serializable { /** * 总建筑高度 */ + @Excel(name = "总建筑高度") @ApiModelProperty(value = "总建筑高度") @TableField("total_building_height") private BigDecimal totalBuildingHeight; @@ -64,6 +68,7 @@ public class BuildingInformation implements Serializable { /** * 首层高度 */ + @Excel(name = "首层高度") @ApiModelProperty(value = "首层高度") @TableField("scgd") private BigDecimal scgd; @@ -71,6 +76,7 @@ public class BuildingInformation implements Serializable { /** * 2至4层高 */ + @Excel(name = "2至4层高") @ApiModelProperty(value = "2至4层高") @TableField("two_and_four_cg") private BigDecimal twoAndFourCg; @@ -78,6 +84,7 @@ public class BuildingInformation implements Serializable { /** * 4层以上层高 */ + @Excel(name = "4层以上层高") @ApiModelProperty(value = "4层以上层高") @TableField("four_yscg") private BigDecimal fourYscg; @@ -85,6 +92,7 @@ public class BuildingInformation implements Serializable { /** * 首层地面荷载 */ + @Excel(name = "首层地面荷载") @ApiModelProperty(value = "首层地面荷载") @TableField("scdmhz") private BigDecimal scdmhz; @@ -92,6 +100,7 @@ public class BuildingInformation implements Serializable { /** * 二至三层楼面荷载 */ + @Excel(name = "二至三层楼面荷载") @ApiModelProperty(value = "二至三层楼面荷载") @TableField("two_and_three_lmhz") private BigDecimal twoAndThreeLmhz; @@ -99,6 +108,7 @@ public class BuildingInformation implements Serializable { /** * 四层及以上楼面荷载 */ + @Excel(name = "四层及以上楼面荷载") @ApiModelProperty(value = "四层及以上楼面荷载") @TableField("four_yslmhz") private BigDecimal fourYslmhz; @@ -106,6 +116,7 @@ public class BuildingInformation implements Serializable { /** * 标准层面积 */ + @Excel(name = "标准层面积") @ApiModelProperty(value = "标准层面积") @TableField("bzcmj") private BigDecimal bzcmj; @@ -113,23 +124,34 @@ public class BuildingInformation implements Serializable { /** * 柱距 */ + @Excel(name = "柱距") @ApiModelProperty(value = "柱距") @TableField("zj") - private BigDecimal zj; + private String zj; /** * 是否有吊装口 */ - @ApiModelProperty(value = "是否有吊装口") + @Excel(name = "是否有吊装口",readConverterExp="1=是,2=否") + @ApiModelProperty(value = "是否有吊装口 ，1是2否") @TableField("sfydzk") - private BigDecimal sfydzk; + private Integer sfydzk; /** * 是否有汽车盘道 */ - @ApiModelProperty(value = "是否有汽车盘道") + @Excel(name = "是否有汽车盘道",readConverterExp="1=是,2=否") + @ApiModelProperty(value = "是否有汽车盘道 , 1是2否") @TableField("sfyqcpd") - private BigDecimal sfyqcpd; + private Integer sfyqcpd; + + /** + * 是否为重要楼栋 + */ + @Excel(name = "是否为重要楼栋",readConverterExp="1=是,2=否") + @ApiModelProperty(value = "是否有汽车盘道 , 1是2否") + @TableField("sfwzyld") + private Integer sfwzyld; /** * 创建者id diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java index 7cb2dac..baabdf3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Mx.java @@ -38,7 +38,7 @@ public class Mx implements Serializable { */ @ApiModelProperty(value = "1:关键要素；2：重要要素") @TableField("type") - private Integer type; + private String type; /** * 要素名称 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java index da77582..7c2d00b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/PlanInformation.java @@ -148,6 +148,13 @@ public class PlanInformation implements Serializable { @TableField("ghwj") private String ghwj; + /** + * 防火等级 + */ + @ApiModelProperty(value = "防火等级") + @TableField("fhdj") + private String fhdj; + /** * 创建者id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java new file mode 100644 index 0000000..9edb3f0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectLegend.java @@ -0,0 +1,41 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目图例(ProjectLegend)表实体类 + * + * @author makejava + * @since 2025-03-19 10:12:35 + */ +@Data +public class ProjectLegend extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + @ApiModelProperty("图片类型") + private Integer imgType; + + @ApiModelProperty("图片") + private String img; + + @ApiModelProperty("经度") + private String longitude; + + @ApiModelProperty("纬度") + private String latitude; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java new file mode 100644 index 0000000..f3ff4fa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java @@ -0,0 +1,50 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 月度进展详情(ProjectMonthInfo)表实体类 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +@Data +public class ProjectMonthInfo extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + @ApiModelProperty("进度月份") + private String progressMonth; + + @ApiModelProperty("状态") + private Integer state; + + @ApiModelProperty("当月完成投资") + private String investMonth; + + @ApiModelProperty("累计完成投资") + private String investTotal; + + @ApiModelProperty("截至目前累计建成面积（平方米）") + private Integer finishArea; + + @ApiModelProperty("贷款额度（万元）") + private Integer loans; + + @ApiModelProperty("项目进展详情") + private String projectInfo; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java new file mode 100644 index 0000000..517d921 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectOtherInfo.java @@ -0,0 +1,33 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目其他信息(ProjectOtherInfo)表实体类 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +@Data +public class ProjectOtherInfo extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + + @ApiModelProperty("其他信息JSON") + private String otherJson; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java new file mode 100644 index 0000000..c64474d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectRemark.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目备忘录(ProjectRemark)表实体类 + * + * @author makejava + * @since 2025-03-19 10:49:35 + */ +@Data +public class ProjectRemark extends BaseEntity implements Serializable { + + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("项目id") + private Long xmId; + + @ApiModelProperty("备注") + private String remark; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java new file mode 100644 index 0000000..5268246 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/QyrzInformation.java @@ -0,0 +1,53 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * (QyrzInformation)表实体类 + * + * @author makejava + * @since 2025-03-19 15:25:18 + */ +@Data +public class QyrzInformation extends BaseEntity implements Serializable { + @TableField("id") + @TableId(type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("项目id") + private Integer xmId; + + @ApiModelProperty("入住企业数") + private Integer rzqys; + + @ApiModelProperty("入驻企业行业类型") + private String rzqyhylx; + + @ApiModelProperty("人员数量") + private Integer rysl; + + @ApiModelProperty("入住率") + private Double rzl; + + @ApiModelProperty("已出租（售）面积") + private Double yczmj; + + @ApiModelProperty("空置出租（售）面积") + private Double kzczmj; + + @ApiModelProperty("工业厂房平均租金") + private Double gycfpjzj; + + @ApiModelProperty("工业厂房平均物业费") + private Double gycfpjwyf; + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java new file mode 100644 index 0000000..23c7785 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Xmxl.java @@ -0,0 +1,42 @@ +package com.ruoyi.gysl.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * 项目巡礼(Xmxl)表实体类 + * + * @author makejava + * @since 2025-03-19 14:19:22 + */ +@Data +public class Xmxl extends BaseEntity implements Serializable { + @TableField("id") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("监控名称") + private String jkmc; + + @ApiModelProperty(value = "时间 yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate sj; + + @ApiModelProperty(value = "当前状态") + private Integer status; + + @ApiModelProperty(value = "附件") + private String fj; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java new file mode 100644 index 0000000..429eb20 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java @@ -0,0 +1,38 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 基本信息分页参数 + * @author du + * @since 2025/3/19 15:07 + */ +@Data +public class BasicInformationPageReq { + + @ApiModelProperty("项目名称") + private String name; + + @ApiModelProperty("项目法人单位") + private String xmfrdwxz; + + @ApiModelProperty("建设起止时间-开始时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @ApiModelProperty("建设起止时间-结束时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; + + @ApiModelProperty("现状分类") + private Integer xzfl; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java new file mode 100644 index 0000000..6087d5b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/RemarkPageReq.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.entity.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +/** + * 项目备忘录分页请求类 + * @author du + * @since 2025/3/19 11:21 + */ +@Data +public class RemarkPageReq { + @ApiModelProperty("项目id") + private Long xmId; + + + @ApiModelProperty(value = "查询时间 yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate startTime; + + @ApiModelProperty(value = "查询时间 yyyy-MM-dd") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate endTime; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java new file mode 100644 index 0000000..714e43b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java @@ -0,0 +1,15 @@ +package com.ruoyi.gysl.entity.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 分页请求类 + * @author du + * @since 2025/3/19 11:20 + */ +@Data +public class ZwIdPageReq { + @ApiModelProperty("项目id") + private Long xmId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java index 14f4bf0..700ebe9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BasicInformationMapper.java @@ -1,9 +1,9 @@ package com.ruoyi.gysl.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.gysl.entity.BasicInformation; -import com.ruoyi.gysl.entity.BuildingInformation; -import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import org.apache.ibatis.annotations.Param; @@ -21,5 +21,14 @@ public interface BasicInformationMapper extends BaseMapper { * 根据基本信息的id列表来查找 */ List selectList(@Param("idList") List idList); + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + Page page(Page page, @Param("req") BasicInformationPageReq req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java deleted file mode 100644 index e311e1a..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.gysl.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.gysl.entity.BuildingInformation; - -/** - * (BuildingInformation)表数据库访问层 - * - * @author makejava - * @since 2025-02-24 11:10:03 - */ -public interface BuildingInformationDao extends BaseMapper { - -} - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java new file mode 100644 index 0000000..245d5eb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/BuildingInformationMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; + +/** + * (BuildingInformation)表数据库访问层 + * + * @author makejava + * @since 2025-02-24 11:10:03 + */ +public interface BuildingInformationMapper extends BaseMapper { + + /** + * 查询所有数据 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectAll(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseMapper.java similarity index 78% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseMapper.java index bd96659..3a8293a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/EnterpriseMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.gysl.entity.Enterprise; * @author makejava * @since 2025-02-24 11:26:49 */ -public interface EnterpriseDao extends BaseMapper { +public interface EnterpriseMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java index b7c9f56..92916d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/MxMapper.java @@ -10,7 +10,7 @@ import com.ruoyi.gysl.entity.Mx; * @author makejava * @since 2025-02-24 13:40:36 */ -public interface MxDao extends BaseMapper { +public interface MxMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java index b1b5d72..a2b0bd5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PjpzMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.gysl.entity.Pjpz; * @author makejava * @since 2025-02-24 13:52:56 */ -public interface PjpzDao extends BaseMapper { +public interface PjpzMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java deleted file mode 100644 index 444a6cc..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.gysl.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.gysl.entity.PlanInformation; - -/** - * 规划信息(PlanInformation)表数据库访问层 - * - * @author makejava - * @since 2025-02-24 14:21:58 - */ -public interface PlanInformationDao extends BaseMapper { - -} - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java new file mode 100644 index 0000000..5de2b71 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/PlanInformationMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.PlanInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 规划信息(PlanInformation)表数据库访问层 + * + * @author makejava + * @since 2025-02-24 14:21:58 + */ +public interface PlanInformationMapper extends BaseMapper { + + /** + * 根据项目id查询规划信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + PlanInformation selectAll(@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java new file mode 100644 index 0000000..3feae45 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectLegendMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 项目图例(ProjectLegend)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:12:34 + */ +public interface ProjectLegendMapper extends BaseMapper { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") ZwIdPageReq projectLegend); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java new file mode 100644 index 0000000..792181b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +public interface ProjectMonthInfoMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); + + List page(@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java new file mode 100644 index 0000000..2b06ce2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectOtherInfoMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 项目其他信息(ProjectOtherInfo)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +public interface ProjectOtherInfoMapper extends BaseMapper { + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + ProjectOtherInfo searchId(@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java new file mode 100644 index 0000000..c517ed4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectRemarkMapper.java @@ -0,0 +1,24 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 10:49:35 + */ +public interface ProjectRemarkMapper extends BaseMapper { + + + /** + * 查询所有数据 + */ + List list(@Param("req") RemarkPageReq projectRemark); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java new file mode 100644 index 0000000..9bd001a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyrzInformationMapper.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * (QyrzInformation)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 15:25:17 + */ +public interface QyrzInformationMapper extends BaseMapper { + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + QyrzInformation selectAll(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java similarity index 77% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java rename to ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java index 2da1932..5f8114b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationDao.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/WysmxInformationMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.gysl.entity.WysmxInformation; * @author makejava * @since 2025-02-25 09:14:22 */ -public interface WysmxInformationDao extends BaseMapper { +public interface WysmxInformationMapper extends BaseMapper { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java new file mode 100644 index 0000000..78b315d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/XmxlMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.gysl.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.apache.ibatis.annotations.Param; + +/** + * 项目巡礼(Xmxl)表数据库访问层 + * + * @author makejava + * @since 2025-03-19 14:19:21 + */ +public interface XmxlMapper extends BaseMapper { + + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java index 40610eb..7791e72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BasicInformationService.java @@ -1,7 +1,9 @@ package com.ruoyi.gysl.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import org.apache.poi.xssf.usermodel.XSSFCellStyle; @@ -19,11 +21,19 @@ import java.util.Map; public interface BasicInformationService extends IService { /** - * 根据基本信息的id列表来查找 + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 */ - List selectList(List idList); + Page page(Page page, BasicInformationPageReq req); + /** + * 根据基本信息的id列表来查找 + */ + List selectList(List idList); /** * 填充数据 @@ -31,12 +41,12 @@ public interface BasicInformationService extends IService { void approvalMethodfillInData(XSSFSheet sheet, XSSFCellStyle contentStyle, int rowNum, List info,List sc,List ec,int a) ; /** - * 项目基础信息获取 + * 填充数据-项目基础信息获取 */ String getExcelData(ProjectExcelInfo item,String str); /** - * 项目建筑信息获取 + * 填充数据-项目建筑信息获取 */ String getBuildingData(ProjectBuildingExcel item,String str); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java index ca1ddcd..dffebc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/BuildingInformationService.java @@ -2,6 +2,9 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.BuildingInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; /** * (BuildingInformation)表服务接口 @@ -11,5 +14,12 @@ import com.ruoyi.gysl.entity.BuildingInformation; */ public interface BuildingInformationService extends IService { + /** + * 查询所有数据 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + List selectAll(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java index 4908a6c..c72f69c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/PlanInformationService.java @@ -2,6 +2,7 @@ package com.ruoyi.gysl.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.gysl.entity.PlanInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; /** * 规划信息(PlanInformation)表服务接口 @@ -11,5 +12,12 @@ import com.ruoyi.gysl.entity.PlanInformation; */ public interface PlanInformationService extends IService { + /** + * 根据项目id查询规划信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + PlanInformation selectAll(ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java new file mode 100644 index 0000000..9f638d7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectLegendService.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * 项目图例(ProjectLegend)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:12:35 + */ +public interface ProjectLegendService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + Page page(Page page, ZwIdPageReq projectLegend); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java new file mode 100644 index 0000000..1656e80 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java @@ -0,0 +1,29 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +public interface ProjectMonthInfoService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page, ZwIdPageReq zwIdPageReq); + + List page(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java new file mode 100644 index 0000000..f85537a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectOtherInfoService.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * 项目其他信息(ProjectOtherInfo)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +public interface ProjectOtherInfoService extends IService { + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + ProjectOtherInfo searchId(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java new file mode 100644 index 0000000..90fdcc5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectRemarkService.java @@ -0,0 +1,22 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.entity.request.RemarkPageReq; + +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表服务接口 + * + * @author makejava + * @since 2025-03-19 10:49:36 + */ +public interface ProjectRemarkService extends IService { + + /** + * 查询所有数据 + */ + List list(RemarkPageReq projectRemark); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java new file mode 100644 index 0000000..0affd2f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyrzInformationService.java @@ -0,0 +1,23 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * (QyrzInformation)表服务接口 + * + * @author makejava + * @since 2025-03-19 15:25:18 + */ +public interface QyrzInformationService extends IService { + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + QyrzInformation selectAll(ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java new file mode 100644 index 0000000..2f2e2fd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/XmxlService.java @@ -0,0 +1,25 @@ +package com.ruoyi.gysl.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +/** + * 项目巡礼(Xmxl)表服务接口 + * + * @author makejava + * @since 2025-03-19 14:19:22 + */ +public interface XmxlService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page , ZwIdPageReq zwIdPageReq); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index a89765f..34891aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -1,8 +1,10 @@ package com.ruoyi.gysl.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.annotation.Excel; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.request.BasicInformationPageReq; import com.ruoyi.gysl.entity.response.ProjectBuildingExcel; import com.ruoyi.gysl.entity.response.ProjectExcelInfo; import com.ruoyi.gysl.mapper.BasicInformationMapper; @@ -26,6 +28,18 @@ import java.util.Objects; @Service("basicInformationService") public class BasicInformationServiceImpl extends ServiceImpl implements BasicInformationService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param req 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, BasicInformationPageReq req) { + return baseMapper.page(page,req); + } + /** * 根据基本信息的id列表来查找 */ @@ -92,7 +106,9 @@ public class BasicInformationServiceImpl extends ServiceImpl implements BuildingInformationService { +public class BuildingInformationServiceImpl extends ServiceImpl implements BuildingInformationService { + /** + * 查询所有数据 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public List selectAll(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectAll(zwIdPageReq); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java index 511be8a..c8826e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/EnterpriseServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.EnterpriseDao; +import com.ruoyi.gysl.mapper.EnterpriseMapper; import com.ruoyi.gysl.entity.Enterprise; import com.ruoyi.gysl.service.EnterpriseService; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 11:26:49 */ @Service("enterpriseService") -public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { +public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java index 184187b..aafd2e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/MxServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.Mx; -import com.ruoyi.gysl.mapper.MxDao; +import com.ruoyi.gysl.mapper.MxMapper; import com.ruoyi.gysl.service.MxService; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 13:40:40 */ @Service("mxService") -public class MxServiceImpl extends ServiceImpl implements MxService { +public class MxServiceImpl extends ServiceImpl implements MxService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java index e140458..648c191 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PjpzServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.PjpzDao; +import com.ruoyi.gysl.mapper.PjpzMapper; import com.ruoyi.gysl.entity.Pjpz; import com.ruoyi.gysl.service.PjpzService; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 13:52:56 */ @Service("pjpzService") -public class PjpzServiceImpl extends ServiceImpl implements PjpzService { +public class PjpzServiceImpl extends ServiceImpl implements PjpzService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java index 1eba9f7..8fa53ba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/PlanInformationServiceImpl.java @@ -1,7 +1,8 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.gysl.mapper.PlanInformationDao; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.PlanInformationMapper; import com.ruoyi.gysl.entity.PlanInformation; import com.ruoyi.gysl.service.PlanInformationService; import org.springframework.stereotype.Service; @@ -13,7 +14,18 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 14:21:58 */ @Service("planInformationService") -public class PlanInformationServiceImpl extends ServiceImpl implements PlanInformationService { +public class PlanInformationServiceImpl extends ServiceImpl implements PlanInformationService { + + /** + * 根据项目id查询规划信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public PlanInformation selectAll(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectAll(zwIdPageReq); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java new file mode 100644 index 0000000..8f7c37e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectLegendServiceImpl.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.ProjectLegendMapper; +import com.ruoyi.gysl.entity.ProjectLegend; +import com.ruoyi.gysl.service.ProjectLegendService; +import org.springframework.stereotype.Service; + +/** + * 项目图例(ProjectLegend)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:12:35 + */ +@Service("projectLegendService") +public class ProjectLegendServiceImpl extends ServiceImpl implements ProjectLegendService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param projectLegend 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, ZwIdPageReq projectLegend) { + return baseMapper.page(page,projectLegend); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java new file mode 100644 index 0000000..3475af6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java @@ -0,0 +1,42 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.ProjectMonthInfoMapper; +import com.ruoyi.gysl.entity.ProjectMonthInfo; +import com.ruoyi.gysl.service.ProjectMonthInfoService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 月度进展详情(ProjectMonthInfo)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:49:03 + */ +@Service("projectMonthInfoService") +public class ProjectMonthInfoServiceImpl extends ServiceImpl implements ProjectMonthInfoService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, ZwIdPageReq zwIdPageReq) { + return baseMapper.page(page,zwIdPageReq); + } + + /** + * 查询所有数据 + */ + @Override + public List page(ZwIdPageReq zwIdPageReq) { + return baseMapper.page(zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java new file mode 100644 index 0000000..3699003 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectOtherInfoServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.ProjectOtherInfoMapper; +import com.ruoyi.gysl.entity.ProjectOtherInfo; +import com.ruoyi.gysl.service.ProjectOtherInfoService; +import org.springframework.stereotype.Service; + +/** + * 项目其他信息(ProjectOtherInfo)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:49:22 + */ +@Service("projectOtherInfoService") +public class ProjectOtherInfoServiceImpl extends ServiceImpl implements ProjectOtherInfoService { + + /** + * 根据项目id查询项目其他信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public ProjectOtherInfo searchId(ZwIdPageReq zwIdPageReq) { + return baseMapper.searchId(zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java new file mode 100644 index 0000000..505c697 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectRemarkServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.RemarkPageReq; +import com.ruoyi.gysl.mapper.ProjectRemarkMapper; +import com.ruoyi.gysl.entity.ProjectRemark; +import com.ruoyi.gysl.service.ProjectRemarkService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目备忘录(ProjectRemark)表服务实现类 + * + * @author makejava + * @since 2025-03-19 10:49:36 + */ +@Service("projectRemarkService") +public class ProjectRemarkServiceImpl extends ServiceImpl implements ProjectRemarkService { + + + /** + * 查询所有数据 + */ + @Override + public List list(RemarkPageReq projectRemark) { + return baseMapper.list(projectRemark); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java new file mode 100644 index 0000000..82fc63b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyrzInformationServiceImpl.java @@ -0,0 +1,30 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.mapper.QyrzInformationMapper; +import com.ruoyi.gysl.entity.QyrzInformation; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.service.QyrzInformationService; +import org.springframework.stereotype.Service; + +/** + * (QyrzInformation)表服务实现类 + * + * @author makejava + * @since 2025-03-19 15:25:18 + */ +@Service("qyrzInformationService") +public class QyrzInformationServiceImpl extends ServiceImpl implements QyrzInformationService { + + /** + * 根据项目id查询企业入驻基本信息 + * + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public QyrzInformation selectAll(ZwIdPageReq zwIdPageReq) { + return baseMapper.selectAll(zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index 3e0a774..9341504 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.gysl.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.gysl.entity.WysmxInformation; -import com.ruoyi.gysl.mapper.WysmxInformationDao; +import com.ruoyi.gysl.mapper.WysmxInformationMapper; import com.ruoyi.gysl.service.WysmxInformationService; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; * @since 2025-02-24 14:29:58 */ @Service("wysmxInformationService") -public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { +public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java new file mode 100644 index 0000000..c60784e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/XmxlServiceImpl.java @@ -0,0 +1,32 @@ +package com.ruoyi.gysl.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import com.ruoyi.gysl.mapper.XmxlMapper; +import com.ruoyi.gysl.entity.Xmxl; +import com.ruoyi.gysl.service.XmxlService; +import org.springframework.stereotype.Service; + +/** + * 项目巡礼(Xmxl)表服务实现类 + * + * @author makejava + * @since 2025-03-19 14:19:22 + */ +@Service("xmxlService") +public class XmxlServiceImpl extends ServiceImpl implements XmxlService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, ZwIdPageReq zwIdPageReq) { + return baseMapper.page(page,zwIdPageReq); + } +} + diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml index 7c35ab9..ea45a6c 100644 --- a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml @@ -56,4 +56,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml new file mode 100644 index 0000000..3a285eb --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/BuildingInformationMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml new file mode 100644 index 0000000..1427e6d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/PlanInformationMapper.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml new file mode 100644 index 0000000..b335771 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectLegendMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml new file mode 100644 index 0000000..f7dbf74 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml new file mode 100644 index 0000000..a161864 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectOtherInfoMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml new file mode 100644 index 0000000..290bdce --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectRemarkMapper.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml new file mode 100644 index 0000000..f984207 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/QyrzInformationMapper.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml new file mode 100644 index 0000000..51beeb8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/XmxlMapper.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java new file mode 100644 index 0000000..9305725 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java @@ -0,0 +1,65 @@ +package com.ruoyi.framework.config; + + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.SecurityUtils; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.Objects; + +/** + * 自动注入 + * + * @author wu + * @since 2023/5/4 10:16 + */ +@Component +public class MyMetaObjectHandler implements MetaObjectHandler { + + @Override + public void insertFill(MetaObject metaObject) { + // 获取当前登录用户 + + String userName = null; + Long userId = null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userName = loginUser.getUser().getNickName(); + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + } + if (!Objects.equals(userName, "")) { + this.strictInsertFill(metaObject, "createBy", String.class, userName); + this.strictInsertFill(metaObject, "updateBy", String.class, userName); + } + if (userId != null) { + this.strictInsertFill(metaObject, "createId", Long.class, userId); + this.strictInsertFill(metaObject, "updateId", Long.class, userId); + } + this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); + this.strictInsertFill(metaObject, "updateTime", Date.class, new Date()); + } + + @Override + public void updateFill(MetaObject metaObject) { + // 获取当前登录用户 + String userName = null; + Long userId = null; + try { + LoginUser loginUser = SecurityUtils.getLoginUser(); + userName = loginUser.getUser().getNickName(); + userId = SecurityUtils.getUserId(); + } catch (Exception ignored) { + } + if (userId != null) { + this.strictUpdateFill(metaObject, "updateId", Long.class, userId); + } + if (!Objects.equals(userName, "")) { + this.strictUpdateFill(metaObject, "updateBy", String.class, userName); + } + this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + } +}