|
|
@@ -303,7 +303,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
public List<AchievementDemandListBo> selectAchievementDemandListByDemandId(String id) {
|
|
|
return achievementDemandMapper.selectAchievementDemandListByDemandId(id);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public void insertImport(List<DemandImportBo> data) {
|
|
|
if (null == data || data.isEmpty()) {
|
|
|
@@ -315,7 +315,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
List<DemandKeyword> demandKeywordList = new ArrayList<>();
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
- for (DemandImportBo bo : data){
|
|
|
+ for (DemandImportBo bo : data) {
|
|
|
d = new Demand();
|
|
|
BeanUtils.copyProperties(bo, d);
|
|
|
d.setId(UUID.randomUUID().toString());
|
|
|
@@ -342,7 +342,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
demandMapper.insertBatch(demandList);
|
|
|
demandKeywordMapper.insertBatch(demandKeywordList);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<DemandSearchListBo> listDemandSearchList(String keyword, Integer industryCategoryA,
|
|
|
@@ -352,27 +352,27 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (!StringUtils.isBlank(keyword)) {
|
|
|
params.put("keyword", keyword);
|
|
|
}
|
|
|
-
|
|
|
- if (null != industryCategoryA){
|
|
|
+
|
|
|
+ if (null != industryCategoryA) {
|
|
|
params.put("industryCategoryA", industryCategoryA);
|
|
|
}
|
|
|
-
|
|
|
- if (null != industryCategoryB){
|
|
|
+
|
|
|
+ if (null != industryCategoryB) {
|
|
|
params.put("industryCategoryB", industryCategoryB);
|
|
|
}
|
|
|
-
|
|
|
- if (null != demandType){
|
|
|
+
|
|
|
+ if (null != demandType) {
|
|
|
params.put("demandType", demandType);
|
|
|
}
|
|
|
-
|
|
|
- if (null != budgetCostLower){
|
|
|
+
|
|
|
+ if (null != budgetCostLower) {
|
|
|
params.put("budgetCostLower", budgetCostLower);
|
|
|
}
|
|
|
-
|
|
|
- if (null != budgetCostUpper){
|
|
|
+
|
|
|
+ if (null != budgetCostUpper) {
|
|
|
params.put("budgetCostUpper", budgetCostUpper);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -380,18 +380,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
- return (Pagination<DemandSearchListBo>) findPage("findSearchDemandListByPage",
|
|
|
- "findSearchDemandCount", params, pNo, pSize);
|
|
|
+ return (Pagination<DemandSearchListBo>) findPage("findSearchDemandListByPage", "findSearchDemandCount", params,
|
|
|
+ pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
- public DemandSearchDetailBo selectDemandSearchDetail(String id) {
|
|
|
+ public DemandSearchDetailBo selectDemandSearchDetail(String uid, String id) {
|
|
|
return demandMapper.selectDemandSearchDetail(id);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
private Map<String, Object> disposeParams(Integer auditStatus, String province, Integer serialNumber, String name,
|
|
|
String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
|
|
|
String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
|
|
|
@@ -563,9 +560,4 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|