Browse Source

如果是技术经纪人导入的成果需求数据,这些成果需求默认由该经纪人管理

albertshaw 8 years ago
parent
commit
e6c9962300

+ 38 - 35
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -86,14 +86,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Autowired
 	private OrganizationIdentityMapper		organizationIdentityMapper;
 
-	private static final Logger logger = LoggerFactory.getLogger(AchievementServiceImpl.class);
-	
+	private static final Logger				logger	= LoggerFactory.getLogger(AchievementServiceImpl.class);
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize
-			,Integer boutique,Integer hot) {
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
+			Integer boutique, Integer hot) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -104,7 +104,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
 				"findUserOwnerAchievementCount",
 				disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.PERSONAL.getCode(),boutique,hot),
+						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.PERSONAL.getCode(), boutique,
+						hot),
 				pNo, pSize);
 	}
 
@@ -113,7 +114,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
-			Integer boutique,Integer hot) {
+			Integer boutique, Integer hot) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -124,7 +125,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
 				"findOrgOwnerAchievementCount",
 				disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),boutique,hot),
+						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
+						boutique, hot),
 				pNo, pSize);
 	}
 
@@ -204,15 +206,16 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage",
-				"findAchievementCount", disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber,
-						name, keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null,null,null),
+		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
+				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
+						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null, null),
 				pNo, pSize);
 	}
 
 	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,Integer boutique,Integer hot) {
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,
+			Integer boutique, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
@@ -237,7 +240,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 
 		if (null != type && StringUtils.isNotBlank(username)) {
-			if (UserType.PERSONAL.getCode().equals(type) ) {
+			if (UserType.PERSONAL.getCode().equals(type)) {
 				params.put("username", username);
 			} else {
 				params.put("unitName", username);
@@ -283,10 +286,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != releaseStatus) {
 			params.put("releaseStatus", releaseStatus);
 		}
-		if (null != boutique){
+		if (null != boutique) {
 			params.put("boutique", boutique);
 		}
-		if(null != hot){
+		if (null != hot) {
 			params.put("hot", hot);
 		}
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
@@ -388,6 +391,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		List<AchievementKeyword> AchievementKeywordList = new ArrayList<>();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
+		String techBrokerId = TokenManager.hasRole(AFTConstants.TECHBROKER) ? TokenManager.getAdminId() : null;
 		for (AchievementImportBo bo : data) {
 			a = new Achievement();
 			BeanUtils.copyProperties(bo, a);
@@ -396,6 +400,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			a.setCreateTime(now.getTime());
 			a.setAuditStatus(AchievementAuditStatus.INAUDIT.getCode());
 			a.setReleaseStatus(AchievementReleaseStatus.UNRELEASE.getCode());
+			a.setTechBrokerId(techBrokerId);
 			List<String> keywordsList = bo.getKeywords();
 			if (null != keywordsList && keywordsList.size() > 0) {
 				for (String s : keywordsList) {
@@ -417,35 +422,35 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementSearchListBo> listAchievementSearchList(
-			String keyword,Integer dataCategory, Integer category,Integer fieldA, String transferMode,Integer pNo, Integer pSize,
-			Integer dateSort,String upperPrice,String lowerPrice) {
+	public Pagination<AchievementSearchListBo> listAchievementSearchList(String keyword, Integer dataCategory,
+			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
+			String upperPrice, String lowerPrice) {
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 		}
-		
+
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
 		}
-		
-		if(null!= category){
+
+		if (null != category) {
 			params.put("category", category);
 		}
 		if (null != fieldA) {
 			params.put("fieldA", fieldA);
 		}
-		
+
 		if (!StringUtils.isBlank(transferMode)) {
 			params.put("transferMode", transferMode);
 		}
-		if(dateSort != null){
+		if (dateSort != null) {
 			params.put("dateSort", dateSort);
 		}
-		if(upperPrice != null){
+		if (upperPrice != null) {
 			params.put("upperPrice", upperPrice);
 		}
-		if(lowerPrice != null){
+		if (lowerPrice != null) {
 			params.put("lowerPrice", lowerPrice);
 		}
 		if (pNo == null || pNo < 0) {
@@ -455,12 +460,13 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 20) {
 			pSize = 20;
 		}
-		Pagination<AchievementSearchListBo> result = (Pagination<AchievementSearchListBo>) findPage("findSearchAchievementListByPage","findSearchAchievementCount", params, pNo, pSize);
+		Pagination<AchievementSearchListBo> result = (Pagination<AchievementSearchListBo>) findPage(
+				"findSearchAchievementListByPage", "findSearchAchievementCount", params, pNo, pSize);
 		List<AchievementSearchListBo> AchievementSearchList = (List<AchievementSearchListBo>) result.getList();
 		for (int i = 0; i < AchievementSearchList.size(); i++) {
 			String introduction = AchievementSearchList.get(i).getIntroduction();
-			if(introduction != null)
-			introduction=introduction.length()>20?introduction.substring(0, 20)+"... ...":introduction;
+			if (introduction != null)
+				introduction = introduction.length() > 20 ? introduction.substring(0, 20) + "... ..." : introduction;
 
 		}
 		return result;
@@ -608,13 +614,12 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.updateByPrimaryKey(a);
 	}
 
-
 	@Override
 	@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
 	public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
 		return achievementMapper.selectInternationalAchievement();
 	}
-	
+
 	@CacheEvict(value = "internationalAchievementList", allEntries = true)
 	public void cleanInternationalAchievement() {
 		LoggerUtils.debug(logger, "清除国际化技术列表");
@@ -630,16 +635,16 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public Pagination<BoutiqueListBo> boutiqueSearchList(Integer dataCategory, Integer category, Integer fieldA,
 			Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
-		if(null != dataCategory){
+		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
 		}
-		if(null != category){
+		if (null != category) {
 			params.put("category", category);
 		}
-		if(null != fieldA){
+		if (null != fieldA) {
 			params.put("fieldA", fieldA);
 		}
-		return (Pagination<BoutiqueListBo>)findPage("findBoutiqueListByPage","findBoutiqueCount",params, pNo, pSize);
+		return (Pagination<BoutiqueListBo>) findPage("findBoutiqueListByPage", "findBoutiqueCount", params, pNo, pSize);
 	}
 
 	@Override
@@ -657,6 +662,4 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.findPartnerAchievementListByPage(uid);
 	}
 
-	
-	
 }

+ 22 - 20
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -83,17 +83,18 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	private UserIdentityMapper				userIdentityMapper;
 	@Autowired
 	private OrganizationIdentityMapper		organizationIdentityMapper;
+
 	@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,Integer boutique,Integer hot) {
+			Integer pSize, Integer boutique, Integer hot) {
 
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
-				releaseDateStartDate, releaseDateEndDate,boutique,hot);
+				releaseDateStartDate, releaseDateEndDate, boutique, hot);
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -118,7 +119,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
 		}
-		
+
 		if (StringUtils.isNotBlank(employerName)) {
 			params.put("employerName", employerName);
 		}
@@ -138,10 +139,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			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,Integer boutique,Integer hot) {
+			Integer pSize, Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
-				releaseDateStartDate, releaseDateEndDate,boutique,hot);
+				releaseDateStartDate, releaseDateEndDate, boutique, hot);
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -154,15 +155,15 @@ 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());
 		}*/
-		
+
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
 		}
@@ -276,11 +277,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	public Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize
-			) {
+			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);
+				releaseDateEndDate, null, null);
 
 		params.put("employerId", TokenManager.getUserId());
 
@@ -412,6 +412,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		List<DemandKeyword> demandKeywordList = new ArrayList<>();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
+		String techBrokerId = TokenManager.hasRole(AFTConstants.TECHBROKER) ? TokenManager.getAdminId() : null;
 		for (DemandImportBo bo : data) {
 			d = new Demand();
 			BeanUtils.copyProperties(bo, d);
@@ -422,6 +423,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			d.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
 			d.setStatus(DemandStatus.UNRESOLVED.getCode());
 			d.setInfoSources(DemandInfoSourceStatus.IMPORT.getCode());
+			d.setTechBrokerId(techBrokerId);
 			List<String> keywordsList = bo.getKeywords();
 			if (null != keywordsList && keywordsList.size() > 0) {
 				for (String s : keywordsList) {
@@ -444,7 +446,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
-			Integer pNo, Integer pSize,Integer dateSort) {
+			Integer pNo, Integer pSize, Integer dateSort) {
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
@@ -473,11 +475,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null != sign) {
 			params.put("sign", sign);
 		}
-		
-		if(null != dateSort){
+
+		if (null != dateSort) {
 			params.put("dateSort", dateSort);
 		}
-		
+
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -485,7 +487,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 12;
 		}
-		
+
 		return (Pagination<DemandSearchListBo>) findPage("findSearchDemandListByPage", "findSearchDemandCount", params,
 				pNo, pSize);
 	}
@@ -498,7 +500,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	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,
-			String releaseDateStartDate, String releaseDateEndDate,Integer boutique,Integer hot) {
+			String releaseDateStartDate, String releaseDateEndDate, Integer boutique, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 		Date vStart = null;
 		Date vEnd = null;
@@ -742,9 +744,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	public Pagination<BoutiqueListBo> boutiqueSearchList(Integer industryCategoryA, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
-		if(null != industryCategoryA) params.put("industryCategoryA", industryCategoryA);
-		return (Pagination<BoutiqueListBo>)findPage("findBoutiqueListByPage","findBoutiqueCount",
-				params,pNo,pSize);
+		if (null != industryCategoryA)
+			params.put("industryCategoryA", industryCategoryA);
+		return (Pagination<BoutiqueListBo>) findPage("findBoutiqueListByPage", "findBoutiqueCount", params, pNo, pSize);
 	}
 
 	@Override