UAS招标接口：查看投标单详情接口修改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8471 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -628,7 +628,7 @@ public class TenderController {
      * @param id 投标单id
      */
     @RequestMapping(value = "/saleTender", method = RequestMethod.GET)
-    public SaleTenderErp getSaleTenderDetail(Long id, String venduu) {
+    public ModelMap getSaleTenderDetail(Long id, String venduu) {
         return tenderService.getSaleTenderDetail(id, Long.valueOf(venduu));
     }
 

src/main/java/com/uas/platform/b2b/erp/service/TenderService.java

@@ -158,6 +158,6 @@ public interface TenderService {
      * @param venduu
      * @return
      */
-    SaleTenderErp getSaleTenderDetail(Long id, Long venduu);
+    ModelMap getSaleTenderDetail(Long id, Long venduu);
 
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java

@@ -595,13 +595,15 @@ public class TenderServiceImpl implements TenderService {
     }
 
     @Override
-    public SaleTenderErp getSaleTenderDetail(Long id, Long venduu) {
+    public ModelMap getSaleTenderDetail(Long id, Long venduu) {
         PurchaseTender tender = purchaseTenderDao.findOne(id);
+        Set<Attach> tenderAttaches = tender.getTenderAttaches();
         SaleTender saleTenderTemp = saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), venduu, tender.getCode());
         SaleTenderErp saleTenderErp = saleTenderErpDao.findOne(saleTenderTemp.getId());
-//        String attachSql = "select count(*) from purc$pagingrelease pr left join purc$pagingreleasedetail prd on pr.pr_id = prd.prd_prid where prd.prd_emuu = " + vendUseruu + " and prd.prd_venduu = " + venduu + " and prd.prd_totalstatus = 0 and prd.prd_readstatus = 0";
-//        Set<Attach> tenderAttaches = = commonDao.queryForObject(countSql, Attach.class);
-        return saleTenderErp;
+        ModelMap map = new ModelMap();
+        map.put("saleTenderTemp", saleTenderErp);
+        map.put("tenderAttaches", tenderAttaches);
+        return map;
     }
 
 
@@ -705,13 +707,25 @@ public class TenderServiceImpl implements TenderService {
                 isApply = true; // 只要有定标的明细，就确认状态为已结标
             }
         }
+        SaleTenderItem tenderItem = saleTenderItemDao.findOne(saleTenderItems.get(0).getId());
+        PurchaseTender tender = tenderItem.getTenderProd().getTender();
         if (isApply) {
-            saleTenderItems.get(0).getTenderProd().getTender().setStatus("已结标");
+            tender.setStatus("已结标");
         } else {
-            saleTenderItems.get(0).getTenderProd().getTender().setStatus("流标");
+            tender.setStatus("流标");
+        }
+        tender.setModified(new Date());
+        purchaseTenderDao.save(tender);
+        List<SaleTenderItem> items = new ArrayList<>();
+        if (saleTenderItems.size() > 0 ) {
+            for (SaleTenderItem item : saleTenderItems) {
+                SaleTenderItem saleTenderItem = saleTenderItemDao.findOne(item.getId());
+                saleTenderItem.setApplyStatus(item.getApplyStatus());
+                saleTenderItem.setDescription(item.getDescription());
+                items.add(saleTenderItem);
+            }
+            saleTenderItemDao.save(items);
         }
-        purchaseTenderDao.save(saleTenderItems.get(0).getTenderProd().getTender());
-        saleTenderItemDao.save(saleTenderItems);
         ModelMap map = new ModelMap();
         map.put("success", true);
         return map;