|
|
@@ -111,11 +111,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
@Autowired
|
|
|
private UserInterestMapper userInterestMapper;
|
|
|
@Autowired
|
|
|
- ProjectInterestMapper projectInterestMapper;
|
|
|
+ ProjectInterestMapper projectInterestMapper;
|
|
|
@Autowired
|
|
|
AsyncUtils asyncUtils;
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
DemandFollowDetailMapper demandFollowDetailMapper;
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@@ -142,10 +142,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
* if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) ||
|
|
|
* TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
* params.put("principal", TokenManager.getAdminId()); }
|
|
|
- *
|
|
|
+ *
|
|
|
* if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
* params.put("mid", TokenManager.getAdminId()); }
|
|
|
- *
|
|
|
+ *
|
|
|
* if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
|
|
|
* params.put("techBroker", TokenManager.getAdminId()); }
|
|
|
*/
|
|
|
@@ -177,23 +177,20 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, boutique, hot);
|
|
|
-
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
-
|
|
|
if (pSize == null || pSize < 0 || pSize > 10) {
|
|
|
pSize = 10;
|
|
|
}
|
|
|
-
|
|
|
/*if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
params.put("principal", TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
params.put("mid", TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
|
|
|
params.put("techBroker", TokenManager.getAdminId());
|
|
|
}*/
|
|
|
@@ -203,19 +200,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null!=recordPerson) {
|
|
|
params.put("recordPerson", recordPerson);
|
|
|
}
|
|
|
-
|
|
|
/*if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
params.put("adminId", TokenManager.getAdminId());
|
|
|
}*/
|
|
|
-
|
|
|
if (StringUtils.isNotBlank(employerName)) {
|
|
|
params.put("employerName", employerName);
|
|
|
}
|
|
|
-
|
|
|
if (StringUtils.isNotBlank(username)) {
|
|
|
params.put("unitName", username);
|
|
|
}
|
|
|
-
|
|
|
return (Pagination<DemandManageListBo>) findPage("findManageOrgDemandListByPage", "findManageOrgDemandCount",
|
|
|
params, pNo, pSize);
|
|
|
}
|
|
|
@@ -305,7 +298,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@Override
|
|
|
public DemandManageDetailBo selectOrgDemandDetail(String id) {
|
|
|
-
|
|
|
+
|
|
|
return demandMapper.selectOrgDemandDetail(id);
|
|
|
}
|
|
|
|
|
|
@@ -324,7 +317,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
releaseDateEndDate, createDateStartDate, createDateEndDate, null, null);
|
|
|
|
|
|
params.put("employerId", TokenManager.getUserId());
|
|
|
-
|
|
|
+
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
}
|
|
|
@@ -807,7 +800,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
@Override
|
|
|
public DemandListBo selectDemandDetail(String id ) {
|
|
|
DemandListBo d=demandMapper.selectAppByPrimaryKey(id);
|
|
|
-
|
|
|
+
|
|
|
if (null!=d.getIndustryCategoryA()) {
|
|
|
d.setIndustryCategory1(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryA()).getName());
|
|
|
}
|
|
|
@@ -868,7 +861,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
if (pSize == null || pSize < 0) {
|
|
|
pSize = 10;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
Pagination<DemandSearchListBo> p=(Pagination<DemandSearchListBo>) findPage("findAppDemandListByPage", "findAppDemandCount", params, pNo, pSize);
|
|
|
return p;
|
|
|
@@ -934,7 +927,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();
|
|
|
for (ObjectInterestListBo o : l) {
|
|
|
int i=projectInterestMapper.countInterest(o.getId());
|
|
|
- o.setCountInterest(String.valueOf(i));
|
|
|
+ o.setCountInterest(String.valueOf(i));
|
|
|
o.setType(type);
|
|
|
}
|
|
|
return p;
|
|
|
@@ -988,13 +981,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (StringUtils.isNotBlank(u.getId())) {
|
|
|
d.setEmployerId(u.getId());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isNotBlank(u.getMobile())) {
|
|
|
d.setEmployerContactsMobile(u.getMobile());
|
|
|
}
|
|
|
}
|
|
|
d.setValidityPeriod(validityPeriod);
|
|
|
-
|
|
|
+
|
|
|
d.setId(UUID.randomUUID().toString());
|
|
|
d.setTechBrokerId(TokenManager.getAdminId());
|
|
|
|
|
|
@@ -1056,8 +1049,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
return (Pagination<DemandManageListBo>) findPage("findMyDemandListByPage", "findMyDemandCount",
|
|
|
params, pNo, pSize);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<DemandManageListBo> selectManageDemandManageList(Integer dataCategory,String employerName, Integer auditStatus,
|
|
|
@@ -1078,7 +1071,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
}
|
|
|
if (null != dataCategory) {
|
|
|
params.put("dataCategory", dataCategory);
|
|
|
- }
|
|
|
+ }
|
|
|
if (null != recordPerson) {
|
|
|
params.put("recordPerson", recordPerson);
|
|
|
}
|
|
|
@@ -1105,6 +1098,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
public Demand DemandFollowDetails(String id) {
|
|
|
return demandMapper.selectDemandFollow(id);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-}
|
|
|
+
|
|
|
+
|
|
|
+}
|