From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java b/service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java
old mode 100644
new mode 100755
index 0f9999a..7b327bf
--- a/service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.community.bmo.assets.IQueryAssetsInspectionBMO;
-import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
@@ -56,6 +56,7 @@
return ResultVo.createResponseEntity(data);
}
+
private void dealInpectionTask(JSONArray data, InspectionTaskDto inspectionTaskDto1) {
JSONObject dataObj = null;
dataObj = new JSONObject();
@@ -68,7 +69,7 @@
} else if ("20200406".equals(state)) {
dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 姝ｅ湪宸℃涓�");
} else {
- if (planInTime.getTime() > DateUtil.getCurrentDate().getTime()) {
+ if (planInTime.getTime() < DateUtil.getCurrentDate().getTime()) {
dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 鏈贰妫�");
} else {
dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 灏嗕簬 " + inspectionTaskDto1.getPlanInsTime() + " 寮�濮嬪贰妫�");
--
Gitblit v1.8.0