Antiloveg 8 년 전
부모
커밋
7c5995af41

+ 23 - 12
schema/permission.sql

@@ -429,18 +429,29 @@ values
 (UUID(), 'api/admin/contract/circulation', '合同管理--合同流转分发');
 
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/demand/userList', '科技需求管理--个人用户需求列表'),
+(UUID(), 'api/admin/demand/orgList', '科技需求管理--组织用户需求列表'),
+(UUID(), 'api/admin/demand/apply', '科技需求管理--新增需求'),
+(UUID(), 'api/admin/demand/userDemandDetail', '科技需求管理--个人需求详情'),
+(UUID(), 'api/admin/demand/orgDemandDetail', '科技需求管理--组织用户需求详情'),
+(UUID(), 'api/admin/demand/userNames', '科技需求管理--获取个人用户下拉'),
+(UUID(), 'api/admin/demand/unitNames', '科技需求管理--获取组织用户下拉'),
+(UUID(), 'api/admin/demand/uploadPicture', '科技需求管理--图片上传'),
+(UUID(), 'api/admin/demand/uploadTextFile', '科技需求管理--文本文件上传'),
+(UUID(), 'api/admin/demand/update', '科技需求管理--修改需求'),
+(UUID(), 'api/admin/demand/download', '科技需求管理--下载文本文件'),
+(UUID(), 'api/admin/demand/delete', '科技需求管理--删除');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/demand/offShelf', '科技需求管理--需求撤消发布(下架)'),
+(UUID(), 'api/admin/achievement/offShelf', '科技成果管理--成果撤消发布(下架)');
 
-
-
-
-
-
-
-
-
-
-
-
-
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/audit/techBroders', '技术经纪人下拉'),
+(UUID(), 'api/admin/audit/demand', '科技需求管理--审核科技需求(审核员)'),
+(UUID(), 'api/admin/audit/demand', '科技成果管理--审核科技成果(审核员)');
 

+ 70 - 97
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -63,64 +63,14 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	public Pagination<ContractManageListBo> getManageList(String contractId, Integer serialNumber, Integer type,
 			Integer status, String startDateFormattedDate, String endDateFormattedDate, String province,
 			String unitName, String uid, Integer pNo, Integer pSize) {
-		Date cStart = null;
-		Date cEnd = null;
-
-		Map<String, Object> params = new HashMap<>();
-
+		Map<String, Object> params = disposeParams(contractId, serialNumber, type,
+				status, startDateFormattedDate, endDateFormattedDate, province,
+				unitName, uid);
+		
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-
-		if (null != serialNumber) {
-			params.put("serialNumber", serialNumber);
-		}
-
-		if (null != type) {
-			params.put("type", type);
-		}
-
-		if (null != status) {
-			params.put("status", status);
-		}
-
-		if (!StringUtils.isBlank(uid)) {
-			params.put("uid", uid);
-		}
-
-		if (!StringUtils.isBlank(contractId)) {
-			params.put("id", contractId);
-		}
-
-		if (!StringUtils.isBlank(startDateFormattedDate)) {
-			try {
-				cStart = DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD);
-			} catch (ParseException e) {
-			}
-		}
-
-		if (null != cStart) {
-			params.put("cStart", cStart);
-		}
-
-		if (!StringUtils.isBlank(endDateFormattedDate)) {
-			try {
-				cEnd = DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD);
-			} catch (ParseException e) {
-			}
-		}
-
-		if (null != cEnd) {
-			params.put("cEnd", cEnd);
-		}
-
-		if (!StringUtils.isBlank(province)) {
-			params.put("province", province);
-		}
-
-		if (!StringUtils.isBlank(unitName)) {
-			params.put("unitName", unitName);
-		}
+		
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -137,50 +87,11 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	@Override
 	public Pagination<ContractClientListBo> getClientList(String contractId, Integer serialNumber, Integer type,
 			Integer status, String startDateFormattedDate, String endDateFormattedDate, Integer pNo, Integer pSize) {
-		Date cStart = null;
-		Date cEnd = null;
 
-		Map<String, Object> params = new HashMap<>();
+		Map<String, Object> params = disposeParams(contractId, serialNumber, type,
+				status, startDateFormattedDate, endDateFormattedDate, null,
+				null, TokenManager.getUserId());
 
-		params.put("uid", TokenManager.getUserId());
-
-		if (null != serialNumber) {
-			params.put("serialNumber", serialNumber);
-		}
-
-		if (null != type) {
-			params.put("type", type);
-		}
-
-		if (null != status) {
-			params.put("status", status);
-		}
-
-		if (!StringUtils.isBlank(contractId)) {
-			params.put("id", contractId);
-		}
-
-		if (!StringUtils.isBlank(startDateFormattedDate)) {
-			try {
-				cStart = DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD);
-			} catch (ParseException e) {
-			}
-		}
-
-		if (null != cStart) {
-			params.put("cStart", cStart);
-		}
-
-		if (!StringUtils.isBlank(endDateFormattedDate)) {
-			try {
-				cEnd = DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD);
-			} catch (ParseException e) {
-			}
-		}
-
-		if (null != cEnd) {
-			params.put("cEnd", cEnd);
-		}
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -376,5 +287,67 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		c.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 		return c;
 	}
+	
+	private Map<String, Object> disposeParams(String contractId, Integer serialNumber, Integer type,
+			Integer status, String startDateFormattedDate, String endDateFormattedDate, String province,
+			String unitName, String uid){
+		Date cStart = null;
+		Date cEnd = null;
+
+		Map<String, Object> params = new HashMap<>();
+
+		
+
+		if (null != serialNumber) {
+			params.put("serialNumber", serialNumber);
+		}
+
+		if (null != type) {
+			params.put("type", type);
+		}
+
+		if (null != status) {
+			params.put("status", status);
+		}
+
+		if (!StringUtils.isBlank(uid)) {
+			params.put("uid", uid);
+		}
+
+		if (!StringUtils.isBlank(contractId)) {
+			params.put("id", contractId);
+		}
+
+		if (!StringUtils.isBlank(startDateFormattedDate)) {
+			try {
+				cStart = DateUtils.parseDate(startDateFormattedDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (null != cStart) {
+			params.put("cStart", cStart);
+		}
+
+		if (!StringUtils.isBlank(endDateFormattedDate)) {
+			try {
+				cEnd = DateUtils.parseDate(endDateFormattedDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (null != cEnd) {
+			params.put("cEnd", cEnd);
+		}
+
+		if (!StringUtils.isBlank(province)) {
+			params.put("province", province);
+		}
+
+		if (!StringUtils.isBlank(unitName)) {
+			params.put("unitName", unitName);
+		}
+		return params;
+	}
 
 }

+ 4 - 1
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.user.service.impl;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -267,6 +268,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	// 给所有审核员发送审核通知
 	private void createAuditorNotice(User u) {
 		List<String> ids = userRoleMapper.listAuditor();
+		List<Notice> list = new ArrayList<>();
 		if (ids.size() > 0 && null != ids) {
 			for (String s : ids) {
 				Notice n = new Notice();
@@ -284,8 +286,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				n.setContent(
 						NoticeStatus.ORGANIZATIONCERTIFY.getDesc() + " " + IdentityAuditStatus.COMMITTED.getDesc());
 				n.setNoticeType(NoticeStatus.ORGANIZATIONCERTIFY.getCode());
-				noticeMapper.insert(n);
+				list.add(n);
 			}
+			noticeMapper.insertBatch(list);
 		}
 	}
 

+ 4 - 1
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.user.service.impl;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;
@@ -158,6 +159,7 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 	// 给所有审核员发送审核通知
 	private void createAuditorNotice(User u) {
 		List<String> ids = userRoleMapper.listAuditor();
+		List<Notice> list = new ArrayList<>();
 		if (null != ids && ids.size() > 0) {
 			for (String s : ids) {
 				Notice n = new Notice();
@@ -174,8 +176,9 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 				n.setAid(s);
 				n.setContent(NoticeStatus.PERSONALCERTIFY.getDesc() + " " + IdentityAuditStatus.COMMITTED.getDesc());
 				n.setNoticeType(NoticeStatus.PERSONALCERTIFY.getCode());
-				noticeMapper.insert(n);
+				list.add(n);
 			}
+			noticeMapper.insertBatch(list);
 		}
 	}