From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report
---
service-job/src/main/java/com/java110/job/task/purchase/InspectionTaskDetailTemplate.java | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/purchase/InspectionTaskDetailTemplate.java b/service-job/src/main/java/com/java110/job/task/purchase/InspectionTaskDetailTemplate.java
index 79f86c8..019e95d 100644
--- a/service-job/src/main/java/com/java110/job/task/purchase/InspectionTaskDetailTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/purchase/InspectionTaskDetailTemplate.java
@@ -1,23 +1,21 @@
package com.java110.job.task.purchase;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
-import com.java110.dto.inspectionPlan.InspectionTaskDto;
+import com.java110.dto.inspection.InspectionTaskDetailDto;
+import com.java110.dto.inspection.InspectionTaskDto;
import com.java110.dto.task.TaskDto;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
/**
* 宸℃绛惧埌鐘舵�佷慨鏀瑰畾鏃朵换鍔�
@@ -43,7 +41,10 @@
List<CommunityDto> communityDtos = getAllCommunity();
for (CommunityDto communityDto : communityDtos) {
try {
+ //绛惧埌鐘舵�佷慨鏀�
generatorTask(taskDto, communityDto);
+ //褰撳ぉ宸℃浠诲姟鐘舵�佷慨鏀�
+ changeToadyTask(taskDto, communityDto);
} catch (Exception e) {
logger.error("鎺ㄩ�佹秷鎭け璐�", e);
}
@@ -92,4 +93,55 @@
}
}
}
+
+ private void changeToadyTask(TaskDto taskDto, CommunityDto communityDto) throws ParseException {
+ //鍙栧嚭浠婂ぉ鐨勬棩鏈�
+ Calendar cal = Calendar.getInstance(Locale.CHINA);
+ String today = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
+ String toadyStartTime = today + " 00:00:00";
+ String todayEndTime = today + " 23:59:59";
+ InspectionTaskDetailDto inspectionTaskDetailDto = new InspectionTaskDetailDto();
+ inspectionTaskDetailDto.setCommunityId(communityDto.getCommunityId());
+ inspectionTaskDetailDto.setQrCodeTime(toadyStartTime);
+ inspectionTaskDetailDto.setNowTime(todayEndTime);
+ inspectionTaskDetailDto.setInspectionTimeFlag("1");
+ List<InspectionTaskDetailDto> inspectionTaskDetailDtos = iInspectionTaskDetailInnerServiceSMOImpl.queryInspectionTaskDetails(inspectionTaskDetailDto);
+ if (inspectionTaskDetailDtos != null && inspectionTaskDetailDtos.size() > 0) {
+ String taskId = "";
+ for (InspectionTaskDetailDto inspectionTaskDetail : inspectionTaskDetailDtos) {
+ InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
+ if (!StringUtil.isEmpty(inspectionTaskDetail.getState()) && !inspectionTaskDetail.getState().equals("20200407")) { //涓嶆槸宸℃瀹屾垚鐘舵��
+ //鑾峰彇褰撳墠鏃堕棿
+ Date date = new Date();
+ if (!StringUtil.isEmpty(inspectionTaskDetail.getPlanInsTime()) && !StringUtil.isEmpty(inspectionTaskDetail.getPlanEndTime())) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //鑾峰彇宸℃璁″垝寮�濮嬫椂闂�
+ Date planInsTime = sdf.parse(inspectionTaskDetail.getPlanInsTime());
+ //鑾峰彇宸℃璁″垝缁撴潫鏃堕棿
+ Date planEndTime = sdf.parse(inspectionTaskDetail.getPlanEndTime());
+ if (date.before(planInsTime)) { //濡傛灉褰撳墠鏃堕棿鍦ㄨ鍒掑紑濮嬫椂闂翠箣鍓嶏紝浠诲姟鐘舵�佸氨涓烘湭寮�濮�
+ inspectionTaskDetail.setState("20200405"); // 20200405 鏈紑濮� 20200406 宸℃涓� 20200407 宸℃瀹屾垚 20200408 宸℃鏈畬鎴�
+ inspectionTaskDto.setState("20200405"); //20200405 鏈紑濮� 20200406 宸℃涓� 20200407 宸℃瀹屾垚 20200408 宸茶秴鏃� 20200409 缂哄嫟
+ } else if (date.after(planEndTime)) { //濡傛灉褰撳墠鏃堕棿鍦ㄨ鍒掔粨鏉熸椂闂翠箣鍚庯紝浠诲姟鐘舵�佷负宸℃鏈畬鎴�
+ inspectionTaskDetail.setState("20200408");
+ inspectionTaskDto.setState("20200408");
+ } else {
+ inspectionTaskDetail.setState("20200406");
+ inspectionTaskDto.setState("20200406");
+ }
+ } else {
+ inspectionTaskDetail.setState("20200405");
+ inspectionTaskDto.setState("20200405");
+ }
+ iInspectionTaskDetailInnerServiceSMOImpl.updateInspectionTaskDetail(inspectionTaskDetail);
+ }
+ if (!taskId.equals(inspectionTaskDetail.getTaskId())) {
+ //鑾峰彇宸℃浠诲姟id
+ taskId = inspectionTaskDetail.getTaskId();
+ inspectionTaskDto.setTaskId(taskId);
+ iInspectionTaskInnerServiceSMOImpl.updateInspectionTask(inspectionTaskDto);
+ }
+ }
+ }
+ }
}
--
Gitblit v1.8.0