|
|
@@ -85,10 +85,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
|
|
|
- Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
|
|
|
- String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
|
|
|
- Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
|
|
|
+ public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus,
|
|
|
+ Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
+ Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
|
|
|
+ Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
|
|
|
+ Integer pSize) {
|
|
|
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
@@ -102,23 +103,27 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
pSize = 10;
|
|
|
}
|
|
|
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
- params.put("principal", TokenManager.getAdminId());
|
|
|
- }
|
|
|
+ /*
|
|
|
+ * 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()); }
|
|
|
+ */
|
|
|
|
|
|
- if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
- params.put("mid", TokenManager.getAdminId());
|
|
|
- }
|
|
|
-
|
|
|
- if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
|
|
|
- params.put("techBroker", TokenManager.getAdminId());
|
|
|
+ if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
|
|
|
+ params.put("adminId", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
- if (StringUtils.isNotBlank(employerName)){
|
|
|
+ if (StringUtils.isNotBlank(employerName)) {
|
|
|
params.put("employerName", employerName);
|
|
|
}
|
|
|
-
|
|
|
- if (StringUtils.isNotBlank(username)){
|
|
|
+
|
|
|
+ if (StringUtils.isNotBlank(username)) {
|
|
|
params.put("username", username);
|
|
|
}
|
|
|
|
|
|
@@ -129,10 +134,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province,
|
|
|
- Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
|
|
|
- String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
|
|
|
- Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
|
|
|
+ public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus,
|
|
|
+ Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
+ Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
|
|
|
+ Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
|
|
|
+ Integer pSize) {
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
releaseDateStartDate, releaseDateEndDate);
|
|
|
@@ -145,7 +151,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
pSize = 10;
|
|
|
}
|
|
|
|
|
|
- if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
+ /*if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
params.put("principal", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
@@ -155,13 +161,17 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
|
|
|
params.put("techBroker", TokenManager.getAdminId());
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
- if (StringUtils.isNotBlank(employerName)){
|
|
|
+ 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)){
|
|
|
+
|
|
|
+ if (StringUtils.isNotBlank(username)) {
|
|
|
params.put("unitName", username);
|
|
|
}
|
|
|
|
|
|
@@ -314,12 +324,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
d.setReleaseDate(now.getTime());
|
|
|
d.setReleaseStatus(DemandReleaseStatus.RELEASED.getCode());
|
|
|
d.setTechBrokerId(techBroderId);
|
|
|
-
|
|
|
- if (StringUtils.isNotBlank(d.getKeyword())){
|
|
|
+
|
|
|
+ if (StringUtils.isNotBlank(d.getKeyword())) {
|
|
|
String[] keywords = d.getKeyword().trim().split(",|,");
|
|
|
disposeDemandKeyword(keywords, d, false);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
String employerId = d.getEmployerId();
|
|
|
if (StringUtils.isNotBlank(employerId)) {
|
|
|
if (UserType.PERSONAL.getCode().equals(d.getDataCategory())) {
|
|
|
@@ -553,9 +563,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
params.put("keyword", keyword);
|
|
|
}
|
|
|
|
|
|
- /*if (!StringUtils.isBlank(username)) {
|
|
|
- params.put("username", username);
|
|
|
- }*/
|
|
|
+ /*
|
|
|
+ * if (!StringUtils.isBlank(username)) { params.put("username",
|
|
|
+ * username); }
|
|
|
+ */
|
|
|
|
|
|
if (null != infoSources) {
|
|
|
params.put("infoSources", infoSources);
|
|
|
@@ -706,4 +717,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
return demandMapper.findByIndustryCategoryA(industryCategoryA, id);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public int updateByPrimaryKeySelective(Demand d) {
|
|
|
+ return demandMapper.updateByPrimaryKeySelective(d);
|
|
|
+ }
|
|
|
+
|
|
|
}
|