Merge branch 'dev' into 'master'
重构开标一览表 See merge request eshop/biz_service_ebtp_extend!34
This commit is contained in:
@ -56,14 +56,9 @@ public class BizExportDictServiceImpl extends BaseServiceImpl<BizExportDictMappe
|
|||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
Map<String, List<BizExportDict>> resultsMap = new HashMap<>();
|
Map<String, List<BizExportDict>> resultsMap = new HashMap<>();
|
||||||
|
|
||||||
//是否包含开标阶段
|
//是否包含开标阶段
|
||||||
//是否包含开标阶段
|
boolean toInitialOpenRoom = room.getRoomType().equals(CommonConstants.ROOM_TYPE_2);
|
||||||
boolean toInitialOpenRoom = "procurement_mode_1".equals(proj.getBidMethodDict()) || "procurement_mode_2".equals(proj.getBidMethodDict());
|
|
||||||
if ("procurement_mode_3".equals(proj.getBidMethodDict())) {
|
|
||||||
if ("selection_method_1".equals(proj.getBiddingSignDict())) {
|
|
||||||
toInitialOpenRoom = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (BizExportDict bizExportDict : level1) {
|
for (BizExportDict bizExportDict : level1) {
|
||||||
//不含开标阶段 100 = 开标阶段
|
//不含开标阶段 100 = 开标阶段
|
||||||
@ -105,8 +100,7 @@ public class BizExportDictServiceImpl extends BaseServiceImpl<BizExportDictMappe
|
|||||||
"?assessRoomId=" + roomId +
|
"?assessRoomId=" + roomId +
|
||||||
// "&reviewTurnId=" + v.getReviewTurnId() +
|
// "&reviewTurnId=" + v.getReviewTurnId() +
|
||||||
"&projectId=" + proj.getId() +
|
"&projectId=" + proj.getId() +
|
||||||
"§ionId=" + section.getId() +
|
"§ionId=" + section.getId();
|
||||||
"&reviewTurnSort=1";
|
|
||||||
bizExportDict.setUrl(sbl);
|
bizExportDict.setUrl(sbl);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user