Browse Source

招标单保存更新

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7964 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
59fba8bfef

+ 34 - 13
src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -1,12 +1,16 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.service.PurchaseTenderService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.PurcTenderProd;
-import com.uas.platform.core.model.Constant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -17,11 +21,27 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.*;
+import com.uas.platform.b2b.dao.AttachDao;
+import com.uas.platform.b2b.dao.CommonDao;
+import com.uas.platform.b2b.dao.EnterpriseBaseInfoDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.PurchaseTenderDao;
+import com.uas.platform.b2b.dao.PurchaseTenderProdDao;
+import com.uas.platform.b2b.dao.SaleTenderDao;
+import com.uas.platform.b2b.dao.SaleTenderItemDao;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseBaseInfo;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.PurchaseTender;
+import com.uas.platform.b2b.model.PurchaseTenderProd;
+import com.uas.platform.b2b.model.SaleTender;
+import com.uas.platform.b2b.model.SaleTenderItem;
+import com.uas.platform.b2b.service.AttachService;
+import com.uas.platform.b2b.service.PurchaseTenderService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.temporary.model.PurcTenderProd;
+import com.uas.platform.core.model.Constant;
 
 /**
  * Created by dongbw on 17/03/07 14:16.
@@ -434,7 +454,8 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                         oldTenderProd.setProdTitle(tenderProd.getProdTitle());
                         oldTenderProd.setUnit(tenderProd.getUnit());
                         oldTenderProd.setQty(tenderProd.getQty());
-                        oldTenderProd.setSaleTenderItems(Collections.emptySet());
+						Set<SaleTenderItem> saleTenderItems = new HashSet<>();
+						oldTenderProd.setSaleTenderItems(saleTenderItems);
                         purchaseTenderProdDao.save(oldTenderProd);
                     } else { // 新增的
                         tenderProd.setTender(oldTender);