|
@@ -28,6 +28,7 @@ import com.goafanti.common.dao.UserRoleMapper;
|
|
|
import com.goafanti.common.enums.DeleteStatus;
|
|
import com.goafanti.common.enums.DeleteStatus;
|
|
|
import com.goafanti.common.enums.DemandAuditStatus;
|
|
import com.goafanti.common.enums.DemandAuditStatus;
|
|
|
import com.goafanti.common.enums.DemandInfoSourceStatus;
|
|
import com.goafanti.common.enums.DemandInfoSourceStatus;
|
|
|
|
|
+import com.goafanti.common.enums.DemandPortalSearchSignType;
|
|
|
import com.goafanti.common.enums.DemandReleaseStatus;
|
|
import com.goafanti.common.enums.DemandReleaseStatus;
|
|
|
import com.goafanti.common.enums.DemandStatus;
|
|
import com.goafanti.common.enums.DemandStatus;
|
|
|
import com.goafanti.common.enums.NoticeReadStatus;
|
|
import com.goafanti.common.enums.NoticeReadStatus;
|
|
@@ -375,7 +376,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
- public Pagination<DemandSearchListBo> listDemandSearchList(String keyword, Integer industryCategoryA,
|
|
|
|
|
|
|
+ public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
|
|
|
Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
|
|
Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
|
|
|
Integer pNo, Integer pSize) {
|
|
Integer pNo, Integer pSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
@@ -383,11 +384,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
params.put("keyword", keyword);
|
|
params.put("keyword", keyword);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (null != industryCategoryA) {
|
|
|
|
|
|
|
+ if (null != industryCategoryA && DemandPortalSearchSignType.ALL.getCode().equals(sign)) {
|
|
|
params.put("industryCategoryA", industryCategoryA);
|
|
params.put("industryCategoryA", industryCategoryA);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (null != industryCategoryB) {
|
|
|
|
|
|
|
+ if (null != industryCategoryB && DemandPortalSearchSignType.ALL.getCode().equals(sign)) {
|
|
|
params.put("industryCategoryB", industryCategoryB);
|
|
params.put("industryCategoryB", industryCategoryB);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -403,6 +404,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
params.put("budgetCostUpper", budgetCostUpper);
|
|
params.put("budgetCostUpper", budgetCostUpper);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (null != sign) {
|
|
|
|
|
+ params.put("sign", sign);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (pNo == null || pNo < 0) {
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
pNo = 1;
|
|
|
}
|
|
}
|