From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug; 2. 新建子任务时默认执行人员从全体人员改为当前用户; 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内,确保子任务执行时间不会超出总任务范围。
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java
index 57ad469..623d75b 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspectioninfo/InspectionInfoFragment.java
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -30,14 +31,15 @@
import cn.flightfeather.thirdapp.CommonApplication;
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.AllRecyclerViewAdapter;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
import cn.flightfeather.thirdapp.bean.vo.ProblemCategoryVo;
import cn.flightfeather.thirdapp.bean.vo.ProblemlistVo;
import cn.flightfeather.thirdapp.httpservice.ProblemListService;
import cn.flightfeather.thirdapp.util.CommonUtils;
import cn.flightfeather.thirdapp.util.Constant;
import cn.flightfeather.thirdapp.util.DateFormatter;
+import cn.flightfeather.thirdapp.util.Domain;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@@ -268,7 +270,7 @@
p.setTotalCount(p.getTotalCount() + 1 );
this.total_problems++;
//宸叉暣鏀归棶棰樻暟绱姞
- if (problemlistVo.getIschanged()){
+ if (problemlistVo.getIschanged() && Objects.equals(problemlistVo.getExtension3(), Domain.CHANGE_CHECK_PASS)) {
p.setIsRectifiedCount(p.getIsRectifiedCount() + 1);
this.changed_problems++;
}
--
Gitblit v1.9.3