From acf5ed4dee859913fc6fb94cd1ade9b5de9d4b78 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 13 Oct 2022 18:12:12 +0800
Subject: [PATCH] =?UTF-8?q?deptid=E5=8F=AF=E8=83=BD=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-cloud-commons-shibei           |  2 +-
 esua-epdc/epdc-cloud-gateway-shibei           |  2 +-
 .../item/service/impl/ItemServiceImpl.java    | 21 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei
index 762d085bc..db4782f75 160000
--- a/esua-epdc/epdc-cloud-commons-shibei
+++ b/esua-epdc/epdc-cloud-commons-shibei
@@ -1 +1 @@
-Subproject commit 762d085bcbdca1cc88e670956a3cd147537abec2
+Subproject commit db4782f7593219f93de4555b09bfc59a86b7d36f
diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei
index 4ee6a3054..98ecba0e2 160000
--- a/esua-epdc/epdc-cloud-gateway-shibei
+++ b/esua-epdc/epdc-cloud-gateway-shibei
@@ -1 +1 @@
-Subproject commit 4ee6a3054b7c0cc5d5d36aa01abe5f6ae67663db
+Subproject commit 98ecba0e2072cd1819f37e3ba3ba12e95d65ea51
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index b8f25527b..108e0d65d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -768,7 +768,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 处理详情获取存在多条1065的作物数据情况
         Long handlerDeptId;
-        if (resultDTO.getHandlerDeptId() == 0) {
+        if (0L == resultDTO.getHandlerDeptId() || null == resultDTO.getHandlerDeptId()) {
             ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
             handlerDeptId = byItemId.getHandlerDeptId();
         } else {
@@ -963,7 +963,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         // 处理详情获取存在多条1065的作物数据情况
         Long handlerDeptId;
-        if (resultDTO.getHandlerDeptId() == 0) {
+        if (0L == resultDTO.getHandlerDeptId() || null == resultDTO.getHandlerDeptId()) {
             ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
             handlerDeptId = byItemId.getHandlerDeptId();
         } else {
@@ -3959,25 +3959,25 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<String> jbmyArr = new ArrayList<>();
 
         List<EvaluationTotalLineDetailResultDTO> dataList = new ArrayList<>();
-        if(formDTO.getYearMonth().length() > 4){
+        if (formDTO.getYearMonth().length() > 4) {
             String[] arr = formDTO.getYearMonth().split("-");
             // 按日统计
-            timeArr = YearMonthUtils.getMonthFullDay(Integer.parseInt(arr[0]),Integer.parseInt(arr[1]));
+            timeArr = YearMonthUtils.getMonthFullDay(Integer.parseInt(arr[0]), Integer.parseInt(arr[1]));
             formDTO.setTimeArr(timeArr);
             dataList = baseDao.getEvaluationDataListByDays(formDTO);
 
-        }else{
+        } else {
             // 按月统计
-            timeArr = YearMonthUtils.getMonthBetween(formDTO.getYearMonth() + "-01",formDTO.getYearMonth() + "-12");
+            timeArr = YearMonthUtils.getMonthBetween(formDTO.getYearMonth() + "-01", formDTO.getYearMonth() + "-12");
             formDTO.setTimeArr(timeArr);
             dataList = baseDao.getEvaluationDataListByMonths(formDTO);
 
         }
 
-        for(int i = 0 ; i < timeArr.size() ; i++){
+        for (int i = 0; i < timeArr.size(); i++) {
             Boolean flag = false; // 是否完成该时间赋值
-            for(EvaluationTotalLineDetailResultDTO dto : dataList){
-                if(timeArr.get(i).equals(dto.getTime())){
+            for (EvaluationTotalLineDetailResultDTO dto : dataList) {
+                if (timeArr.get(i).equals(dto.getTime())) {
                     fcmyArr.add(dto.getFcmy());
                     jbmyArr.add(dto.getJbmy());
                     bmyArr.add(dto.getBmy());
@@ -3986,7 +3986,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 }
             }
             // 判断该时间是否赋值
-            if(!flag){
+            if (!flag) {
                 fcmyArr.add("0");
                 jbmyArr.add("0");
                 bmyArr.add("0");
@@ -4003,5 +4003,4 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
 
-
 }