投诉进度bug

mhotel/src/com/happy/dao/impl/BookingComplainImplDao.java

@@ -139,11 +139,11 @@ public class BookingComplainImplDao implements BookingComplainDao {
                 "\tb.order_end_time as orderEndTime,\n" +
                 "\tb.pay_account as payAccount,\n" +
                 "\tb.house_order_number as houseOrderNumber,\n" +
-                "\tb.house_name as houseName, fi.url as url, \n" +
+                "\tb.house_name as houseName, fi2.url as url, \n" +
                 "\t( SELECT bcp.progress_type FROM booking_complaint_progress bcp WHERE bcp.complaint_id = bc.id ORDER BY bcp.create_date DESC LIMIT 1 ) AS progressType \n" +
                 "FROM\n" +
                 "\t`booking_complaint` bc\n" +
-                "\tLEFT JOIN booking b ON b.id = bc.booking_id AND b.status_del=1  LEFT JOIN file_info fi on bc.house_id=fi.link_id  where bc.create_id=:usersId limit :start,:rows )bc2 ORDER BY bc2.progressType asc ,bc2.dateTime DESC ";
+                "\tLEFT JOIN booking b ON b.id = bc.booking_id AND b.status_del=1   LEFT JOIN ( SELECT fi.link_id, GROUP_CONCAT( fi.url ) AS url FROM file_info fi GROUP BY fi.link_id ) fi2 ON fi2.link_id = bc.id  where bc.create_id=:usersId limit :start,:rows )bc2 ORDER BY bc2.progressType asc ,bc2.dateTime DESC ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -160,7 +160,7 @@ public class BookingComplainImplDao implements BookingComplainDao {
                 "\t count(1) \n" +
                 "FROM\n" +
                 "\t`booking_complaint` bc\n" +
-                "\tLEFT JOIN booking b ON b.id = bc.booking_id AND b.status_del=1  LEFT JOIN file_info fi on bc.house_id=fi.link_id  where bc.create_id=:usersId ";
+                "\tLEFT JOIN booking b ON b.id = bc.booking_id AND b.status_del=1  LEFT JOIN ( SELECT fi.link_id, GROUP_CONCAT( fi.url ) AS url FROM file_info fi GROUP BY fi.link_id ) fi2 ON fi2.link_id = bc.id  where bc.create_id=:usersId ";
 
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("usersId", usersId);

mhotel/src/com/happy/service/impl/BookingComplaintImplService.java

@@ -133,6 +133,17 @@ public class BookingComplaintImplService implements BookingComplaintService {
                 String valueBykey1 = vo.getProgressType() == null ? "" : ProgressEnum.getValueBykey(Integer.valueOf(vo.getProgressType()));
                 vo.setProgressType(valueBykey1);
 
+                if (vo.getUrl()!=null) {
+                    List<String> dateTimeList = vo.getUrl();
+                    String s = dateTimeList.get(0);
+                    String[] split = s.split(",");
+                    ArrayList<String> strings = new ArrayList<>();
+                    for (int i = 0; i < split.length; i++) {
+                        strings.add(split[i]);
+                    }
+                    vo.setUrl(strings);
+                }
+
             }
         }
 

mhotel/src/com/happy/vo/ComplaintPageVo.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -37,6 +38,6 @@ public class ComplaintPageVo {
     //  投诉进度
     private String progressType;
     //    名宿图片
-    private String url;
+    private List<String> url;
 
 }