Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/OrderDetailDTO.java

@@ -56,7 +56,7 @@ public class OrderDetailDTO {
 
     private String accountNo;
 
-    private String ticketStatus;
+    private String ticketUrl;
 
     public String getPayStatusStr() {
         if (payStatus.equals(10)){

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/BillDetailInfo.java

@@ -59,7 +59,7 @@ public class BillDetailInfo {
 
    private Integer sortNo;
 
-   private String ticketStatus = "0";
+   private String ticketUrl;
 
 
 }

common/src/main/java/com/jpsoft/enterprise/modules/base/entity/WhisperingWall.java

@@ -23,6 +23,8 @@ public class WhisperingWall {
     private String question;
     @ApiModelProperty(value = "提问人")
     private String questionBy;
+    private String questionByN;
+    private String questionByCompany;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "提问时间")
@@ -31,6 +33,8 @@ public class WhisperingWall {
     private String answer;
     @ApiModelProperty(value = "回答人")
     private String answerBy;
+    private String answerByN;
+    private String answerByCompany;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @ApiModelProperty(value = "回答时间")

common/src/main/resources/mapper/base/BillDetailInfo.xml

@@ -16,7 +16,7 @@
         <result property="updateTime" column="update_time" />
         <result property="delFlag" column="del_flag" />
         <result property="sortNo" column="sort_no"/>
-        <result property="ticketStatus" column="ticket_status"/>
+        <result property="ticketUrl" column="ticket_url"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.enterprise.modules.base.entity.BillDetailInfo">
         <!--
@@ -26,7 +26,7 @@
         -->
         <![CDATA[
 		insert into base_bill_detail_info
-	    (id_,bill_id,order_id,company_id,bill_detail,rush_status,create_by,create_time,update_by,update_time,del_flag,sort_no,ticket_status)
+	    (id_,bill_id,order_id,company_id,bill_detail,rush_status,create_by,create_time,update_by,update_time,del_flag,sort_no,ticket_url)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -41,7 +41,7 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{sortNo,jdbcType=INTEGER}
-,#{ticketStatus,jdbcType=VARCHAR}
+,#{ticketUrl,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -84,8 +84,8 @@
             <if test="sortNo != null">
                 sort_no = #{sortNo,jdbcType=INTEGER},
             </if>
-            <if test="ticketStatus != null">
-                ticket_status = #{ticketStatus,jdbcType=VARCHAR}
+            <if test="ticketUrl != null">
+                ticket_url = #{ticketUrl,jdbcType=VARCHAR}
             </if>
         </set>
         where id_=#{id}

web/src/main/java/com/jpsoft/enterprise/modules/base/controller/WhisperingWallController.java

@@ -1,6 +1,10 @@
 package com.jpsoft.enterprise.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.enterprise.modules.base.entity.CompanyInfo;
+import com.jpsoft.enterprise.modules.base.entity.PersonInfo;
+import com.jpsoft.enterprise.modules.base.service.CompanyInfoService;
+import com.jpsoft.enterprise.modules.base.service.PersonInfoService;
 import com.jpsoft.enterprise.modules.common.utils.PojoUtils;
 import com.jpsoft.enterprise.modules.common.dto.Sort;
 import com.jpsoft.enterprise.modules.common.dto.MessageResult;
@@ -30,6 +34,10 @@ public class WhisperingWallController {
     private WhisperingWallService whisperingWallService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private PersonInfoService personInfoService;
+    @Autowired
+    private CompanyInfoService companyInfoService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -224,6 +232,21 @@ public class WhisperingWallController {
         }
 
         Page<WhisperingWall> page = whisperingWallService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(WhisperingWall whisperingWall : page.getResult()){
+            PersonInfo personInfoQuestion = personInfoService.get(whisperingWall.getQuestionBy());
+            if(personInfoQuestion != null) {
+//            CompanyInfo companyInfoQuestion = companyInfoService.get(personInfoQuestion.getCompanyId());
+                whisperingWall.setQuestionByN(personInfoQuestion.getPersonName());
+//            whisperingWall.setQuestionByCompany(companyInfoQuestion.getCompanyName());
+            }
+
+            PersonInfo personInfoAnswer = personInfoService.get(whisperingWall.getAnswerBy());
+            if(personInfoAnswer != null) {
+//            CompanyInfo companyInfoAnswer = companyInfoService.get(personInfoAnswer.getCompanyId());
+                whisperingWall.setAnswerByN(personInfoAnswer.getPersonName());
+//            whisperingWall.setAnswerByCompany(companyInfoAnswer.getCompanyName());
+            }
+        }
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/OrderInfoApiController.java

@@ -157,7 +157,7 @@ public class OrderInfoApiController {
             orderDetailDTO.setAccountNo(accountInfo.getAccountNo());
             orderDetailDTO.setPayStatusStr(orderDetailDTO.getPayStatusStr());
             orderDetailDTO.setPayNameStr(orderDetailDTO.getPayNameStr());
-            orderDetailDTO.setTicketStatus(billDetailInfo.getTicketStatus());
+            orderDetailDTO.setTicketUrl(billDetailInfo.getTicketUrl());
 
             List<DetailDTO> detailDTOList = new ArrayList<>();
             JSONObject jsonObject = JSONUtil.parseObj(billDetailInfo.getBillDetail());