Browse Source

是否当天询价样式判断方法更新

hejq 8 years ago
parent
commit
daf6858da5

+ 15 - 1
src/main/java/com/uas/platform/b2b/model/PurcInquiryItem.java

@@ -252,6 +252,12 @@ public class PurcInquiryItem {
 	@Column(name = "id_date")
 	@Column(name = "id_date")
     private Date date;
     private Date date;
 
 
+	/**
+	 * 企业uu,公共询价需要这个字段做标识
+	 */
+	@Transient
+	private Long enuu;
+
 	public Long getId() {
 	public Long getId() {
 		return id;
 		return id;
 	}
 	}
@@ -550,7 +556,15 @@ public class PurcInquiryItem {
         this.date = date;
         this.date = date;
     }
     }
 
 
-    public static List<PurcInquiry> distinct(List<PurcInquiryItem> inquiryItems) {
+	public Long getEnuu() {
+		return enuu;
+	}
+
+	public void setEnuu(Long enuu) {
+		this.enuu = enuu;
+	}
+
+	public static List<PurcInquiry> distinct(List<PurcInquiryItem> inquiryItems) {
 		List<PurcInquiry> inquiries = new ArrayList<>();
 		List<PurcInquiry> inquiries = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();
 		Set<Long> keys = new HashSet<>();
 		for (PurcInquiryItem item : inquiryItems) {
 		for (PurcInquiryItem item : inquiryItems) {

+ 6 - 2
src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -761,7 +761,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 
 
 	@Override
 	@Override
 	public List<InquiryMessage> getMessageList() {
 	public List<InquiryMessage> getMessageList() {
-		String sql = "select * from (select p.id_id id,p.id_prid productId,p.id_date as \"date\" from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
+		String sql = "select * from (select p.id_id id, p.id_prid productId, p.id_date as \"date\", i.in_enuu enuu from purc$puinquiryitems p left join purc$puinquiry i on i.in_id = p.id_inid where i.in_isopen = 1 and i.in_enuu <> "
 				+ SystemSession.getUser().getEnterprise().getUu()
 				+ SystemSession.getUser().getEnterprise().getUu()
 				+ "and i.in_enddate > trunc(sysdate) and nvl(p.id_overdue, 0) <> 1 order by id_id desc) where rownum <= 7";
 				+ "and i.in_enddate > trunc(sysdate) and nvl(p.id_overdue, 0) <> 1 order by id_id desc) where rownum <= 7";
 		List<PurcInquiryItem> items = commonDao.query(sql, PurcInquiryItem.class);
 		List<PurcInquiryItem> items = commonDao.query(sql, PurcInquiryItem.class);
@@ -769,6 +769,10 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		if (!CollectionUtils.isEmpty(items)) {
 		if (!CollectionUtils.isEmpty(items)) {
 			for (PurcInquiryItem item : items) {
 			for (PurcInquiryItem item : items) {
 				InquiryMessage message = new InquiryMessage();
 				InquiryMessage message = new InquiryMessage();
+				if (null != item.getEnuu()) {
+					Enterprise enterprise = enterpriseDao.findEnterpriseByUu(item.getEnuu());
+					message.setEnName(enterprise.getEnName());
+				}
 				Product prod = productDao.findOne(item.getProductId());
 				Product prod = productDao.findOne(item.getProductId());
 				message.setPordName(prod.getTitle());
 				message.setPordName(prod.getTitle());
 				item = purcInquiryItemDao.findOne(item.getId());
 				item = purcInquiryItemDao.findOne(item.getId());
@@ -788,7 +792,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 	 * @return
 	 * @return
 	 */
 	 */
 	private boolean isToday(Date date) {
 	private boolean isToday(Date date) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String inDate = sdf.format(date);
 		String inDate = sdf.format(date);
 		String nowDate = sdf.format(new Date());
 		String nowDate = sdf.format(new Date());
 		return inDate.equals(nowDate);
 		return inDate.equals(nowDate);

+ 13 - 0
src/main/java/com/uas/platform/b2b/temporary/model/InquiryMessage.java

@@ -22,6 +22,11 @@ public class InquiryMessage {
 	 */
 	 */
 	private boolean lastest;
 	private boolean lastest;
 
 
+	/**
+	 * 询价企业
+	 */
+	private String enName;
+
 	public Long getInid() {
 	public Long getInid() {
 		return inid;
 		return inid;
 	}
 	}
@@ -53,4 +58,12 @@ public class InquiryMessage {
 	public void setLastest(boolean lastest) {
 	public void setLastest(boolean lastest) {
 		this.lastest = lastest;
 		this.lastest = lastest;
 	}
 	}
+
+	public String getEnName() {
+		return enName;
+	}
+
+	public void setEnName(String enName) {
+		this.enName = enName;
+	}
 }
 }