From 082a45e2d2437487d2fd086e81fcc833dbd1ae40 Mon Sep 17 00:00:00 2001
From: gejunhao <1421207006@qq.com>
Date: Mon, 17 Mar 2025 00:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=80=9D=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouFieldchangehistoryServiceImpl.java | 15 +++++++++++++++
 .../HuzhouInformationMaterialServiceImpl.java     |  8 +++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

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 f0d26e8..3dfe3d5 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.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.easy.admin.auth.model.SysUser;
@@ -64,6 +65,10 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
 
     @Autowired
     private ProjectManagerService projectManagerService;
+
+    @Autowired
+    private HuzhouPlaninfoMapper planinfoMapper;
+
     @Override
     public void submitChangeFieldManage(MultipartFile[] multipartFiles,
                                         String projectid,
@@ -295,6 +300,16 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                     userprojectMapper.update(null,queryWrapper2);
                 }
                 projectinfoMapper.updateById(newProjectinfo);
+
+                String currentPointName = planinfoMapper.getCurrentPointName(projectid);
+                if (StringUtils.isNotBlank(currentPointName)){
+                    // 或者去比较 合同签订阶段完成之后的时间 实际完成时间需要存在 ! 和本次修改的时间进行对比.
+                    // 如果本次修改时间晚于这个合同签订阶段完成的时间 则修改记录次数+1
+                    // 比较该项目 合同签订阶段的 taskLevel  去planInfo表中查询出当前节点的taskLevel 如果大于这个节点则修改记录次数+1
+                    // 如果当前节点大于合同签订阶段 则在原有的修改记录次数上加1
+                    // 这个修改次数字段需要在项目信息表里面新增一个字段
+                    // 先查询出这个字段 假如默认值为0 ,然后再这个基础上+1
+                }
             }
         }
     }
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java
index a33f3d3..8715a30 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java
@@ -46,6 +46,8 @@ public class HuzhouInformationMaterialServiceImpl extends ServiceImpl<HuzhouInfo
     public Page<HuzhouInformationMaterial> getInformationMaterialPageList(HuzhouInformationMaterial informationMaterial,
                                                               Integer pageNo,
                                                               Integer pageSize) {
+        SysUser currentUser = ShiroUtil.getCurrentUser();
+        String workplace = currentUser.getWorkplace();
         String informationMaterialName = informationMaterial.getName();
         String type = informationMaterial.getType();
         Date publishTime = informationMaterial.getPublishTime();
@@ -54,6 +56,7 @@ public class HuzhouInformationMaterialServiceImpl extends ServiceImpl<HuzhouInfo
         Page<HuzhouInformationMaterial> informationMaterialPage = new Page<>(pageNo, pageSize);
         queryWrapper.like(StringUtils.isNotBlank(informationMaterialName),HuzhouInformationMaterial::getName,informationMaterialName);
         queryWrapper.eq(StringUtils.isNotBlank(type),HuzhouInformationMaterial::getType,type);
+        queryWrapper.eq(StringUtils.isNotBlank(workplace),HuzhouInformationMaterial::getDutyWorkplace,workplace);
         if(publishTime!=null){
             queryWrapper.eq(HuzhouInformationMaterial::getPublishTime,publishTime);
         }
@@ -155,6 +158,9 @@ public class HuzhouInformationMaterialServiceImpl extends ServiceImpl<HuzhouInfo
         informationMaterial.setDocumentPath(savePath);
         informationMaterial.setSize(file.getSize());
         informationMaterial.setStatus("1");
-        informationMaterial.setDutyWorkplace(currentUser.getWorkplace());
+        // 设置责任单位
+        if (StringUtils.isNotBlank(currentUser.getWorkplace())){
+            informationMaterial.setDutyWorkplace(currentUser.getWorkplace());
+        }
     }
 }