commit

PddServer/src/main/java/org/ta/pddserver/controller/PddGDController.java

@@ -16,6 +16,7 @@ import org.ta.pddserver.entity.GDTicketEntity;
 import org.ta.pddserver.model.api.request.LogOrderListRequest;
 import org.ta.pddserver.model.api.request.ReplyRequest;
 import org.ta.pddserver.model.api.request.TicketListRequest;
+import org.ta.pddserver.model.api.response.GDReplyListResponse;
 import org.ta.pddserver.model.pddgd.request.GDTicketReplyRequest;
 import org.ta.pddserver.model.pddgd.request.GDUploadRequest;
 import org.ta.pddserver.model.pddgd.response.GDTicketReplyRepsonse;
@@ -141,13 +142,16 @@ public class PddGDController {
 
         List<GDAttachmentEntity> list = gdAttachmentImpl.getListByTicketId(ticketListRequest.getTicket_id());
 
+        List<GDReplyListResponse> gDReplyList = gdReplyImpl.findListByTicketId(ticketListRequest.getTicket_id());
+
         map.put("ticket", gdTicketEntity);
         map.put("attachment", list);
+        map.put("reply", gDReplyList);
 
         return JsonResponse.generateLocalCommonSuccessResponse(map);
     }
 
-    /*工单列表*/
+    /*上传图片*/
     @PostMapping("/uploadImage")
     public JSONObject uploadImage(HttpServletRequest request, @RequestBody GDUploadRequest gdUploadRequest) throws IOException {
         gdUploadRequest.setClient_id(CLIENT_ID);
@@ -228,6 +232,7 @@ public class PddGDController {
                 gdReplyAttachmentEntity.setTickId(replyRequest.getTicket_id());
                 gdReplyAttachmentEntity.setWaybill_no(replyRequest.getWaybill_no());
                 gdReplyAttachmentEntity.setUrl(lists);
+                gdReplyAttachmentEntity.setReplyId(gdReply.getUid());
                 gdReplyAttachmentImpl.save(gdReplyAttachmentEntity);
             }
 

PddServer/src/main/java/org/ta/pddserver/entity/GDReplyEntity.java

@@ -25,6 +25,9 @@ public class GDReplyEntity {
     @TableField(value = "remarks")
     private String remarks;
 
+    @TableField(value = "uid")
+    private String uid;
+
     @TableField(value = "status")
     private Integer status;
 

PddServer/src/main/java/org/ta/pddserver/mapper/GDReplyMapper.java

@@ -2,8 +2,16 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.ta.pddserver.entity.GDReplyEntity;
+import org.ta.pddserver.model.api.response.GDReplyListResponse;
+
+import java.util.List;
 
 @Mapper
 public interface GDReplyMapper extends BaseMapper<GDReplyEntity> {
+
+    @Select("SELECT a.* , IFNULL(GROUP_CONCAT(b.`url` SEPARATOR ';'), '') AS attach_paths FROM `gd_reply` a LEFT JOIN `gd_reply_attachment` b ON a.`uid` = b.`replyId` WHERE  a.`ticket_id` = #{ticket_id} GROUP BY a.`uid` ORDER BY a.`uid` ASC")
+    List<GDReplyListResponse> findListByTicketId(@Param("ticketId") int ticketId);
 }

PddServer/src/main/java/org/ta/pddserver/model/api/response/GDReplyListResponse.java

+package org.ta.pddserver.model.api.response;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class GDReplyListResponse {
+
+    private String created;
+
+    private String updated;
+
+    private Integer state;
+
+    private String remarks;
+
+    private String uid;
+
+    private Integer status;
+
+
+    private Long tickId;
+
+
+    private String waybill_no;
+
+
+    private String handle_result;
+
+
+    private Integer sign_state;
+
+
+    private Integer compensate_state;
+
+
+    private Integer compensate_amount;
+
+
+    private Integer duty;
+
+
+    private String express_dealer;
+
+
+    private String express_dealer_contact;
+
+
+    private Integer reply_type;
+
+    private String reply_call_result;
+
+    private String attach_paths;
+
+}

PddServer/src/main/java/org/ta/pddserver/service/impl/GDReplyImpl.java

@@ -5,10 +5,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.GDReplyEntity;
 import org.ta.pddserver.mapper.GDReplyMapper;
+import org.ta.pddserver.model.api.response.GDReplyListResponse;
 import org.ta.pddserver.service.GDReplyService;
 
+import java.util.List;
+
 @Service
 public class GDReplyImpl extends ServiceImpl<GDReplyMapper, GDReplyEntity> implements GDReplyService {
 
 
+    public List<GDReplyListResponse> findListByTicketId(int ticketId) {
+        return baseMapper.findListByTicketId(ticketId);
+    }
 }
\ No newline at end of file