ソースを参照

Accept Merge Request #119 merge : (master -> test)

Merge Request: merge
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/119
Antiloveg 9 年 前
コミット
944449fff4

+ 11 - 1
schema/permission.sql

@@ -225,7 +225,7 @@ values
 (UUID(), 'api/admin/patent/update', '专利申请管理--专利详情修改'), 
 (UUID(), 'api/admin/patent/patentStatus', '专利申请管理--专利流转状态下拉'),
 (UUID(), 'api/admin/patent/lastYearTax', '专利申请管理--上年度纳税申报报表是否存在'),
-(UUID(), 'api/admin/patent/upload', '专利申请管理--专利相关材料上传'),
+(UUID(), 'api/admin/patent/upload', '专利申请管理--材料上传(专利稿件,授权通知书,专利证书)'),
 (UUID(), 'api/admin/patent/download', '专利申请管理--下载专利相关材料'),
 (UUID(), 'api/admin/patent/uploadTemplate', '专利申请管理--上传专利代理委托书模版'),
 (UUID(), 'api/admin/patent/downloadTemplateFile', '专利申请管理--下载专利代理委托书'), 
@@ -324,6 +324,16 @@ values
 (UUID(), 'api/admin/uploadStandard', '标准制定情况--上传标准制定附件'), 
 (UUID(), 'api/admin/downloadStandard', '标准制定情况--下载标准制定附件');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/patent/uploadProry', '专利申请管理--申请上传专利代理委托书');
+
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/activityDetail', '研发活动--研发活动详情');
+
+
+
 
 
 

+ 9 - 0
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -333,12 +333,18 @@ public class AdminCopyrightApiController extends CertifyApiController {
 			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.CREATE.getCode())) {
 				status.put(CopyrightStatus.CREATE.getCode().toString(), CopyrightStatus.CREATE.getDesc());
 			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.SIGN.getCode())) {
+				status.put(CopyrightStatus.SIGN.getCode().toString(), CopyrightStatus.SIGN.getDesc());
+			}
 			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.DELIVERD.getCode())) {
 				status.put(CopyrightStatus.DELIVERD.getCode().toString(), CopyrightStatus.DELIVERD.getDesc());
 			}
 			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.SUBMIT.getCode())) {
 				status.put(CopyrightStatus.SUBMIT.getCode().toString(), CopyrightStatus.SUBMIT.getDesc());
 			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.CIRCULATION.getCode())) {
+				status.put(CopyrightStatus.CIRCULATION.getCode().toString(), CopyrightStatus.CIRCULATION.getDesc());
+			}
 			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.ACCEPT.getCode())) {
 				status.put(CopyrightStatus.ACCEPT.getCode().toString(), CopyrightStatus.ACCEPT.getDesc());
 			}
@@ -351,6 +357,9 @@ public class AdminCopyrightApiController extends CertifyApiController {
 			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.AUTHORIZED.getCode())) {
 				status.put(CopyrightStatus.AUTHORIZED.getCode().toString(), CopyrightStatus.AUTHORIZED.getDesc());
 			}
+			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.SETTLEMENT.getCode())) {
+				status.put(CopyrightStatus.SETTLEMENT.getCode().toString(), CopyrightStatus.SETTLEMENT.getDesc());
+			}
 			if (TokenManager.hasPermission("CopyrightStatus" + CopyrightStatus.CALLBACK.getCode())) {
 				status.put(CopyrightStatus.CALLBACK.getCode().toString(), CopyrightStatus.CALLBACK.getDesc());
 			}

+ 18 - 0
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -148,6 +148,24 @@ public class CognizanceApiController extends CertifyApiController {
 	private PatentInfoService				patentInfoService;
 	@Resource
 	private CopyrightInfoService			copyrightInfoService;
+	
+	/**
+	 * 研发活动详情
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/activityDetail", method = RequestMethod.GET)
+	public Result activityDetail(String id){
+		Result res = new Result();
+		if (StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
+			return res;
+		}
+		Calendar a =Calendar.getInstance();
+		res.setData(orgActivityService.selectDetailByIdAndYear(id, a.get(Calendar.YEAR)-1));
+		return res;
+		
+	}
 
 	/**
 	 * 财务报表详情(获取同年度纳税申报表重复数据)