From bc4f6588b92d207bef56edf3b5b38d8e4e2b8236 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期四, 12 六月 2025 16:34:11 +0800
Subject: [PATCH] 合同管理
---
src/main/java/com/product/contract/service/ProjectBusinessService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/contract/service/ProjectBusinessService.java b/src/main/java/com/product/contract/service/ProjectBusinessService.java
index b62bba5..4c4754e 100644
--- a/src/main/java/com/product/contract/service/ProjectBusinessService.java
+++ b/src/main/java/com/product/contract/service/ProjectBusinessService.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.product.common.lang.StringUtils;
import com.product.contract.config.CmnConst;
import com.product.contract.service.ide.IProjectBusinessService;
import com.product.core.dao.BaseDao;
@@ -62,11 +63,13 @@
public JSONObject findTranslate(FieldSetEntity fse) {
FieldSetEntity fsData = baseDao.getFieldSetBySQL("SELECT project_type,date FROM product_project_business_translate where project_type=?", new String[]{fse.getString("project_type")}, false);
JSONObject rejson=BaseUtil.fieldSetEntityToJson(fsData);
- DataTableEntity projectType = baseDao.listTable(CmnConst.PRODUCT_PROJECT_BUSINESS_TRANSLATE, "project_type=? ORDER BY project_task", new String[]{fse.getString("project_type")});
+ DataTableEntity projectType = baseDao.listTable(CmnConst.PRODUCT_PROJECT_BUSINESS_TRANSLATE, "project_type=? ORDER BY project_task,id", new String[]{fse.getString("project_type")});
JSONObject json = new JSONObject();
for (int i = 0; i < projectType.getRows(); i++) {
FieldSetEntity fs = projectType.getFieldSetEntity(i);
- fs.remove("uuid");
+ if (!StringUtils.isEmpty(fse.getString("type")) &&fse.getString("type").equals("view")){
+ fs.remove("uuid");
+ }
if (json.getJSONArray(fs.getString("project_task"))==null){
JSONArray objects = new JSONArray();
objects.add(BaseUtil.fieldSetEntityToJson(fs));
@@ -108,7 +111,7 @@
@Transactional
@Override
public boolean saveProject(FieldSetEntity fse) {
- if (fse.getString("del").equals("2")){
+ if (!StringUtils.isEmpty(fse.getString("del")) &&fse.getString("del").equals("2")){
baseDao.delete(CmnConst.PRODUCT_PROJECT_BUSINESS_PLAN,"project_uuid=?",new String[]{fse.getUUID()});
}
return baseDao.saveFieldSetEntity(BaseUtil.createCreatorAndCreationTime(fse));
--
Gitblit v1.9.2