From 046df38d3a8f0ae7352c645e0eacbc464cf5a3d1 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 18 Mar 2025 22:56:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=BB=9F=E8=AE=A1:=E4=BB=8E=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=AD=BE=E8=AE=A2=E9=98=B6=E6=AE=B5=E4=B8=8A=E4=BC=A0=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=BC=80=E5=A7=8B=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouFieldchangehistoryController.java | 11 +++++++ .../dao/HuzhouFieldchangehistoryMapper.java | 9 ++++++ .../huzhou/dao/HuzhouPlaninfoMapper.java | 4 +++ .../huzhou/dao/HuzhouProjectinfoMapper.java | 4 ++- .../huzhou/entity/HuzhouProjectinfo.java | 16 +++++----- .../IHuzhouFieldchangehistoryService.java | 2 ++ .../HuzhouFieldchangehistoryServiceImpl.java | 29 +++++++++++++------ 7 files changed, 56 insertions(+), 19 deletions(-) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java index 201b6ff..2235787 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java @@ -111,4 +111,15 @@ public class HuzhouFieldchangehistoryController { return fieldchangehistoryDetailPageList; } + + /** + * 获取项目变更字段数量 :只统计建设阶段开始 + * @param projectId + * @return + */ + @GetMapping("/queryUpdateCount") + public Result queryUpdateCount(String projectId){ + int updateCount = fieldchangehistoryService.queryUpdateCount(projectId); + return Result.OK(updateCount); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java index 4fdcc18..b830149 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouFieldchangehistoryMapper.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.modules.huzhou.entity.HuzhouFieldchangehistory; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import java.util.Date; import java.util.List; import java.util.Map; @@ -13,4 +15,11 @@ public interface HuzhouFieldchangehistoryMapper extends BaseMapper getFieldchangehistoryPageList(Page page, HuzhouProjectinfo info); Page getFieldchangehistoryDetailPageList(Page page,String projectid); List getFieldDetailList(String projectid, String fieldValue); + + + + @Select("SELECT COUNT(*) FROM huzhou_fieldchangehistory " + + "WHERE projectid = #{projectId} AND create_date > #{actualStartTime}") + int countRecordsAfterDate(@Param("projectId") String projectId, + @Param("actualStartTime") Date actualStartTime); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java index f9d6a95..0228589 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouPlaninfoMapper.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfo; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -57,4 +58,7 @@ public interface HuzhouPlaninfoMapper extends BaseMapper { @Select("SELECT task_level FROM huzhou_planinfo WHERE task_name = #{taskName}") String getCurrentTaskLevel(@Param("taskName") String taskName); + + + } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java index 636367d..76c536a 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/HuzhouProjectinfoMapper.java @@ -7,6 +7,7 @@ import com.easy.admin.modules.huzhou.vo.*; import org.apache.ibatis.annotations.Mapper; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import java.math.BigDecimal; import java.util.List; @@ -93,7 +94,8 @@ public interface HuzhouProjectinfoMapper extends BaseMapper { List getTaskNames(@Param("planId") String planId); - +// @Update("UPDATE huzhou_projectinfo SET update_count = update_count + 1 WHERE id = #{projectid}") +// void incrementUpdateCount(@Param("projectid") String projectid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java index cf22e9a..68ae409 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java @@ -166,6 +166,13 @@ public class HuzhouProjectinfo extends BaseEntity { */ private Double suggestedCostAmount; + /** + * 项目修改次数 (项目建设阶段 之后才开始记录 默认为 0) + */ + @TableField(exist = false) + private int updateCount; + + @TableField(exist = false) @ExcelProperty(value = "项目负责人") private String manager; @@ -225,14 +232,5 @@ public class HuzhouProjectinfo extends BaseEntity { -// public ProjectinfoExportDTO toDTO() { -// return new ProjectinfoExportDTO( -// this.projectName, -// this.superiorFundPayRate, -// this.currentStage, -// this.totalPercent, -// this.superLeader, -// this.reformName); -// } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java index c9d3f19..38e51c7 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java @@ -33,4 +33,6 @@ public interface IHuzhouFieldchangehistoryService extends IService getFieldchangehistoryDetailPageList(Page page, String proid); List getFieldchangeByGroupid(String fieldChangeGroupid); + + int queryUpdateCount(String projectId); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java index 3dfe3d5..89c7241 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java @@ -3,6 +3,7 @@ package com.easy.admin.modules.huzhou.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -90,6 +91,7 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl queryPlanWrapper = new LambdaQueryWrapper<>(); + queryPlanWrapper.eq(HuzhouPlaninfo::getProjectId,projectId); + queryPlanWrapper.eq(HuzhouPlaninfo::getTaskName,"合同签订"); + queryPlanWrapper.in(HuzhouPlaninfo::getIsfinish,"1","2"); + HuzhouPlaninfo planInfo = planinfoMapper.selectOne(queryPlanWrapper); + if (planInfo!=null){ + Date actualStartTime = planInfo.getActualStartTime(); + if (actualStartTime!=null){ + int updateCount = fieldchangehistoryMapper.countRecordsAfterDate(projectId, actualStartTime); + return updateCount; + } + } + return 0; + } + @Override public Page getFieldchangehistoryPageList(Page page, HuzhouProjectinfo projectinfo) { ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo);