From 16e89b3363f73806ed39215d6530b087e8dd44ed Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 24 Mar 2025 10:37:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicInformationController.java | 13 ++++++++++++ .../gysl/controller/QyStatsController.java | 11 +++++++++- .../gysl/controller/ZwStatsController.java | 10 +++++++++ .../ruoyi/gysl/entity/BasicInformation.java | 4 ++-- .../java/com/ruoyi/gysl/entity/Notice.java | 2 +- .../com/ruoyi/gysl/mapper/QyStatsMapper.java | 5 +++++ .../com/ruoyi/gysl/mapper/ZwStatsMapper.java | 5 +++++ .../ruoyi/gysl/service/QyStatsService.java | 5 +++++ .../ruoyi/gysl/service/ZwStatsService.java | 5 +++++ .../impl/BasicInformationServiceImpl.java | 21 ++++++++++++++++++- .../gysl/service/impl/QyStatsServiceImpl.java | 8 +++++++ .../gysl/service/impl/ZwStatsServiceImpl.java | 8 +++++++ .../main/resources/mapper/QyStatsMapper.xml | 4 ++++ .../main/resources/mapper/ZwStatsMapper.xml | 6 +++++- .../com/ruoyi/common/annotation/Excel.java | 5 +++++ .../com/ruoyi/common/utils/poi/ExcelUtil.java | 8 +++++++ 16 files changed, 114 insertions(+), 6 deletions(-) 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 1c86e3a..b10c200 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 @@ -63,6 +63,12 @@ public class BasicInformationController extends BaseController { @Resource private MxService mxService; + /** + * 消息通知 + */ + @Resource + private NoticeService noticeService; + /** * 五要素模型信息 */ @@ -188,6 +194,13 @@ public class BasicInformationController extends BaseController { projectOtherInfo.setZdname(y); saveOther.add(projectOtherInfo); }); + //新增消息 + Notice notice = new Notice(); + notice.setType(2); + notice.setTyshxydm(x.getTyshxydm()); + notice.setXmId(x.getId()); + notice.setContent("关于"+x.getName()+"项目,待填报的通知"); + noticeService.save(notice); }); successMsg.append("导入成功"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java index 9946185..58ac932 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java @@ -23,7 +23,7 @@ import javax.annotation.Resource; @Api(tags = "企业统计") @RestController @RequestMapping("/gysl/qyStats") -@PreAuthorize("@ss.hasAnyRoles('company')") +//@PreAuthorize("@ss.hasAnyRoles('company')") public class QyStatsController extends BaseController { @Resource @@ -55,5 +55,14 @@ public class QyStatsController extends BaseController { public AjaxResult qyNotice() { return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); } + + /** + * 企业消息通知数量 + */ + @ApiOperation("企业消息通知数量") + @GetMapping("/qyNoticeCount") + public AjaxResult qyNoticeCount() { + return success(qyStatsService.qyNoticeCount(SecurityUtils.getUsername())); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java index ecd9a3c..2386a36 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java @@ -79,5 +79,15 @@ public class ZwStatsController extends BaseController { public AjaxResult zwNotice() { return success(zwStatsService.zwNotice()); } + + + /** + * 政务消息通知数量 + */ + @ApiOperation("政务消息通知数量") + @GetMapping("/zwNoticeCount") + public AjaxResult zwNoticeCount() { + return success(zwStatsService.zwNoticeCount()); + } } 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 b54b628..4b205b5 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 @@ -32,13 +32,13 @@ public class BasicInformation extends BaseModel { private Long id; - @Excel(name = "统一社会信用代码", sort = 2) + @Excel(name = "统一社会信用代码", sort = 2,required = true) @ApiModelProperty("统一社会信用代码") private String tyshxydm; @NotBlank - @Excel(name = "项目名称", sort = 2) + @Excel(name = "项目名称", sort = 2,required = true) @ApiModelProperty("项目名称") private String name; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java index e389b49..a9a090d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java @@ -47,6 +47,6 @@ public class Notice implements Serializable { private LocalDateTime createTime; @ApiModelProperty(value = "项目id") - private Long zwId; + private Long xmId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java index cb68037..55ec43c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java @@ -29,5 +29,10 @@ public interface QyStatsMapper { * 消息通知 */ List qyNotice(@Param("username") String username); + + /** + * 企业消息通知数量 + */ + int qyNoticeCount(String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java index b975d4e..7ea989f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java @@ -32,5 +32,10 @@ public interface ZwStatsMapper { * 消息通知 */ List zwNotice(); + + /** + * 政务消息通知数量 + */ + int zwNoticeCount(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java index cdf289c..ac98c46 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java @@ -30,5 +30,10 @@ public interface QyStatsService { * 消息通知 */ List qyNotice(String username); + + /** + * 企业消息通知数量 + */ + int qyNoticeCount(String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java index 89413ea..b04f8dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java @@ -34,5 +34,10 @@ public interface ZwStatsService { * 消息通知 */ List zwNotice(); + + /** + * 政务消息通知数量 + */ + int zwNoticeCount(); } 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 25bf88d..9642610 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 @@ -74,7 +74,11 @@ public class BasicInformationServiceImpl extends ServiceImpl zwNotice() { return zwStatsMapper.zwNotice(); } + + /** + * 政务消息通知数量 + */ + @Override + public int zwNoticeCount() { + return zwStatsMapper.zwNoticeCount(); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml index 70354d1..64472f2 100644 --- a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml @@ -33,5 +33,9 @@ select * from notice where tyshxydm = #{username} and type = 2 + diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml index 4058cd5..77e277c 100644 --- a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml @@ -41,7 +41,11 @@ + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index f13271c..7c9a893 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -18,6 +18,11 @@ import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; @Target(ElementType.FIELD) public @interface Excel { + /** + * 判断是否必填项 + */ + public boolean required() default false; + /** * 导出时在excel中排序 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 1ac9ed9..ea2ea60 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -24,6 +24,8 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.exception.ServiceException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -421,6 +423,12 @@ public class ExcelUtil // 从map中得到对应列的field. Field field = (Field) entry.getValue()[0]; Excel attr = (Excel) entry.getValue()[1]; + boolean rq = attr.required(); + if(rq){ + if(StringUtils.isNull(val) || StringUtils.isEmpty(val.toString())) { + throw new ServiceException("第"+i+"行"+attr.name()+"单元格必填项未填写,请正确填写!"); + } + } // 取得类型,并根据对象类型设置值. Class fieldType = field.getType(); if (String.class == fieldType) From c47b126c74e916d06f03d6c47b285d0cb5633c76 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 24 Mar 2025 10:38:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/gysl/controller/BuildingInformationController.java | 2 -- 1 file changed, 2 deletions(-) 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 0e68faa..7944047 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 @@ -64,7 +64,6 @@ public class BuildingInformationController extends BaseController { * @param buildingInformation 实体对象 * @return 新增结果 */ - @PreAuthorize("@ss.hasAnyRoles('company')") @PostMapping("/add") @ApiOperation("新增数据") public AjaxResult insert(@RequestBody BuildingInformation buildingInformation) { @@ -78,7 +77,6 @@ public class BuildingInformationController extends BaseController { * @param buildingInformation 实体对象 * @return 修改结果 */ - @PreAuthorize("@ss.hasAnyRoles('company')") @PostMapping("/edit") @ApiOperation("修改数据") public AjaxResult update(@RequestBody BuildingInformation buildingInformation) { From 2870f5685944b37cb4e9ce47426103c8d6e07256 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 24 Mar 2025 13:59:16 +0800 Subject: [PATCH 3/4] bugfix --- .../BuildingInformationController.java | 18 ++++++++++++++---- .../ruoyi/gysl/controller/MxController.java | 2 +- .../controller/ProjectLegendController.java | 15 ++++++++++++++- .../controller/ProjectMonthInfoController.java | 16 ++++++++++++++++ .../controller/ProjectRemarkController.java | 14 +++++++++++++- .../ruoyi/gysl/controller/XmxlController.java | 13 +++++++++++++ 6 files changed, 71 insertions(+), 7 deletions(-) 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 7944047..1719589 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 @@ -4,16 +4,13 @@ package com.ruoyi.gysl.controller; 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.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.gysl.entity.BasicInformation; import com.ruoyi.gysl.entity.BuildingInformation; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.BuildingInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -21,7 +18,6 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.io.Serializable; import java.util.List; -import java.util.Objects; /** * 建筑信息表(BuildingInformation)表控制层 @@ -58,6 +54,20 @@ public class BuildingInformationController extends BaseController { } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/{id}") + @ApiOperation(value = "通过主键查询单条数据",response = BuildingInformation.class ) + public AjaxResult selectOne(@PathVariable Serializable id) { + BuildingInformation byId = buildingInformationService.getById(id); + basicInformationService.testXmId(byId.getXmId()); + return success(byId); + } + /** * 新增数据 * 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 d725939..706eadf 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 @@ -23,7 +23,7 @@ import java.util.List; @Api(tags = "模型管理") @RestController @RequestMapping("/gysl/mx") -@PreAuthorize("@ss.hasAnyRoles('admin,common')") + public class MxController extends BaseController { 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 index 06751eb..a76df92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectLegendController.java @@ -9,7 +9,6 @@ import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ProjectLegendService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -63,6 +62,20 @@ public class ProjectLegendController extends BaseController { return success(projectLegendService.save(projectLegend)); } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/{id}") + @ApiOperation(value = "通过主键查询单条数据",response = ProjectLegend.class ) + public AjaxResult selectOne(@PathVariable Serializable id) { + ProjectLegend byId = projectLegendService.getById(id); + basicInformationService.testXmId(byId.getXmId()); + return success(byId); + } + /** * 修改数据 * 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 index 00dbb34..6c99393 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.Serializable; import java.util.List; /** @@ -67,6 +68,21 @@ public class ProjectMonthInfoController extends BaseController { return success(projectMonthInfoService.save(projectMonthInfo)); } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/{id}") + @ApiOperation(value = "通过主键查询单条数据",response = ProjectMonthInfo.class ) + public AjaxResult selectOne(@PathVariable Serializable id) { + ProjectMonthInfo byId = projectMonthInfoService.getById(id); + basicInformationService.testXmId(byId.getXmId()); + return success(byId); + } + + /** * 修改数据 * 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 index abf7e26..dcbcd85 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectRemarkController.java @@ -50,7 +50,19 @@ public class ProjectRemarkController extends BaseController { return success(projectRemarkService.list(projectRemark)); } - + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/{id}") + @ApiOperation(value = "通过主键查询单条数据",response = ProjectRemark.class ) + public AjaxResult selectOne(@PathVariable Serializable id) { + ProjectRemark byId = projectRemarkService.getById(id); + basicInformationService.testXmId(byId.getXmId()); + return success(byId); + } /** * 新增数据 * 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 index 62bf4db..3d2a13f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmxlController.java @@ -51,6 +51,19 @@ public class XmxlController extends BaseController { return success(xmxlService.list(zwIdPageReq)); } + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/{id}") + @ApiOperation(value = "通过主键查询单条数据",response = Xmxl.class ) + public AjaxResult selectOne(@PathVariable Serializable id) { + Xmxl byId = xmxlService.getById(id); + basicInformationService.testXmId(byId.getXmId()); + return success(byId); + } /** * 新增数据 From 92b5710a41aa13e3e5f3401bad2933ab2a89f8b9 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Tue, 25 Mar 2025 17:09:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5=EF=BC=88?= =?UTF-8?q?=E6=9C=AA=E6=B5=8B=E8=AF=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docking/controller/ProjectController.java | 44 +++ .../ProjectProgressController.java} | 68 ++-- .../com/ruoyi/docking/entity/Project.java | 312 ++++++++++++++++++ .../ruoyi/docking/entity/ProjectProgress.java | 128 +++++++ .../ruoyi/docking/mapper/ProjectMapper.java | 15 + .../mapper/ProjectProgressMapper.java} | 16 +- .../service/ProjectProgressService.java | 35 ++ .../ruoyi/docking/service/ProjectService.java | 22 ++ .../impl/ProjectProgressServiceImpl.java | 63 ++++ .../service/impl/ProjectServiceImpl.java | 45 +++ .../BasicInformationController.java | 20 +- .../ruoyi/gysl/entity/ProjectMonthInfo.java | 52 --- .../gysl/entity/request/ZwIdPageReq.java | 2 +- .../com/ruoyi/gysl/regular/NoticeTiming.java | 26 ++ .../gysl/service/ProjectMonthInfoService.java | 29 -- .../impl/BasicInformationServiceImpl.java | 10 +- .../impl/ProjectMonthInfoServiceImpl.java | 42 --- .../main/resources/application-internet.yml | 61 ++++ .../main/resources/mapper/ProjectMapper.xml | 99 ++++++ .../mapper/ProjectMonthInfoMapper.xml | 14 - .../mapper/ProjectProgressMapper.xml | 14 + 21 files changed, 926 insertions(+), 191 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectController.java rename ruoyi-admin/src/main/java/com/ruoyi/{gysl/controller/ProjectMonthInfoController.java => docking/controller/ProjectProgressController.java} (50%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/entity/Project.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/entity/ProjectProgress.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectMapper.java rename ruoyi-admin/src/main/java/com/ruoyi/{gysl/mapper/ProjectMonthInfoMapper.java => docking/mapper/ProjectProgressMapper.java} (50%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectProgressService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectProgressServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectServiceImpl.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ProjectMonthInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/application-internet.yml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectController.java new file mode 100644 index 0000000..3f353db --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectController.java @@ -0,0 +1,44 @@ +package com.ruoyi.docking.controller; + + +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.docking.service.ProjectService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 项目（对接数据）(Project)表控制层 + * + * @author makejava + * @since 2025-03-25 14:47:53 + */ +@Api(tags = "项目（对接数据）") +@RestController +@RequestMapping("/gysl/project") +public class ProjectController extends BaseController { +// /** +// * 服务对象 +// */ +// @Resource +// private ProjectService projectService; +// +// /** +// * 查询所有数据 +// * @return 所有数据 +// */ +// @ApiOperation("查询所有数据") +// @GetMapping("/list") +// @DataSource(value = DataSourceType.SLAVE) +// public AjaxResult selectAll() { +// return success(projectService.list()); +// } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectProgressController.java similarity index 50% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java rename to ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectProgressController.java index 6c99393..4d5a0b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ProjectMonthInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/controller/ProjectProgressController.java @@ -1,14 +1,13 @@ -package com.ruoyi.gysl.controller; +package com.ruoyi.docking.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.docking.entity.ProjectProgress; +import com.ruoyi.docking.service.ProjectProgressService; import com.ruoyi.gysl.entity.request.ZwIdPageReq; -import com.ruoyi.gysl.service.BasicInformationService; -import com.ruoyi.gysl.service.ProjectMonthInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -20,38 +19,33 @@ import java.io.Serializable; import java.util.List; /** - * 月度进展详情(ProjectMonthInfo)表控制层 + * 项目月度进度（对接数据）(ProjectProgress)表控制层 * * @author makejava - * @since 2025-03-19 10:49:03 + * @since 2025-03-25 14:49:04 */ -@Api(tags = "月度进展详情") +@Api(tags = "项目月度进度（对接数据）") @RestController -@RequestMapping("/gysl/projectMonthInfo") -public class ProjectMonthInfoController extends BaseController { +@RequestMapping("/gysl/projectProgress") +public class ProjectProgressController extends BaseController { /** * 服务对象 */ @Resource - private ProjectMonthInfoService projectMonthInfoService; + private ProjectProgressService projectProgressService; - /** - * 基本信息 - */ - @Resource - private BasicInformationService basicInformationService; /** * 分页查询所有数据 * - * @param page 分页对象 + * @param page 分页对象 * @param zwIdPageReq 查询实体 * @return 所有数据 */ - @ApiOperation("分页查询所有数据") + @ApiOperation(value = "分页查询所有数据", response = ProjectProgress.class) @GetMapping("/page") - public AjaxResult selectAll(Page page,@Valid ZwIdPageReq zwIdPageReq) { - return success(projectMonthInfoService.page(page, zwIdPageReq)); + public AjaxResult selectAll(Page page, @Valid ZwIdPageReq zwIdPageReq) { + return success(projectProgressService.page(page, zwIdPageReq)); } @@ -63,11 +57,20 @@ public class ProjectMonthInfoController extends BaseController { */ @ApiOperation("新增数据") @PostMapping("/add") - public AjaxResult insert(@RequestBody ProjectMonthInfo projectMonthInfo) { - basicInformationService.testXmId(projectMonthInfo.getXmId()); - return success(projectMonthInfoService.save(projectMonthInfo)); + public AjaxResult insert(@RequestBody ProjectProgress projectMonthInfo) { + return success(projectProgressService.save(projectMonthInfo)); } +// /** +// * 测试 +// */ +// @GetMapping("/test") +// @ApiOperation(value = "测试", response = ProjectProgress.class) +// public AjaxResult test() { +// return success(projectProgressService.djList()); +// } + + /** * 通过主键查询单条数据 * @@ -75,25 +78,22 @@ public class ProjectMonthInfoController extends BaseController { * @return 单条数据 */ @GetMapping("/{id}") - @ApiOperation(value = "通过主键查询单条数据",response = ProjectMonthInfo.class ) + @ApiOperation(value = "通过主键查询单条数据", response = ProjectProgress.class) public AjaxResult selectOne(@PathVariable Serializable id) { - ProjectMonthInfo byId = projectMonthInfoService.getById(id); - basicInformationService.testXmId(byId.getXmId()); - return success(byId); + return success(projectProgressService.getById(id)); } /** * 修改数据 * - * @param projectMonthInfo 实体对象 + * @param projectProgress 实体对象 * @return 修改结果 */ @ApiOperation("修改数据") @PutMapping("/edit") - public AjaxResult update(@RequestBody ProjectMonthInfo projectMonthInfo) { - basicInformationService.testXmId(projectMonthInfo.getXmId()); - return success(projectMonthInfoService.updateById(projectMonthInfo)); + public AjaxResult update(@RequestBody ProjectProgress projectProgress) { + return success(projectProgressService.updateById(projectProgress)); } /** @@ -105,7 +105,7 @@ public class ProjectMonthInfoController extends BaseController { @ApiOperation("删除数据") @DeleteMapping("/delete") public AjaxResult delete(@RequestParam("idList") List idList) { - return success(projectMonthInfoService.removeByIds(idList)); + return success(projectProgressService.removeByIds(idList)); } /** @@ -114,9 +114,9 @@ public class ProjectMonthInfoController extends BaseController { @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, "企业名录数据"); + List filteredList = projectProgressService.page(zwIdPageReq); + ExcelUtil util = new ExcelUtil<>(ProjectProgress.class); + util.exportExcel(response, filteredList, "月度进展详情"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/Project.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/Project.java new file mode 100644 index 0000000..2a308a7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/Project.java @@ -0,0 +1,312 @@ +package com.ruoyi.docking.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目（对接数据）(Project)表实体类 + * + * @author makejava + * @since 2025-03-25 15:12:38 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("project") +@ApiModel(value="项目",description = "对接数据") +public class Project { + + + @ApiModelProperty(value ="项目ID" ) + private Integer projectId; + + + @ApiModelProperty(value ="项目名称" ) + private String projectName; + + + @ApiModelProperty(value ="单位代码" ) + private String companyId; + + + @ApiModelProperty(value ="单位名称" ) + private String companyName; + + + @ApiModelProperty(value ="成立日期" ) + private String companyTime; + + + @ApiModelProperty(value ="代建单位代码" ) + private String agentCompanyId; + + + @ApiModelProperty(value ="代建单位名称" ) + private String agentCompanyName; + + + @ApiModelProperty(value ="企业联系人姓名" ) + private String contactName; + + + @ApiModelProperty(value ="企业联系人电话" ) + private String contactPhone; + + + @ApiModelProperty(value ="项目申报类型" ) + private String projectType; + + + @ApiModelProperty(value ="部门ID" ) + private String organizationId; + + + @ApiModelProperty(value ="二级部门ID" ) + private String subOrganizationId; + + + @ApiModelProperty(value ="招商部门ID" ) + private String zsOrganizationId; + + + @ApiModelProperty(value ="一级项目类型" ) + private String typeId; + + + @ApiModelProperty(value ="二级项目类型" ) + private String secondTypeId; + + + @ApiModelProperty(value ="三级项目类型" ) + private String thirdTypeId; + + + @ApiModelProperty(value ="实事项目一级分类" ) + private String ssTypeId; + + + @ApiModelProperty(value ="版块区域" ) + private String areaId; + + + @ApiModelProperty(value ="地点" ) + private String address; + + + @ApiModelProperty(value ="纬度" ) + private String lat; + + + @ApiModelProperty(value ="经度" ) + private String lng; + + + @ApiModelProperty(value ="实际开工时间" ) + private String actualStartTime; + + + @ApiModelProperty(value ="实际竣工时间" ) + private String actualEndTime; + + + @ApiModelProperty(value ="竣工验收情况" ) + private String jgysStatus; + + + @ApiModelProperty(value ="投产投用情况" ) + private String tctyStatus; + + + @ApiModelProperty(value ="投产投用时间" ) + private String operationTime; + + + @ApiModelProperty(value ="投资类别" ) + private String investmentType; + + + @ApiModelProperty(value ="投资主体" ) + private String investmentEntity; + + + @ApiModelProperty(value ="投资主体性质" ) + private String investmentEntityType; + + + @ApiModelProperty(value ="形象图片" ) + private String thumbnail; + + + @ApiModelProperty(value ="备注" ) + private String remark; + + + @ApiModelProperty(value ="状态" ) + private String status; + + + @ApiModelProperty(value ="审核阶段" ) + private Integer reviewStep; + + + @ApiModelProperty(value ="0：无需审核,review_step=3，1，项目，2：计划/结转" ) + private Integer reviewObject; + + + @ApiModelProperty(value ="审核结果" ) + private Integer reviewResult; + + + @ApiModelProperty(value ="项目形象进度" ) + private String progressContent; + + + @ApiModelProperty(value ="项目进度更新时间" ) + private Integer progressUpdateAt; + + + @ApiModelProperty(value ="外部项目ID" ) + private String extProjectId; + + + @ApiModelProperty(value ="省投资项目ID" ) + private String stzProjectId; + + + @ApiModelProperty(value ="施工许可项目编码" ) + private String sgxkProjectId; + + + @ApiModelProperty(value ="用地规划项目编码" ) + private Integer ydghProjectId; + + + @ApiModelProperty(value ="工程规划项目编码" ) + private Integer gcghProjectId; + + + @ApiModelProperty(value ="环评项目编码" ) + private Integer hpProjectId; + + + @ApiModelProperty(value ="生成系统项目编码" ) + private String genProjectId; + + + @ApiModelProperty(value ="地块编号" ) + private String landId; + + + @ApiModelProperty(value ="云平台重点项目编码" ) + private String zdxmProjectId; + + + @ApiModelProperty(value ="应报尽报项目编码" ) + private String ybjbProjectId; + + + @ApiModelProperty(value ="落地时间" ) + private String landingTime; + + + @ApiModelProperty(value ="是否落地" ) + private Integer landing; + + + @ApiModelProperty(value ="维度ID" ) + private String dimensionIds; + + + @ApiModelProperty(value ="指挥部ID" ) + private String headquarterIds; + + + @ApiModelProperty(value ="竣工验收备案id" ) + private Integer jgysbaId; + + + @ApiModelProperty(value ="能评id" ) + private Integer npId; + + + @ApiModelProperty(value ="消防验收id" ) + private Integer xfysId; + + + @ApiModelProperty(value ="是否为无效项目" ) + private Integer isDisabled; + + + @ApiModelProperty(value ="是否列入统计" ) + private Integer isStats; + + + @ApiModelProperty(value ="是否为草稿" ) + private Integer isDraft; + + + @ApiModelProperty(value ="创建时间" ) + private Integer createdAt; + + + @ApiModelProperty(value ="更新时间" ) + private Integer updatedAt; + + + @ApiModelProperty(value ="创建用户" ) + private String createdBy; + + + @ApiModelProperty(value ="删除标记" ) + private Integer isDeleted; + + + @ApiModelProperty(value ="宗地号" ) + private String landNo; + + + @ApiModelProperty(value ="宗地用途" ) + private String landUsage; + + + @ApiModelProperty(value ="宗地面积" ) + private String landArea; + + + @ApiModelProperty(value ="宗地位置" ) + private String landAddress; + + + @ApiModelProperty(value ="宗地约定开工时间" ) + private String landStartDate; + + + @ApiModelProperty(value ="宗地号约定竣工时间" ) + private String landEndDate; + + + @ApiModelProperty(value ="宗地权利人名称" ) + private String landObligeeName; + + + @ApiModelProperty(value ="宗地批准时间" ) + private String landApproveTime; + + + @ApiModelProperty(value ="首页项目巡礼是否展示" ) + private Integer homeDisplay; + + + @ApiModelProperty(value ="是否分期：0-否，1-是" ) + private Integer installment; + + + @ApiModelProperty(value ="项目期数" ) + private Integer installmentNum; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/ProjectProgress.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/ProjectProgress.java new file mode 100644 index 0000000..7fba7b4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/entity/ProjectProgress.java @@ -0,0 +1,128 @@ +package com.ruoyi.docking.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目月度进度（对接数据）(ProjectProgress)表实体类 + * + * @author makejava + * @since 2025-03-25 15:06:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("project_progress") +@ApiModel(value="项目月度进度",description = "对接数据") +public class ProjectProgress { + + @TableId(type = IdType.AUTO) + @ApiModelProperty(value ="项目进度ID" ) + private Integer progressId; + + + @ApiModelProperty(value ="项目ID" ) + private Integer projectId; + + + @ApiModelProperty(value ="月份" ) + private String month; + + + @ApiModelProperty(value ="状态" ) + private String status; + + + @ApiModelProperty(value ="本月完成投资" ) + private Float monthDoneAmount; + + + @ApiModelProperty(value ="本年完成投资" ) + private Float doneAmount; + + + @ApiModelProperty(value ="项目累计完成投资" ) + private Float totalDoneAmount; + + + @ApiModelProperty(value ="项目形象进度" ) + private String progressContent; + + + @ApiModelProperty(value ="项目进度图片" ) + private String progressImages; + + + @ApiModelProperty(value ="预计开工时间" ) + private String startTime; + + + @ApiModelProperty(value ="预计竣工时间" ) + private String endTime; + + + @ApiModelProperty(value ="当年度财务支出(开票)数" ) + private Float financialExpense; + + + @ApiModelProperty(value ="创建用户" ) + private String createdBy; + + + @ApiModelProperty(value ="创建时间" ) + private Integer createdAt; + + + @ApiModelProperty(value ="年度" ) + private String year; + + + @ApiModelProperty(value ="实际开工时间" ) + private String actualStartTime; + + + @ApiModelProperty(value ="预计投产投用时间" ) + private String operationTime; + + + @ApiModelProperty(value ="实际投产投用时间" ) + private String actualOperationTime; + + + @ApiModelProperty(value ="投产投用情况，0否，1部分，2全部" ) + private String tctyStatus; + + + @ApiModelProperty(value ="预计年产值" ) + private Float planRevenue; + + + @ApiModelProperty(value ="竣工验收情况，1部分，2全部" ) + private String jgysStatus; + + + @ApiModelProperty(value ="预计投产后税收" ) + private Float planTax; + + + @ApiModelProperty(value ="当年产值" ) + private Float currentRevenue; + + + @ApiModelProperty(value ="当年税收" ) + private Float currentTax; + + + @ApiModelProperty(value ="下一年产值" ) + private Float nextRevenue; + + + @ApiModelProperty(value ="下一年税收" ) + private Float nextTax; +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectMapper.java new file mode 100644 index 0000000..a7711bc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.docking.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.docking.entity.Project; + +/** + * 项目（对接数据）(Project)表数据库访问层 + * + * @author makejava + * @since 2025-03-25 14:47:57 + */ +public interface ProjectMapper extends BaseMapper { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectProgressMapper.java similarity index 50% rename from ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java rename to ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectProgressMapper.java index 792181b..6854df4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ProjectMonthInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/mapper/ProjectProgressMapper.java @@ -1,20 +1,21 @@ -package com.ruoyi.gysl.mapper; +package com.ruoyi.docking.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.docking.entity.ProjectProgress; import com.ruoyi.gysl.entity.request.ZwIdPageReq; import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 月度进展详情(ProjectMonthInfo)表数据库访问层 + * 项目月度进度（对接数据）(ProjectProgress)表数据库访问层 * * @author makejava - * @since 2025-03-19 10:49:03 + * @since 2025-03-25 14:49:04 */ -public interface ProjectMonthInfoMapper extends BaseMapper { +public interface ProjectProgressMapper extends BaseMapper { + /** * 分页查询所有数据 @@ -23,8 +24,7 @@ public interface ProjectMonthInfoMapper extends BaseMapper { * @param zwIdPageReq 查询实体 * @return 所有数据 */ - Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); - - List page(@Param("req") ZwIdPageReq zwIdPageReq); + Page page(Page page,@Param("req") ZwIdPageReq zwIdPageReq); + List page( @Param("req") ZwIdPageReq zwIdPageReq); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectProgressService.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectProgressService.java new file mode 100644 index 0000000..a7e3fd7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectProgressService.java @@ -0,0 +1,35 @@ +package com.ruoyi.docking.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.docking.entity.ProjectProgress; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; + +import javax.validation.Valid; +import java.util.List; + +/** + * 项目月度进度（对接数据）(ProjectProgress)表服务接口 + * + * @author makejava + * @since 2025-03-25 14:49:04 + */ +public interface ProjectProgressService extends IService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param zwIdPageReq 查询实体 + * @return 所有数据 + */ + Page page(Page page, ZwIdPageReq zwIdPageReq); + + List page( ZwIdPageReq zwIdPageReq); + + /** + * 获取项目月度信息对接数据 + */ + List djList(); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectService.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectService.java new file mode 100644 index 0000000..7a3623f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/ProjectService.java @@ -0,0 +1,22 @@ +package com.ruoyi.docking.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.docking.entity.Project; + +import java.util.List; + +/** + * 项目（对接数据）(Project)表服务接口 + * + * @author makejava + * @since 2025-03-25 14:47:59 + */ +public interface ProjectService extends IService { + + + /** + * 获取项目信息对接数据 + */ + List djList(); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectProgressServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectProgressServiceImpl.java new file mode 100644 index 0000000..1a7330c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectProgressServiceImpl.java @@ -0,0 +1,63 @@ +package com.ruoyi.docking.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.docking.entity.ProjectProgress; +import com.ruoyi.docking.mapper.ProjectProgressMapper; +import com.ruoyi.docking.service.ProjectProgressService; +import com.ruoyi.gysl.entity.request.ZwIdPageReq; +import org.springframework.stereotype.Service; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.List; + +/** + * 项目月度进度（对接数据）(ProjectProgress)表服务实现类 + * + * @author makejava + * @since 2025-03-25 14:49:04 + */ +@Service("projectProgressService") +public class ProjectProgressServiceImpl extends ServiceImpl implements ProjectProgressService { + + + /** + * 分页查询所有数据 + * + * @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); + } + + /** + * 获取项目月度信息对接数据 + */ + @DataSource(value = DataSourceType.SLAVE) + @Override + public List djList() { + //获取当前时间的上一个月的秒级时间戳 + // 获取当前时间（带时区） + ZonedDateTime now = ZonedDateTime.now(ZoneId.systemDefault()); + // 计算上个月同一时间（自动处理跨月边界） + ZonedDateTime lastMonth = now.minusMonths(1); + // 上个月的时间转换为秒级时间戳 + long timestamp = lastMonth.toEpochSecond(); + // 当前的时间转换为秒级时间戳 + long nowTime = now.toEpochSecond(); + return lambdaQuery().ge(ProjectProgress::getCreatedAt, timestamp) + .lt(ProjectProgress::getCreatedAt, nowTime).list(); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectServiceImpl.java new file mode 100644 index 0000000..8665487 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/docking/service/impl/ProjectServiceImpl.java @@ -0,0 +1,45 @@ +package com.ruoyi.docking.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataSource; +import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.docking.entity.ProjectProgress; +import com.ruoyi.docking.mapper.ProjectMapper; +import com.ruoyi.docking.entity.Project; +import com.ruoyi.docking.service.ProjectService; +import org.springframework.stereotype.Service; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.List; + +/** + * 项目（对接数据）(Project)表服务实现类 + * + * @author makejava + * @since 2025-03-25 14:47:59 + */ +@Service("projectService") +public class ProjectServiceImpl extends ServiceImpl implements ProjectService { + + + /** + * 获取项目信息对接数据 + */ + @DataSource(value = DataSourceType.SLAVE) + @Override + public List djList() { + //获取当前时间的上一个月的秒级时间戳 + // 获取当前时间（带时区） + ZonedDateTime now = ZonedDateTime.now(ZoneId.systemDefault()); + // 计算上个月同一时间（自动处理跨月边界） + ZonedDateTime lastMonth = now.minusMonths(1); + // 上个月的时间转换为秒级时间戳 + long timestamp = lastMonth.toEpochSecond(); + // 当前的时间转换为秒级时间戳 + long nowTime = now.toEpochSecond(); + return lambdaQuery().ge(Project::getCreatedAt, timestamp) + .lt(Project::getCreatedAt, nowTime).list(); + } +} + 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 b10c200..1255ea7 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 @@ -109,7 +109,11 @@ public class BasicInformationController extends BaseController { @ApiOperation(value = "企业端提交填报") @PostMapping("/fill") public AjaxResult fill(@RequestBody AuditRequest req) { - return success(basicInformationService.audit(req,2)); + BasicInformation byId = basicInformationService.getById(req.getBasicInformation().getId()); + if (byId.getStatus() != 1) { + throw new ServiceException("暂不能提交!"); + } + return success(basicInformationService.audit(req, 2)); } /** @@ -119,7 +123,11 @@ public class BasicInformationController extends BaseController { @ApiOperation(value = "政务端审核") @PostMapping("/audit") public AjaxResult audit(@RequestBody AuditRequest req) { - return success(basicInformationService.audit(req,3)); + BasicInformation byId = basicInformationService.getById(req.getBasicInformation().getId()); + if (byId.getStatus() == 1) { + throw new ServiceException("请等待企业填报!"); + } + return success(basicInformationService.audit(req, 3)); } @@ -129,7 +137,7 @@ public class BasicInformationController extends BaseController { * @param id 主键 * @return 单条数据 */ - @ApiOperation(value = "通过主键查询单条项目所有数据",response = BasicInformationResponse.class) + @ApiOperation(value = "通过主键查询单条项目所有数据", response = BasicInformationResponse.class) @GetMapping("/{id}") public AjaxResult selectOne(@PathVariable Long id) { return success(basicInformationService.selectOne(id)); @@ -186,9 +194,9 @@ public class BasicInformationController extends BaseController { qyrzInformation.setXmId(x.getId()); qyrzInformationService.save(qyrzInformation); //基本信息 - String[] otherInfo = {"改造前容积率","改造后容积率","亩均税收(万元/每亩)","亩均销售(万元/每亩)","贷款情况","荣誉情况"}; + String[] otherInfo = {"改造前容积率", "改造后容积率", "亩均税收(万元/每亩)", "亩均销售(万元/每亩)", "贷款情况", "荣誉情况"}; List saveOther = new ArrayList<>(); - Arrays.asList(otherInfo).forEach(y->{ + Arrays.asList(otherInfo).forEach(y -> { ProjectOtherInfo projectOtherInfo = new ProjectOtherInfo(); projectOtherInfo.setXmId(x.getId()); projectOtherInfo.setZdname(y); @@ -199,7 +207,7 @@ public class BasicInformationController extends BaseController { notice.setType(2); notice.setTyshxydm(x.getTyshxydm()); notice.setXmId(x.getId()); - notice.setContent("关于"+x.getName()+"项目,待填报的通知"); + notice.setContent("关于" + x.getName() + "项目,待填报的通知"); noticeService.save(notice); }); successMsg.append("导入成功"); 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 deleted file mode 100644 index a9b84b3..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/ProjectMonthInfo.java +++ /dev/null @@ -1,52 +0,0 @@ -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.ruoyi.gysl.entity.baseModel.BaseModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 月度进展详情(ProjectMonthInfo)表实体类 - * - * @author makejava - * @since 2025-03-19 10:49:03 - */ -@TableName("project_month_info") -@Data -public class ProjectMonthInfo extends BaseModel 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/request/ZwIdPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/ZwIdPageReq.java index 3f8ae01..b1ed787 100644 --- 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 @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; @Data public class ZwIdPageReq { - @NotNull + @NotNull(message = "项目id不能为空!") @ApiModelProperty("项目id") private Long xmId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java index 67f604a..2b2a69a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java @@ -1,5 +1,9 @@ package com.ruoyi.gysl.regular; +import com.ruoyi.docking.entity.Project; +import com.ruoyi.docking.entity.ProjectProgress; +import com.ruoyi.docking.service.ProjectProgressService; +import com.ruoyi.docking.service.ProjectService; import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.service.NoticeService; import org.springframework.context.annotation.Configuration; @@ -8,6 +12,7 @@ import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; import java.time.LocalDate; +import java.util.List; /** * 每月固定时间定时任务 @@ -21,6 +26,12 @@ public class NoticeTiming { @Resource private NoticeService noticeService; + @Resource + private ProjectProgressService projectProgressService; + + @Resource + private ProjectService projectService; + /** * 每个月固定发一次政务通知 */ @@ -35,4 +46,19 @@ public class NoticeTiming { "项目进展未填写"); noticeService.save(notice); } + + /** + * 每个月1号的2点进行上个月的项目月度信息查询并进行新增 + */ + @Scheduled(cron = "0 0 2 1 * ?") // 每月1号 2:00:00 执行 + private void changeProgress() { + List pList = projectProgressService.djList(); + //修改该progressId为空 + pList.forEach(x-> x.setProgressId(null)); + //批量新增 + projectProgressService.saveBatch(pList); + + List pjList = projectService.djList(); + projectService.saveBatch(pjList); + } } 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 deleted file mode 100644 index 1656e80..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ProjectMonthInfoService.java +++ /dev/null @@ -1,29 +0,0 @@ -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/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 9642610..4e9d039 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 @@ -82,8 +82,8 @@ public class BasicInformationServiceImpl 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/resources/application-internet.yml b/ruoyi-admin/src/main/resources/application-internet.yml new file mode 100644 index 0000000..df8f989 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-internet.yml @@ -0,0 +1,61 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://39.101.188.84:3307/gysl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: Admin123@ + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: true + url: jdbc:mysql://172.25.227.3:3306/sip_data_gdzc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: gyslgl + password: ryw!@63@w%4 + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml new file mode 100644 index 0000000..6dc2ba0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into gysl.project(project_namecompany_idcompany_namecompany_timeagent_company_idagent_company_namecontact_namecontact_phoneproject_typeorganization_idsub_organization_idzs_organization_idtype_idsecond_type_idthird_type_idss_type_idarea_idaddresslatlngactual_start_timeactual_end_timejgys_statustcty_statusoperation_timeinvestment_typeinvestment_entityinvestment_entity_typethumbnailremarkstatusreview_stepreview_objectreview_resultprogress_contentprogress_update_atext_project_idstz_project_idsgxk_project_idydgh_project_idgcgh_project_idhp_project_idgen_project_idland_idzdxm_project_idybjb_project_idlanding_timelandingdimension_idsheadquarter_idsjgysba_idnp_idxfys_idis_disabledis_statsis_draftcreated_atupdated_atcreated_byis_deletedland_noland_usageland_arealand_addressland_start_dateland_end_dateland_obligee_nameland_approve_timehome_displayinstallmentinstallment_num) + values + + (#{entity.projectName}#{entity.companyId}#{entity.companyName}#{entity.companyTime}#{entity.agentCompanyId}#{entity.agentCompanyName}#{entity.contactName}#{entity.contactPhone}#{entity.projectType}#{entity.organizationId}#{entity.subOrganizationId}#{entity.zsOrganizationId}#{entity.typeId}#{entity.secondTypeId}#{entity.thirdTypeId}#{entity.ssTypeId}#{entity.areaId}#{entity.address}#{entity.lat}#{entity.lng}#{entity.actualStartTime}#{entity.actualEndTime}#{entity.jgysStatus}#{entity.tctyStatus}#{entity.operationTime}#{entity.investmentType}#{entity.investmentEntity}#{entity.investmentEntityType}#{entity.thumbnail}#{entity.remark}#{entity.status}#{entity.reviewStep}#{entity.reviewObject}#{entity.reviewResult}#{entity.progressContent}#{entity.progressUpdateAt}#{entity.extProjectId}#{entity.stzProjectId}#{entity.sgxkProjectId}#{entity.ydghProjectId}#{entity.gcghProjectId}#{entity.hpProjectId}#{entity.genProjectId}#{entity.landId}#{entity.zdxmProjectId}#{entity.ybjbProjectId}#{entity.landingTime}#{entity.landing}#{entity.dimensionIds}#{entity.headquarterIds}#{entity.jgysbaId}#{entity.npId}#{entity.xfysId}#{entity.isDisabled}#{entity.isStats}#{entity.isDraft}#{entity.createdAt}#{entity.updatedAt}#{entity.createdBy}#{entity.isDeleted}#{entity.landNo}#{entity.landUsage}#{entity.landArea}#{entity.landAddress}#{entity.landStartDate}#{entity.landEndDate}#{entity.landObligeeName}#{entity.landApproveTime}#{entity.homeDisplay}#{entity.installment}#{entity.installmentNum}) + + + + + insert into gysl.project(project_namecompany_idcompany_namecompany_timeagent_company_idagent_company_namecontact_namecontact_phoneproject_typeorganization_idsub_organization_idzs_organization_idtype_idsecond_type_idthird_type_idss_type_idarea_idaddresslatlngactual_start_timeactual_end_timejgys_statustcty_statusoperation_timeinvestment_typeinvestment_entityinvestment_entity_typethumbnailremarkstatusreview_stepreview_objectreview_resultprogress_contentprogress_update_atext_project_idstz_project_idsgxk_project_idydgh_project_idgcgh_project_idhp_project_idgen_project_idland_idzdxm_project_idybjb_project_idlanding_timelandingdimension_idsheadquarter_idsjgysba_idnp_idxfys_idis_disabledis_statsis_draftcreated_atupdated_atcreated_byis_deletedland_noland_usageland_arealand_addressland_start_dateland_end_dateland_obligee_nameland_approve_timehome_displayinstallmentinstallment_num) + values + + (#{entity.projectName}#{entity.companyId}#{entity.companyName}#{entity.companyTime}#{entity.agentCompanyId}#{entity.agentCompanyName}#{entity.contactName}#{entity.contactPhone}#{entity.projectType}#{entity.organizationId}#{entity.subOrganizationId}#{entity.zsOrganizationId}#{entity.typeId}#{entity.secondTypeId}#{entity.thirdTypeId}#{entity.ssTypeId}#{entity.areaId}#{entity.address}#{entity.lat}#{entity.lng}#{entity.actualStartTime}#{entity.actualEndTime}#{entity.jgysStatus}#{entity.tctyStatus}#{entity.operationTime}#{entity.investmentType}#{entity.investmentEntity}#{entity.investmentEntityType}#{entity.thumbnail}#{entity.remark}#{entity.status}#{entity.reviewStep}#{entity.reviewObject}#{entity.reviewResult}#{entity.progressContent}#{entity.progressUpdateAt}#{entity.extProjectId}#{entity.stzProjectId}#{entity.sgxkProjectId}#{entity.ydghProjectId}#{entity.gcghProjectId}#{entity.hpProjectId}#{entity.genProjectId}#{entity.landId}#{entity.zdxmProjectId}#{entity.ybjbProjectId}#{entity.landingTime}#{entity.landing}#{entity.dimensionIds}#{entity.headquarterIds}#{entity.jgysbaId}#{entity.npId}#{entity.xfysId}#{entity.isDisabled}#{entity.isStats}#{entity.isDraft}#{entity.createdAt}#{entity.updatedAt}#{entity.createdBy}#{entity.isDeleted}#{entity.landNo}#{entity.landUsage}#{entity.landArea}#{entity.landAddress}#{entity.landStartDate}#{entity.landEndDate}#{entity.landObligeeName}#{entity.landApproveTime}#{entity.homeDisplay}#{entity.installment}#{entity.installmentNum}) + + on duplicate key update +project_name = values(project_name) company_id = values(company_id) company_name = values(company_name) company_time = values(company_time) agent_company_id = values(agent_company_id) agent_company_name = values(agent_company_name) contact_name = values(contact_name) contact_phone = values(contact_phone) project_type = values(project_type) organization_id = values(organization_id) sub_organization_id = values(sub_organization_id) zs_organization_id = values(zs_organization_id) type_id = values(type_id) second_type_id = values(second_type_id) third_type_id = values(third_type_id) ss_type_id = values(ss_type_id) area_id = values(area_id) address = values(address) lat = values(lat) lng = values(lng) actual_start_time = values(actual_start_time) actual_end_time = values(actual_end_time) jgys_status = values(jgys_status) tcty_status = values(tcty_status) operation_time = values(operation_time) investment_type = values(investment_type) investment_entity = values(investment_entity) investment_entity_type = values(investment_entity_type) thumbnail = values(thumbnail) remark = values(remark) status = values(status) review_step = values(review_step) review_object = values(review_object) review_result = values(review_result) progress_content = values(progress_content) progress_update_at = values(progress_update_at) ext_project_id = values(ext_project_id) stz_project_id = values(stz_project_id) sgxk_project_id = values(sgxk_project_id) ydgh_project_id = values(ydgh_project_id) gcgh_project_id = values(gcgh_project_id) hp_project_id = values(hp_project_id) gen_project_id = values(gen_project_id) land_id = values(land_id) zdxm_project_id = values(zdxm_project_id) ybjb_project_id = values(ybjb_project_id) landing_time = values(landing_time) landing = values(landing) dimension_ids = values(dimension_ids) headquarter_ids = values(headquarter_ids) jgysba_id = values(jgysba_id) np_id = values(np_id) xfys_id = values(xfys_id) is_disabled = values(is_disabled) is_stats = values(is_stats) is_draft = values(is_draft) created_at = values(created_at) updated_at = values(updated_at) created_by = values(created_by) is_deleted = values(is_deleted) land_no = values(land_no) land_usage = values(land_usage) land_area = values(land_area) land_address = values(land_address) land_start_date = values(land_start_date) land_end_date = values(land_end_date) land_obligee_name = values(land_obligee_name) land_approve_time = values(land_approve_time) home_display = values(home_display) installment = values(installment) installment_num = values(installment_num) + + + diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml deleted file mode 100644 index f7dbf74..0000000 --- a/ruoyi-admin/src/main/resources/mapper/ProjectMonthInfoMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml b/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml new file mode 100644 index 0000000..fd21d3a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/ProjectProgressMapper.xml @@ -0,0 +1,14 @@ + + + + + +