商机增加是否已报价

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/RemindRspDTO.java

@@ -46,6 +46,10 @@ public class RemindRspDTO implements Serializable {
      * 截止日期
      */
     private Date endDate;
+    /**
+     * 是否已报价, 1是  0否
+     */
+    private int quoted;
 
     public String getCustName() {
         return custName;
@@ -118,4 +122,12 @@ public class RemindRspDTO implements Serializable {
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
+
+    public int getQuoted() {
+        return quoted;
+    }
+
+    public void setQuoted(int quoted) {
+        this.quoted = quoted;
+    }
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -33,10 +33,7 @@ import com.usoftchina.saas.sale.service.ProdInOutService;
 import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.storage.po.ProdIODetail;
 import com.usoftchina.saas.storage.po.ProdInOut;
-import com.usoftchina.saas.utils.BeanMapper;
-import com.usoftchina.saas.utils.CollectionUtils;
-import com.usoftchina.saas.utils.DateUtils;
-import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -738,6 +735,11 @@ public class SaleServiceImpl implements SaleService{
                 remindRspDTO.setNeedQty(inquiryEnRemind.getNeedQty());
                 remindRspDTO.setStartDate(inquiryEnRemind.getReDate());
                 remindRspDTO.setEndDate(inquiryEnRemind.getEndDate());
+                if (ObjectUtils.isEmpty(inquiryEnRemind.getQuotation())){
+                    remindRspDTO.setQuoted(0);
+                }else{
+                    remindRspDTO.setQuoted(1);
+                }
                 remindRspDTOList.add(remindRspDTO);
             }
         }else if("personal".equals(type)){
@@ -753,6 +755,11 @@ public class SaleServiceImpl implements SaleService{
                 remindRspDTO.setNeedQty(inquiryRemind.getNeedQty());
                 remindRspDTO.setStartDate(inquiryRemind.getReDate());
                 remindRspDTO.setEndDate(inquiryRemind.getEndDate());
+                if (ObjectUtils.isEmpty(inquiryRemind.getQuotation())){
+                    remindRspDTO.setQuoted(0);
+                }else{
+                    remindRspDTO.setQuoted(1);
+                }
                 remindRspDTOList.add(remindRspDTO);
             }
         }