Merge remote-tracking branch 'origin/dev' into dev

README.md

@@ -1 +1,14 @@
-## Inquiry Service
+# Description
+This is Inquiry Service.
+
+# Deploy
+### Test
+* Visit [Jenkins](http://10.10.100.200:5001/job/ps-inquiry.test/)
+* Click "立即构建"
+
+### Production
+* Visit [Jenkins](http://10.10.100.200:5001/job/ps-inquiry.prod.package/)
+* Click "立即构建"
+* Visit [Jenkins](http://119.147.37.222:9091/job/ps-inquiry/)
+* Click "Build with Parameters"
+* Click "开始构建"

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -238,6 +238,7 @@ public class PublicInquiryController {
                 return map;
             }
         } else {
+            filter.setEnUU(en_uu);
             map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
             return map;
         }
@@ -296,4 +297,15 @@ public class PublicInquiryController {
     public com.uas.ps.inquiry.model.Attach getAttach(Long id) {
         return attachService.findById(id);
     }
+
+    /**
+     * 通过询价主表id查询主表信息
+     *
+     * @param id 主表id
+     * @return
+     */
+    @RequestMapping(value = "/findInquiryById", method = RequestMethod.GET)
+    public PurcInquiry findById(Long id) {
+        return publicInquiryService.findInquiryById(id);
+    }
 }

src/main/java/com/uas/ps/inquiry/model/Enterprise.java

@@ -4,7 +4,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -52,6 +51,12 @@ public class Enterprise implements Serializable {
     @Column(name = "en_businesscode")
     private  String businesscode;
 
+    /**
+     * 企业管理员UU
+     */
+    @Column(name = "en_adminuu")
+    private Long adminUU;
+
     public Long getUu() {
         return uu;
     }
@@ -92,6 +97,14 @@ public class Enterprise implements Serializable {
         this.businesscode = businesscode;
     }
 
+    public Long getAdminUU() {
+        return adminUU;
+    }
+
+    public void setAdminUU(Long adminUU) {
+        this.adminUU = adminUU;
+    }
+
     @Override
     public String toString() {
         return "Enterprise{" +
@@ -100,6 +113,7 @@ public class Enterprise implements Serializable {
                 ", enTel='" + enTel + '\'' +
                 ", enAddress='" + enAddress + '\'' +
                 ", businesscode='" + businesscode + '\'' +
+                ", adminUU=" + adminUU +
                 '}';
     }
 }

src/main/java/com/uas/ps/inquiry/service/PublicInquiryService.java

@@ -175,5 +175,13 @@ public interface PublicInquiryService {
      * @throws Exception
      */
     void notify(List<PurcInquiryItem> inquiryItems, String sourceApp) throws Exception;
+
+    /**
+     * 通过id查询询价信息
+     *
+     * @param id 公共询价主表id
+     * @return
+     */
+    PurcInquiry findInquiryById(Long id);
 }
 

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -209,8 +209,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
                                 model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
                             } else {
-                               User admin = userDao.findOne(item.getInquiry().getEnUU());
-                               model.setSenderUu(null != admin ? admin.getUserUU() : 0L);
+                               Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                               model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
                             }
                             model.setSmsType(SMS_TYPE);
                             model.setMailTemplate(MAIL_TEMP_ID);
@@ -228,6 +228,17 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
         }
     }
 
+    /**
+     * 通过id查询询价信息
+     *
+     * @param id 公共询价主表id
+     * @return
+     */
+    @Override
+    public PurcInquiry findInquiryById(Long id) {
+        return purcInquiryDao.findOne(id);
+    }
+
     /**
      * 发送消息推送
      *