招标红点修改

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

src/main/java/com/uas/platform/b2b/dao/PurchaseTenderDao.java

@@ -32,7 +32,7 @@ public interface PurchaseTenderDao extends JpaSpecificationExecutor<PurchaseTend
      * @param ids 单据id
      * @return
      */
-    @Query("select count(p) from PurchaseTender p where p.id in :ids and p.overdue <> 1")
-    public Integer getTenterCount(@Param("ids") List<Long> ids);
+    @Query("select count(p) from SaleTender p where p.ptId in :ids and p.overdue <> 1 and p.status = '待投标' and p.vendUU = :vendUU and p.isPublish = 1")
+    public Integer getTenterCount(@Param("ids") List<Long> ids, @Param("vendUU") Long vendUU);
 
 }

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

@@ -780,4 +780,12 @@ public class TenderController {
     public ModelMap aduitTender(Long id) {
         return tenderService.publishTender(id);
     }
+
+    /**
+     * 提前开标
+     */
+    @RequestMapping(value = "/decide/inAdvance", method = RequestMethod.POST)
+    public ModelMap decideInAdvance(Long id) {
+        return tenderService.decideInAdvance(id);
+    }
 }

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

@@ -179,4 +179,6 @@ public interface TenderService {
      * @return
      */
     ModelMap publishTender(Long id);
+
+    ModelMap decideInAdvance(Long id);
 }

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

@@ -15,6 +15,7 @@ import com.uas.platform.b2b.temporary.model.PartnershipRecord;
 import com.uas.platform.b2b.temporary.model.PurcTenderProd;
 import com.uas.platform.b2b.temporary.model.TenderContactInfo;
 import com.uas.platform.core.model.Constant;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -487,6 +488,7 @@ public class TenderServiceImpl implements TenderService {
             return map;
         }
         tender.setIsPublish(Constant.YES);
+        tender.setStatus("待投标");
         purchaseTenderDao.save(tender);
         // 不开放的要同时把投标单发布状态修改
         if (tender.getIfOpen() != Constant.YES) {
@@ -494,6 +496,41 @@ public class TenderServiceImpl implements TenderService {
             List<SaleTender> saveList = new ArrayList<>();
             for (SaleTender saleTender : saleTenders) {
                 saleTender.setIsPublish(Constant.YES);
+                saleTender.setStatus("待投标");
+                saveList.add(saleTender);
+            }
+            saleTenderDao.save(saveList);
+        }
+        map.put("success", true);
+        return map;
+    }
+
+    /**
+     * 提前开标(实际上是修改投标截止时间)
+     * @param id
+     * @return
+     */
+    @Override
+    public ModelMap decideInAdvance(Long id) {
+        ModelMap map = new ModelMap();
+        PurchaseTender tender = purchaseTenderDao.findOne(id);
+        if (null == tender) {
+            map.put("error", "根据id未找到对应招标单");
+            return map;
+        }
+        Date currentTime = new Date();
+        //获取昨天时间
+        Date backupTime = DateUtils.addDays(currentTime, -1);
+        tender.setEndDate(backupTime);
+        tender.setStatus("待评标");
+        purchaseTenderDao.save(tender);
+        // 不开放的要同时把投标单发布状态修改
+        if (tender.getIfOpen() != Constant.YES) {
+            List<SaleTender> saleTenders = saleTenderDao.findByEnUUAndCode(tender.getEnUU(), tender.getCode());
+            List<SaleTender> saveList = new ArrayList<>();
+            for (SaleTender saleTender : saleTenders) {
+                saleTender.setPublishDate(backupTime);
+                saleTender.setStatus("待评标");
                 saveList.add(saleTender);
             }
             saleTenderDao.save(saveList);

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -766,7 +766,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         Object[] objects = new Object[2];
         if ("sale".equals(category)) {
             objects[1] = "待投标";
-            objects[0] = purchaseTenderDao.getTenterCount(ids);
+            objects[0] = purchaseTenderDao.getTenterCount(ids, SystemSession.getUser().getEnterprise().getUu());
         } else if ("purc".equals(category)){
             objects[1] = "待评标";
             objects[0] = purchaseTenderDao.getEvaluationCount(ids);