针对已转报价单的单据，增加附件返回

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -299,7 +299,7 @@ public class PublicInquiryController {
      */
     @HttpLog
     @RequestMapping(value = "/quotation/list", method = RequestMethod.GET)
-    public Page<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state) {
+    public IPage<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state) {
         Sort sort = new Sort(Sort.Direction.DESC, "date");
         if (pageInfo.getOffset() == 0) {
             pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItemInfo.java

@@ -402,6 +402,18 @@ public class PublicInquiryItemInfo implements Serializable {
 	@Column(name = "id_checked")
 	private Short checked;
 
+	/**
+	 * 报价附件信息
+	 */
+	@Transient
+	private String attachUrl;
+
+    /**
+     * 报价附件名称
+     */
+    @Transient
+    private String attachName;
+
 	public Long getId() {
 		return id;
 	}
@@ -866,7 +878,23 @@ public class PublicInquiryItemInfo implements Serializable {
 		this.checked = checked;
 	}
 
-	@Override
+    public String getAttachUrl() {
+        return attachUrl;
+    }
+
+    public void setAttachUrl(String attachUrl) {
+        this.attachUrl = attachUrl;
+    }
+
+    public String getAttachName() {
+        return attachName;
+    }
+
+    public void setAttachName(String attachName) {
+        this.attachName = attachName;
+    }
+
+    @Override
 	public String toString() {
 		return "PublicInquiryItemInfo{" +
 				"id=" + id +

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -145,7 +145,7 @@ public interface PublicInquiryService {
      * @param filter 过滤条件
      * @return
      */
-    Page<PublicInquiryItemInfo> findByPageInfo(PageInfo info, SearchFilter filter);
+    IPage<PublicInquiryItemInfo> findByPageInfo(PageInfo info, SearchFilter filter);
 
     /**
      * 通过id查询单个已转报价的信息

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -739,7 +739,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      * @date 2018-01-17 10:30
      */
     @Override
-    public Page<PublicInquiryItemInfo> findByPageInfo(final PageInfo info, final SearchFilter filter) {
+    public IPage<PublicInquiryItemInfo> findByPageInfo(final PageInfo info, final SearchFilter filter) {
         if (null != filter) {
             if (StringUtils.hasText(filter.getKeyword())) {
                 SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE, true);
@@ -760,12 +760,25 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 info.expression(PredicateUtils.lte("offerTime", new Date(filter.getEndDate()), false));
             }
         }
-        return itemInfoDao.findAll(new Specification<PublicInquiryItemInfo>() {
+        Page<PublicInquiryItemInfo> itemInfoPage = itemInfoDao.findAll(new Specification<PublicInquiryItemInfo>() {
             public Predicate toPredicate(Root<PublicInquiryItemInfo> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
                 query.where(info.getPredicates(root, query, builder));
                 return null;
             }
         }, info);
+        if (!CollectionUtils.isEmpty(itemInfoPage.getContent())) {
+            for (PublicInquiryItemInfo itemInfo : itemInfoPage) {
+                String sql = "select at_path,at_name from attachs a left join public$inquiryitems$attach p on a.at_id = p.at_id " +
+                        "left join public$inquiryitems i on p.id_id = i.id_id where i.id_id = " + itemInfo.getId();
+                List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
+                if (!CollectionUtils.isEmpty(maps)) {
+                    Map<String, Object> map = maps.get(0);
+                    itemInfo.setAttachUrl(map.get("at_path").toString());
+                    itemInfo.setAttachName(map.get("at_name").toString());
+                }
+            }
+        }
+        return IPageUtils.covert(itemInfoPage);
     }
 
     @Override