产业供地 去除分发时所有部门可见的剩余时间

src/main/java/platform/modules/government/service/IndustrialLandSupplyDetailService.java

@@ -583,32 +583,34 @@ public class IndustrialLandSupplyDetailService extends BaseService<IndustrialLan
                     landSupplyDistribution.setDepartment_name(department.getName());
                 }
             }
-            int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
+            if (!Objects.equals(landSupplyDistribution.getDepartment_id(), "0")) {
+                int days = Integer.parseInt(industrialLandSupplyConfigService.getValueByType(DISTRIBUTE_TIME));
 //            landSupplyDistribution.setRemain_time(DateUtil.getTimeDiffStr(landSupplyDistribution.getDistribute_time(), days));
-            String dealTime = null;
-            Approval approval = new Approval();
-            approval.setBefore_approvalstatus(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_FEEDBACK);
-            approval.setApply_id(Integer.parseInt(id));
-            List<Approval> approvals = approvalService.findListByWhere(approval);
-            if (!CollectionUtils.isEmpty(approvals)) {
-                dealTime = approvals.get(approvals.size() - 1).getCreate_time();
-                try {
-                    Date d1 = DateUtil.parseTimeStringToDate(entity.getUpdate_time(), "yyyy-MM-dd hh:mm:ss");
-                    Date d2 = DateUtil.parseTimeStringToDate(dealTime, "yyyy-MM-dd hh:mm:ss");
-                    if (d2.before(d1)) {
-                        dealTime = null;
+                String dealTime = null;
+                Approval approval = new Approval();
+                approval.setBefore_approvalstatus(Constant.LandSupplyApproveStatus.LAND_SUPPLY_PENDIND_FEEDBACK);
+                approval.setApply_id(Integer.parseInt(id));
+                List<Approval> approvals = approvalService.findListByWhere(approval);
+                if (!CollectionUtils.isEmpty(approvals)) {
+                    dealTime = approvals.get(approvals.size() - 1).getCreate_time();
+                    try {
+                        Date d1 = DateUtil.parseTimeStringToDate(entity.getUpdate_time(), "yyyy-MM-dd hh:mm:ss");
+                        Date d2 = DateUtil.parseTimeStringToDate(dealTime, "yyyy-MM-dd hh:mm:ss");
+                        if (d2.before(d1)) {
+                            dealTime = null;
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
                     }
-                } catch (ParseException e) {
-                    e.printStackTrace();
                 }
-            }
 //            landSupplyDistribution.setRemain_time(DateUtil.getTimeDiff(landSupplyDistribution.getCreate_time(), dealTime, days));
-            landSupplyDistribution.setRemain_time(DateUtil.getTimeDiff(
-                    landSupplyDistribution.getCreate_time(),
-                    landSupplyDistribution.getUpdate_time(),
-                    days,
-                    sysConfigService.getValueByKey("year_" + DateUtil.getCurrentDateString("yyyy"))
-            ));
+                landSupplyDistribution.setRemain_time(DateUtil.getTimeDiff(
+                        landSupplyDistribution.getCreate_time(),
+                        landSupplyDistribution.getUpdate_time(),
+                        days,
+                        sysConfigService.getValueByKey("year_" + DateUtil.getCurrentDateString("yyyy"))
+                ));
+            }
         }
         entity.setDistributionList(industrialLandSupplyDistributionList);