fix:接单信息不统一问题

src/main/java/com/lightinit/hsdataportal/model/APIReceiveListModel.java

@@ -6,7 +6,7 @@ public class APIReceiveListModel {
     //时间 接单人 电话 订单状态
     private Long id;
     private Date receivedAt;
-    private Long created_at;
+    private Date createdAt;
     private String userName;
 
     private String phone;
@@ -44,12 +44,12 @@ public class APIReceiveListModel {
         this.receivedAt = receivedAt;
     }
 
-    public Long getCreated_at() {
-        return created_at;
+    public Date getCreatedAt() {
+        return createdAt;
     }
 
-    public void setCreated_at(Long created_at) {
-        this.created_at = created_at;
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
     }
 
     public String getPhone() {

src/main/resources/sqlmaps/RequirementMicroappMapper.xml

@@ -369,7 +369,8 @@
   </select>
   <select id="selectReceiveList" parameterType="java.lang.Long" resultType="com.lightinit.hsdataportal.model.APIReceiveListModel">
       SELECT
-       u.`username`,u.`phone`,rr.`created_at`,rr.solution
+       u.`username`, IFNULL(rr.`phone`,u.`phone`) AS `phone`,
+       rr.`created_at`,rr.solution
        FROM
         `requirement` r
        JOIN `requirement_microapp` rm ON r.id = rm.`id`

src/main/webapp/pages/open/myrequirement/mymicroapp/receiveList.jsp

@@ -35,7 +35,7 @@
                     </tr>
                     <c:forEach items="${list}" var="item">
                         <tr>
-                            <td><fmt:formatDate value="${item.created_at}" pattern="yyyy-MM-dd"></fmt:formatDate></td>
+                            <td><fmt:formatDate value="${item.createdAt}" pattern="yyyy-MM-dd"></fmt:formatDate></td>
                             <td>${item.userName}</td>
                             <td>${item.phone}</td>
                             <td style="display: none">${item.solution}</td>
@@ -60,14 +60,14 @@
     <div class="window" >
         <div class="top00">
             <span class="p">资源使用需求</span>
-            <img src="<%=resourcePath%>/images/icon_guanbi.png" alt="" class="guanbi">
+            <img src="<%=resourcePath%>/images/icon_guanbi.png" alt="" class="guanbi" onclick="offlineReceive()">
         </div>
         <div class="form">
             <form id="receiveForm">
 
                 <div class="application-font-0">
                     <span class="application-font-2">方案概述：</span>
-                    <textarea name="solution" id="usage" cols="46" rows="3" class="area2" placeholder="请输入您的使用意向"></textarea>
+                    <textarea name="solution" id="usage" readonly cols="46" rows="3" class="area2" placeholder="接单人暂时没有填写使用意向"></textarea>
                 </div>
 
                 <div class="clearfix"></div>