|
|
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
-import java.util.Collection;
|
|
|
+
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -25,8 +25,9 @@ import com.goafanti.common.dao.AchievementKeywordMapper;
|
|
|
import com.goafanti.common.dao.AchievementMapper;
|
|
|
import com.goafanti.common.dao.DemandKeywordMapper;
|
|
|
import com.goafanti.common.dao.DemandMapper;
|
|
|
+import com.goafanti.common.dao.DistrictGlossoryMapper;
|
|
|
import com.goafanti.common.dao.FieldGlossoryMapper;
|
|
|
-import com.goafanti.common.dao.IndustryCategoryMapper;
|
|
|
+
|
|
|
import com.goafanti.common.dao.NewsMapper;
|
|
|
import com.goafanti.common.dao.NoticeMapper;
|
|
|
import com.goafanti.common.dao.OrganizationIdentityMapper;
|
|
|
@@ -99,6 +100,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
AchievementMapper achievementMapper;
|
|
|
@Autowired
|
|
|
FieldGlossoryMapper fieldGlossoryMapper;
|
|
|
+ @Autowired
|
|
|
+ DistrictGlossoryMapper districtGlossoryMapper;
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
@@ -513,7 +516,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
return demandMapper.selectDemandSearchDetail(uid, id);
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unused")
|
|
|
private Map<String, Object> disposeParams(Integer auditStatus, Integer province, Integer serialNumber, String name,
|
|
|
String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
|
|
|
String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
|
|
|
@@ -788,6 +790,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null!=d.getIndustryCategoryC()) {
|
|
|
d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
|
|
|
}
|
|
|
+ if (null!=d.getEmployerId()) {
|
|
|
+ System.out.println(userMapper.selectByPrimaryKey(d.getEmployerId()));
|
|
|
+ d.setCityname(districtGlossoryMapper.selectNameById(userIdentityMapper.selectAuditorUserIdentityByUserId(d.getEmployerId()).getCity()));
|
|
|
+ }
|
|
|
return d;
|
|
|
}
|
|
|
|
|
|
@@ -813,13 +819,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name,
|
|
|
- String keyword, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
|
|
|
+ String keyword, Integer demandType,Integer industryCategoryA, String validityPeriodStartDate, String validityPeriodEndDate,
|
|
|
Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
|
|
|
Integer pSize) {
|
|
|
Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
|
|
|
validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
|
|
|
releaseDateEndDate,null,null, null, null);
|
|
|
-
|
|
|
+ if (null!=industryCategoryA) {
|
|
|
+ params.put("industryCategoryA", industryCategoryA);
|
|
|
+ }
|
|
|
params.put("employerId", TokenManager.getUserId());
|
|
|
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
@@ -842,6 +850,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null!=d.getIndustryCategoryC()) {
|
|
|
d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
|
|
|
}
|
|
|
+ if (null!=d.getCityname()) {
|
|
|
+ d.setCityname(districtGlossoryMapper.selectNameById(Integer.valueOf(d.getCityname())));
|
|
|
+ }
|
|
|
+
|
|
|
int i=demandMapper.countInterest(d.getId());
|
|
|
d.setCountInterest(String.valueOf(i));
|
|
|
}
|