报价、采纳状态上传到报价方UAS接口调整

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

@@ -3,7 +3,6 @@ package com.uas.ps.inquiry.controller;
 import com.uas.ps.core.logging.BufferedLoggerManager;
 import com.uas.ps.httplog.annotation.HttpLog;
 import com.uas.ps.inquiry.entity.Constant;
-import com.uas.ps.inquiry.entity.InquiryDetail;
 import com.uas.ps.inquiry.entity.InquirySource;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.service.AttachService;
@@ -19,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -73,11 +73,16 @@ public class ErpDownloadController {
      */
     @HttpLog
     @RequestMapping(value = "/down/decide/back", method = RequestMethod.POST)
-    public ModelMap downloadDecideBack(List<Long> ids, Long enUU) {
+    public ModelMap downloadDecideBack(String ids, Long enUU) throws UnsupportedEncodingException {
         long start = System.currentTimeMillis();
-        ModelMap map = publicInquiryService.downloadDecideBack(ids, enUU);
+        String[] idArray = URLDecoder.decode(ids, "UTF-8").split(",");
+        List<Long> idList = new ArrayList<>();
+        for (String id : idArray) {
+            idList.add(Long.valueOf(id));
+        }
+        ModelMap map = publicInquiryService.downloadDecideBack(idList, enUU);
         log.info("/inquiry/public/down/decide/back 耗时:" + (System.currentTimeMillis() - start));
-        logger.log("公共询价", "买家采纳或拒绝之后，上传到报价方UAS的回调", "size: " + ids.size(), Constant.UU, enUU, InquirySource.ERP.name());
+        logger.log("公共询价", "买家采纳或拒绝之后，上传到报价方UAS的回调", "size: " + idList.size(), Constant.UU, enUU, InquirySource.ERP.name());
         return map;
     }
 
@@ -90,9 +95,9 @@ public class ErpDownloadController {
      */
     @HttpLog
     @RequestMapping(value = "/down/reply", method = RequestMethod.GET)
-    public List<InquiryDetail> getReply(Long enUU) {
+    public List<PublicInquiryItem> getReply(Long enUU) {
         long start = System.currentTimeMillis();
-        List<InquiryDetail> details = publicInquiryService.findNotUploadToUas(enUU);
+        List<PublicInquiryItem> details = publicInquiryService.findNotUploadToUas(enUU);
         log.info("/inquiry/public/quotation 耗时:" + (System.currentTimeMillis() - start));
         logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enUU, InquirySource.ERP.name());
         return details;

src/main/java/com/uas/ps/inquiry/dao/PublicInquiryItemDao.java

@@ -110,6 +110,6 @@ public interface PublicInquiryItemDao extends JpaRepository<PublicInquiryItem, L
      * @author dongbw
      * @return
      */
-    @Query(value = "select * from PublicInquiryItem d where d.id_venduu = :vendUU and d.id_replysendstatus = :replySendStatus limit 200", nativeQuery = true)
+    @Query(value = "select * from public$inquiryitems d where d.id_venduu = :vendUU and d.id_replysendstatus = :replySendStatus limit 200", nativeQuery = true)
     List<PublicInquiryItem> findByVendUUAndReplySendStatus(@Param("vendUU")Long vendUU, @Param("replySendStatus") short replySendStatus);
 }

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

@@ -1,7 +1,5 @@
 package com.uas.ps.inquiry.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
 import com.uas.ps.inquiry.entity.Constant;
@@ -241,7 +239,7 @@ public class PublicInquiryItem implements Serializable {
 	/**
 	 * 报价方UAS 是否采纳信息传输状态{待上传、已下载}  202 待上传  203  已下载
 	 */
-	@Column(name = "id_decidesdowntatus")
+	@Column(name = "id_decidedownstatus")
 	private Short decideDownStatus;
 
 	/**
@@ -488,8 +486,6 @@ public class PublicInquiryItem implements Serializable {
 		this.id = id;
 	}
 
-	@JsonIgnore
-	@JSONField(serialize = false)
 	public Long getSourceId() {
 		return sourceId;
 	}
@@ -1108,7 +1104,7 @@ public class PublicInquiryItem implements Serializable {
 	    if(this.erpstatus == null) {
 	        this.erpstatus = Constant.YES;
         }
-		if (this.inquiry.getEndDate() != null) {
+		if (null != this.inquiry && null != this.inquiry.getEndDate()) {
 			return DateUtils
 					.compare(this.inquiry.getEndDate(), new Date(),
 							DateUtils.COMPARE_DAY) >= 0
@@ -1117,7 +1113,7 @@ public class PublicInquiryItem implements Serializable {
 							&& this.agreed == null) && this.erpstatus != Constant.NO);
 		}
 		return this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
-				&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
+				&& (null != this.inquiry && (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES))
 				&& this.agreed == null) && this.erpstatus != Constant.NO;
 	}
 

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

@@ -302,7 +302,7 @@ public interface PublicInquiryService {
      * @param enUU 企业UU
      * @return
      */
-    List<InquiryDetail> findNotUploadToUas(Long enUU);
+    List<PublicInquiryItem> findNotUploadToUas(Long enUU);
 
 }
 

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

@@ -663,12 +663,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      * @return
      */
     @Override
-    public List<InquiryDetail> findNotUploadToUas(Long enUU) {
-        List<PublicInquiryItem> items = publicInquiryItemDao.findByVendUUAndReplySendStatus(enUU, (short) Status.NOT_UPLOAD.value());
-        if (!CollectionUtils.isEmpty(items)) {
-            return convertPublicInquiryReply(items);
-        }
-        return new ArrayList<>();
+    public List<PublicInquiryItem> findNotUploadToUas(Long enUU) {
+        return publicInquiryItemDao.findByVendUUAndReplySendStatus(enUU, (short) Status.NOT_UPLOAD.value());
     }
 
     /**
@@ -1590,7 +1586,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      */
     @Override
     public List<PublicInquiryItem> findDecideNotUploadReply(Long enUU) {
-        String sql = "select id_id id, id_sourceid sourceId, id_agreed agreed, id_refusereason refusereason from public$inquiryitems " +
+        String sql = "select id_id id, id_sourceid sourceId, id_agreed agreed, id_refusereason refusereason, id_status status from public$inquiryitems " +
                 "where id_venduu = " + enUU + " and id_decidedownstatus = " + Status.NOT_UPLOAD.value() + " limit 200";
         return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(PublicInquiryItem.class));
     }