From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
index 4cec098..bc6e0f8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.gistack.sm.sjztmd.service.impl;
 
 import cn.gistack.sm.sjztmd.dto.TbProjectDTO;
+import cn.gistack.sm.sjztmd.dto.TbProjectIsfillDTO;
 import cn.gistack.sm.sjztmd.entity.AttAdBase;
 import cn.gistack.sm.sjztmd.entity.TbProject;
 import cn.gistack.sm.sjztmd.entity.TbProjectSchedule;
@@ -17,6 +18,7 @@
 import cn.gistack.sm.sjztmd.util.CalculateUtils;
 import cn.gistack.sm.sjztmd.vo.StatisticsPrice;
 import cn.gistack.sm.sjztmd.vo.StatisticsPriceVO;
+import cn.gistack.sm.sjztmd.vo.TbProjectIsfillVO;
 import cn.gistack.sm.sjztmd.vo.TbProjectVO;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,7 +31,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -196,4 +201,31 @@
 		List<StatisticsPriceVO>	 statisticsPieBar =baseMapper.getStatisticsPieBars(statisticsParams);
 		return statisticsPieBar;
 	}
+
+	@Override
+	public void updateallcheck() throws Exception {
+		Date now = new Date();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		String today = sdf.format(now);
+
+		// 转换为年月格式,用于检查是否为月初
+		String yearMonth = sdf.format(sdf.parse(today).getTime()).substring(0, 7);
+		// 检查当前日期是否为月初
+		if (today.startsWith(yearMonth + "-01")) {
+			baseMapper.updateallcheck();
+		} else {
+			System.out.println("不是月初,不予修改状态");
+		}
+
+	}
+
+	@Override
+	public void updateFill(TbProjectIsfillDTO fil) {
+		baseMapper.updateFill(fil);
+	}
+
+	@Override
+	public TbProjectIsfillVO getfill() {
+		return baseMapper.getfill();
+	}
 }

--
Gitblit v1.9.3