From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
index ca14d11..1f2fbed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightCommunityConstructionServiceImpl.java
@@ -3,19 +3,18 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.partybuilding.NeedProblemUnitTaskDTO;
 import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO;
 import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectPlanDTO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_dangjian.dao.NeedProblemUnitTaskDAO;
 import com.panzhihua.service_dangjian.dao.NewFightCommunityConstructionDAO;
-import com.panzhihua.service_dangjian.service.NeedProblemUnitTaskService;
+import com.panzhihua.service_dangjian.dao.NewFightProjectPlanDAO;
 import com.panzhihua.service_dangjian.service.NewFightCommunityConstructionService;
-import com.panzhihua.service_dangjian.service.NewFightProjectPlanService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -29,8 +28,7 @@
 {
 
     @Resource
-    private NewFightProjectPlanService projectPlanService;
-
+    private NewFightProjectPlanDAO projectPlanService;
 
     @Override
     public IPage<NewFightCommunityConstructionDTO> getList(int pageNum, int pageSize,
@@ -95,11 +93,66 @@
         if(num>0)
         {
             //删除相关项目规划进度
-            projectPlanService.expurgateData(null,id);
+            projectPlanService.expurgateData("",id);
             return R.ok();
         }
         return R.fail("操作失败");
     }
 
+    @Override
+    public R  getListTime()
+    {
+        List<NewFightCommunityConstructionDTO> list=baseMapper.getListTime();
+        if(list==null || list.size()<=0 )
+        {
+            return R.ok();
+        }
+
+        for (NewFightCommunityConstructionDTO item:list) {
+
+            if(StringUtils.equals("1",item.getStatus()))
+            {
+                // 1 已发布
+                Date startTime = item.getStartTime();
+                if (startTime!=null)
+                {
+                    if(new Date().getTime()>startTime.getTime())
+                    {
+                        NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
+                        dto.setId(item.getId());
+                        //进行中
+                        dto.setStatus("2");
+                        baseMapper.editData(dto);
+                    }
+                }
+            }
+
+            //预计完成时间
+            Date estimatedTime = item.getEstimatedTime();
+            if (estimatedTime!=null)
+            {
+                if(new Date().getTime()>estimatedTime.getTime())
+                {
+                    int accomplishNum=projectPlanService.getNum(item.getId(),"0");
+                    NewFightCommunityConstructionDTO dto=new NewFightCommunityConstructionDTO();
+                    dto.setId(item.getId());
+                    if(accomplishNum==0)
+                    {
+                        //已完成
+                        dto.setStatus("3");
+                    }
+                    else
+                    {
+                        //进行中
+                        dto.setStatus("2");
+                    }
+                    baseMapper.editData(dto);
+                }
+            }
+        }
+
+        return R.ok();
+    }
+
 
 }

--
Gitblit v1.7.1