From 6e332c32f5121a372cecc8305e45f6571e4baa16 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期二, 04 三月 2025 14:55:40 +0800
Subject: [PATCH] 整体修改
---
src/main/java/com/product/contract/service/ContractInfoService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ContractInfoService.java b/src/main/java/com/product/contract/service/ContractInfoService.java
index fb39c20..5e29095 100644
--- a/src/main/java/com/product/contract/service/ContractInfoService.java
+++ b/src/main/java/com/product/contract/service/ContractInfoService.java
@@ -14,6 +14,7 @@
import com.product.core.transfer.Transactional;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
+import org.apache.bcel.generic.IF_ACMPEQ;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -132,7 +133,8 @@
StringBuilder filter=new StringBuilder(128);
filter.append(" uuid='"+cfs.getValues().get("project_uuid")+"'");
DataTableEntity product_project_business = baseDao.listTable("product_project_business",filter.toString(),new Object[]{});
- String guarantee_period = product_project_business.getData().get(0).getValues().get("guarantee_period").toString();
+// String guarantee_period = product_project_business.getData().get(0).getValues().get("guarantee_period").toString();
+ String guarantee_period = product_project_business.getString(0, "guarantee_period");
StringBuilder dictFilter=new StringBuilder(128);
dictFilter.append("dict_name='椤圭洰绠＄悊椤圭洰绫诲瀷' and dict_value="+product_project_business.getData().get(0).getValues().get("project_type").toString());
DataTableEntity product_sys_dict = baseDao.listTable("product_sys_dict", dictFilter.toString(), new Object[]{});
@@ -144,11 +146,14 @@
}
//缁撴潫鏃ユ湡锛� 濡傛灉鏄紑鍙戦」鐩�佸疄鏂介」鐩紝楠屾敹鏃ユ湡+鍚堝悓鏈夋晥鏈燂紝缁存姢鍚堝悓鍒欐槸绛惧畾鏃ユ湡+鍚堝悓鏈夋晥鏈�
if(dict_label.equals("寮�鍙戦」鐩�") || dict_label.equals("瀹炴柦椤圭洰")){
- String carefully_check = product_project_business.getData().get(0).getValues().get("carefully_check").toString();
- String[] dateTime = carefully_check.split(" ");
- String time=dateTime[0];
- String date = getDate(time,guarantee_period);
- cfs.setValue("end_time",date);
+// String carefully_check = product_project_business.getData().get(0).getValues().get("carefully_check").toString();
+ String carefully_check = product_project_business.getString(0, "carefully_check");
+ if (!StringUtils.isEmpty(carefully_check)){
+ String[] dateTime = carefully_check.split(" ");
+ String time=dateTime[0];
+ String date = getDate(time,guarantee_period);
+ cfs.setValue("end_time",date);
+ }
}
return cfs;
}
--
Gitblit v1.9.2