From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..e7440db
--- 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,12 +3,13 @@
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.core.annotation.Java110Transactional;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -56,6 +57,7 @@
return ResultVo.createResponseEntity(data);
}
+
private void dealInpectionTask(JSONArray data, InspectionTaskDto inspectionTaskDto1) {
JSONObject dataObj = null;
dataObj = new JSONObject();
@@ -68,7 +70,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