Merge branch 'dev' into 'master'

重构开标一览表

See merge request eshop/biz_service_ebtp_extend!34
This commit is contained in:
付庆吉
2021-04-23 16:54:35 +08:00

View File

@ -56,14 +56,9 @@ public class BizExportDictServiceImpl extends BaseServiceImpl<BizExportDictMappe
.collect(Collectors.toList());
Map<String, List<BizExportDict>> resultsMap = new HashMap<>();
//是否包含开标阶段
//是否包含开标阶段
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;
}
}
boolean toInitialOpenRoom = room.getRoomType().equals(CommonConstants.ROOM_TYPE_2);
for (BizExportDict bizExportDict : level1) {
//不含开标阶段 100 = 开标阶段
@ -105,8 +100,7 @@ public class BizExportDictServiceImpl extends BaseServiceImpl<BizExportDictMappe
"?assessRoomId=" + roomId +
// "&reviewTurnId=" + v.getReviewTurnId() +
"&projectId=" + proj.getId() +
"&sectionId=" + section.getId() +
"&reviewTurnSort=1";
"&sectionId=" + section.getId();
bizExportDict.setUrl(sbl);
}
});