样式修改

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -864,7 +864,7 @@
                  SELECT COUNT(*) AS counts
                  FROM sub_info
                  WHERE rt_date  <  NOW()
-                   AND is_rg = 0
+                   AND `is_rg` = 0
                    AND `status` = 9
              ) AS combined_counts;
     </select>

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -439,4 +439,14 @@ public interface SubInfoService {
 	List<WorkBenchVO> queryExceedMonthlySize(String lastMonth);
 
 	Map<String, Object> queryExceedMonthly(LoginUserVO loginUser, PreWarnDataQueryVO queryVO);
+
+	Long queryExceed();
+
+	Long queryWarning();
+
+	Long queryNotExceed();
+
+	Long queryExceedWithin();
+
+	Long queryExceedOutside();
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -5348,6 +5348,36 @@ public class SubInfoServiceImpl implements SubInfoService {
         }
     }
 
+    @Override
+    @TargetDataSource("primary")
+    public Long queryExceed() {
+        return subInfoMapper.queryExceed();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryWarning() {
+        return subInfoMapper.queryWarning();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryNotExceed() {
+        return subInfoMapper.queryNotExceed();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryExceedWithin() {
+        return subInfoMapper.queryExceedWithin();
+    }
+
+    @Override
+    @TargetDataSource("primary")
+    public Long queryExceedOutside() {
+        return subInfoMapper.queryExceedOutside();
+    }
+
     private Map<String, Object> getStringObjectMap(List<WorkBenchVO> list) {
         Map<String, Object> resultMap = new HashMap<>();
         if (CollectionUtil.isNotEmpty(list)){

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/WorkBenchServiceImpl.java

@@ -9,9 +9,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.date.DateUtil;
 import com.rtrh.projects.modules.projects.enums.SubInfoStatusEnum;
 import com.rtrh.projects.modules.projects.mapper.SubInfoMapper;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
+import com.rtrh.projects.modules.projects.service.SubInfoService;
 import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +33,8 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 	@Autowired
 	private SubInfoMapper subInfoMapper;
 
+	@Autowired
+	private SubInfoService subInfoService;
 
 	@Override
 	public Map<String, Object> getDaiBanData(String kind, String loginName) {
@@ -105,16 +109,28 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 	@Override
 	public Map<String, Object> statisticData() {
 		Map<String, Object> map = new HashMap<>();
-		// 预警 提前3天内
-		Long warningNum = subInfoMapper.queryWarning();
+		// // 	 进度红灯-前期手续红灯
+		// int preNum = subInfoService.preProcedureExceedSize().size();
+		// String lastMonth = DateUtil.format(DateUtil.offsetMonth(DateUtil.date(), -1), "yyyyMM");
+		// int dayOfMonth = DateUtil.dayOfMonth(DateUtil.date());
+		// // 	 进度红灯-月报超期红灯
+		// int monthlyNum = dayOfMonth <= 5 ? 0 : subInfoService.queryExceedMonthlySize(lastMonth).size();
 		// 超期 进度红灯
-		Long exceedNum = subInfoMapper.queryExceed();
+		Long exceedNum = subInfoService.queryExceed();
+		// Long exceedNum = subInfoMapper.queryExceed();
+		// exceedNum = exceedNum + preNum + monthlyNum;
+		// 预警 提前3天内
+		Long warningNum = subInfoService.queryWarning();
+		// Long warningNum = subInfoMapper.queryWarning();
 		// 未超期绿灯
-		Long notExceedNum = subInfoMapper.queryNotExceed();
+		Long notExceedNum = subInfoService.queryNotExceed();
+		// Long notExceedNum = subInfoMapper.queryNotExceed();
 		// 黄灯超期3天内
-		Long withinNum = subInfoMapper.queryExceedWithin();
+		Long withinNum = subInfoService.queryExceedWithin();
+		// Long withinNum = subInfoMapper.queryExceedWithin();
 		// 红灯超期超过3天
-		Long outsideNum = subInfoMapper.queryExceedOutside();
+		Long outsideNum = subInfoService.queryExceedOutside();
+		// Long outsideNum = subInfoMapper.queryExceedOutside();
 		map.put("warningNum", warningNum);
 		map.put("exceedNum", exceedNum);
 		map.put("notExceedNum", notExceedNum);