LIEBIAO

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -36,14 +37,6 @@ public class DemandRecResultDTO implements Serializable {
     private String demandUserName;
     private String demandUserMobile;
 
-    //@JsonIgnore
-    private String serviceType;
-    private String serverId;
-    //@JsonIgnore
-    private String serviceName;
-    private String serviceShowName;
-
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private String wantServiceTime;
 
@@ -52,4 +45,68 @@ public class DemandRecResultDTO implements Serializable {
      */
     private String status;
     private String statusName;
+
+    /**
+     * 完成结果：已解决 resolved，未解决 unresolved
+
+     */
+    private String finishResult;
+
+    /**
+     * 取消时间
+     */
+    private Date cancelTime;
+
+    /**
+     * 1：已评价；0：未评价;评价后ic_user_satisfaction表有记录
+     */
+    private Boolean evaluateFlag;
+    /**
+     * 得分可为半星
+     */
+    private BigDecimal score;
+
+    /** 服务情况********************************************************************/
+    /** 服务情况********************************************************************/
+    /** 服务情况********************************************************************/
+    /**
+     * 志愿者的姓名
+     * 社会组织名
+     * 社区自组织的名字
+     * 区域党建单位名称
+     */
+    private String serviceName;
+    /**
+     * 尹作梅(志愿者)
+     * XXX(社会组织)
+     * XXX(社区自组织)
+     * XXX(区域化党建单位)
+     */
+    private String serviceShowName;
+    /**
+     * 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit；
+     */
+    private String serviceType;
+
+    /**
+     * 志愿者：居民端爱心互助的志愿者userId；
+     */
+    private String serverId;
+
+    /**
+     * 实际服务开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date serviceStartTime;
+
+    /**
+     * 实际服务结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date serviceEndTime;
+
+    /**
+     * 完成情况
+     */
+    private String finishDesc;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -49,6 +49,11 @@
             r.DEMAND_USER_NAME as demandUserName,
             r.DEMAND_USER_MOBILE as demandUserMobile,
             concat(r.DEMAND_USER_NAME,'(',r.DEMAND_USER_MOBILE,')') as demandUser,
+            r.WANT_SERVICE_TIME as wantServiceTime,
+            r.FINISH_RESULT as finishResult,
+            r.CANCEL_TIME as cancelTime,
+            r.EVALUATE_FLAG as evaluateFlag,
+            IFNULL(sa.SCORE,0) as score,
             IFNULL( s.SERVICE_TYPE, '' ) AS serviceType,
             IFNULL( s.SERVER_ID, '' ) AS serverId,
             (
@@ -58,10 +63,13 @@
                 else ''
                 end
             ) as serviceName,
-            r.WANT_SERVICE_TIME as wantServiceTime
+            s.SERVICE_START_TIME as serviceStartTime,
+            s.SERVICE_END_TIME as serviceEndTime,
+            s.FINISH_DESC as  finishDesc
         FROM
             ic_user_demand_rec r
             INNER JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )
+            inner join ic_user_demand_satisfaction sa on(r.id=sa.DEMAND_REC_ID AND sa.DEL_FLAG = '0')
         WHERE
             r.DEL_FLAG = '0'
             AND r.CUSTOMER_ID = #{customerId}