|
@@ -93,14 +93,16 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
|
|
|
purcMould.add(purchaseInquiryMould);
|
|
purcMould.add(purchaseInquiryMould);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- PurchaseInquiryMould mould = purchaseInquiryMouldDao.findOne(inquiry.getB2b_im_id());
|
|
|
|
|
- if (mould != null) {
|
|
|
|
|
- if (inquiry.getIn_adoptstatus().equals("已采纳")) {
|
|
|
|
|
- mould.setAdoptStatus(Constant.YES);
|
|
|
|
|
- } else if (inquiry.getIn_adoptstatus().equals("未采纳")) {
|
|
|
|
|
- mould.setAdoptStatus(Constant.NO);
|
|
|
|
|
|
|
+ if (null != inquiry.getB2b_im_id()) {
|
|
|
|
|
+ PurchaseInquiryMould mould = purchaseInquiryMouldDao.findOne(inquiry.getB2b_im_id());
|
|
|
|
|
+ if (mould != null) {
|
|
|
|
|
+ if (inquiry.getIn_adoptstatus().equals("已采纳")) {
|
|
|
|
|
+ mould.setAdoptStatus(Constant.YES);
|
|
|
|
|
+ } else if (inquiry.getIn_adoptstatus().equals("未采纳")) {
|
|
|
|
|
+ mould.setAdoptStatus(Constant.NO);
|
|
|
|
|
+ }
|
|
|
|
|
+ purchaseInquiryMouldDao.save(mould);
|
|
|
}
|
|
}
|
|
|
- purchaseInquiryMouldDao.save(mould);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -125,15 +127,17 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
|
|
|
List<PurchaseInquiryMould> inquiryMoulds = new ArrayList<PurchaseInquiryMould>();
|
|
List<PurchaseInquiryMould> inquiryMoulds = new ArrayList<PurchaseInquiryMould>();
|
|
|
if (!CollectionUtils.isEmpty(decides)) {
|
|
if (!CollectionUtils.isEmpty(decides)) {
|
|
|
for (InquiryMouldDecide decide : decides) {
|
|
for (InquiryMouldDecide decide : decides) {
|
|
|
- PurchaseInquiryMould mould = purchaseInquiryMouldDao.findOne(decide.getB2b_im_id());
|
|
|
|
|
- if (mould != null) {
|
|
|
|
|
- if (decide.getIn_adoptstatus().equals("已采纳")) {
|
|
|
|
|
- mould.setAdoptStatus(Constant.YES);
|
|
|
|
|
- } else if (decide.getIn_adoptstatus().equals("未采纳")) {
|
|
|
|
|
- mould.setAdoptStatus(Constant.NO);
|
|
|
|
|
|
|
+ if (decide.getB2b_im_id() != null) {
|
|
|
|
|
+ PurchaseInquiryMould mould = purchaseInquiryMouldDao.findOne(decide.getB2b_im_id());
|
|
|
|
|
+ if (mould != null) {
|
|
|
|
|
+ if (decide.getIn_adoptstatus().equals("已采纳")) {
|
|
|
|
|
+ mould.setAdoptStatus(Constant.YES);
|
|
|
|
|
+ } else if (decide.getIn_adoptstatus().equals("未采纳")) {
|
|
|
|
|
+ mould.setAdoptStatus(Constant.NO);
|
|
|
|
|
+ }
|
|
|
|
|
+ mould.setDecideStatus((short) Status.NOT_UPLOAD.value());
|
|
|
|
|
+ inquiryMoulds.add(mould);
|
|
|
}
|
|
}
|
|
|
- mould.setDecideStatus((short) Status.NOT_UPLOAD.value());
|
|
|
|
|
- inquiryMoulds.add(mould);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|