|
|
@@ -1,10 +1,13 @@
|
|
|
package com.goafanti.cognizance.controller;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Calendar;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
@@ -37,6 +40,7 @@ import com.goafanti.cognizance.bo.InputOrgTechAchievement;
|
|
|
import com.goafanti.cognizance.bo.InputOrgTechCenter;
|
|
|
import com.goafanti.cognizance.bo.InputOrgTechCenterDetail;
|
|
|
import com.goafanti.cognizance.bo.InputOrgTechProduct;
|
|
|
+import com.goafanti.cognizance.bo.OrgIntellectualPropertyDetailBo;
|
|
|
import com.goafanti.cognizance.service.OrgActivityCostService;
|
|
|
import com.goafanti.cognizance.service.OrgActivityService;
|
|
|
import com.goafanti.cognizance.service.OrgAnnualReportService;
|
|
|
@@ -57,6 +61,8 @@ import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
import com.goafanti.common.enums.AttachmentType;
|
|
|
import com.goafanti.common.enums.CognizanceApplyFields;
|
|
|
+import com.goafanti.common.enums.FinanceRatepayFields;
|
|
|
+import com.goafanti.common.enums.IntellectualPropertyType;
|
|
|
import com.goafanti.common.enums.OrgActivityFields;
|
|
|
import com.goafanti.common.enums.OrgAnnualReportFields;
|
|
|
import com.goafanti.common.enums.OrgCognizanceFields;
|
|
|
@@ -85,12 +91,16 @@ import com.goafanti.common.model.OrgTechAchievement;
|
|
|
import com.goafanti.common.model.OrgTechCenter;
|
|
|
import com.goafanti.common.model.OrgTechCenterDetail;
|
|
|
import com.goafanti.common.model.OrgTechProduct;
|
|
|
+import com.goafanti.common.model.PatentInfo;
|
|
|
import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.FileUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
+import com.goafanti.copyright.bo.CopyrightInfoDetail;
|
|
|
+import com.goafanti.copyright.service.CopyrightInfoService;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import com.goafanti.patent.service.PatentInfoService;
|
|
|
import com.goafanti.user.service.OrgHumanResourceService;
|
|
|
import com.goafanti.user.service.OrganizationIdentityService;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
@@ -132,16 +142,114 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
private OrgCognizanceLogService orgCognizanceLogService;
|
|
|
@Resource
|
|
|
private OrgHumanResourceService orgHumanResourceService;
|
|
|
+ @Resource
|
|
|
+ private PatentInfoService patentInfoService;
|
|
|
+ @Resource
|
|
|
+ private CopyrightInfoService copyrightInfoService;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 财务报表详情(获取同年度纳税申报表重复数据)
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/financeDetail", method = RequestMethod.GET)
|
|
|
+ public Result financeDetail(Integer year) {
|
|
|
+ Result res = new Result();
|
|
|
+
|
|
|
+ User curUser = TokenManager.getUserToken();
|
|
|
+ if (!checkCertify(res, curUser)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == year) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到年份", "年份"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ OrgRatepay ratepay = orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), year);
|
|
|
+ Map<String, BigDecimal> map = new HashMap<String, BigDecimal>();
|
|
|
+ map.put(FinanceRatepayFields.GROSSPROFIT.getCode(), ratepay.getGrossProfit());
|
|
|
+ map.put(FinanceRatepayFields.MANAGEMENTCOST.getCode(), ratepay.getManagementCost());
|
|
|
+ map.put(FinanceRatepayFields.OPERATINGPROFIT.getCode(), ratepay.getOperatingProfit());
|
|
|
+ map.put(FinanceRatepayFields.RESEARCHCOST.getCode(), ratepay.getResearchCost());
|
|
|
+ res.setData(map);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 企业纳税信息详情(获取同年度财务报表重复数据)
|
|
|
+ *
|
|
|
+ * @param uid
|
|
|
+ * @param year
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/ratepayDetail", method = RequestMethod.GET)
|
|
|
+ public Result ratepayDetail(Integer year) {
|
|
|
+ Result res = new Result();
|
|
|
+
|
|
|
+ User curUser = TokenManager.getUserToken();
|
|
|
+ if (!checkCertify(res, curUser)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == year) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到年份", "年份"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ OrgFinance of = orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), year);
|
|
|
+ Map<String, BigDecimal> map = new HashMap<String, BigDecimal>();
|
|
|
+ map.put(FinanceRatepayFields.GROSSPROFIT.getCode(), of.getGrossProfit());
|
|
|
+ map.put(FinanceRatepayFields.MANAGEMENTCOST.getCode(), of.getManagementCost());
|
|
|
+ map.put(FinanceRatepayFields.OPERATINGPROFIT.getCode(), of.getOperatingProfit());
|
|
|
+ map.put(FinanceRatepayFields.RESEARCHCOST.getCode(), of.getResearchCost());
|
|
|
+ res.setData(map);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
+ * 知识产权详情
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/intellectualDetail", method = RequestMethod.GET)
|
|
|
+ public Result intellectualDetail(String id, Integer type) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "知识产权ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == type) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "知识产权TYPE"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ OrgIntellectualProperty oip = orgIntellectualPropertyService.selectByPrimaryKey(id);
|
|
|
+ if (null == oip) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ if (IntellectualPropertyType.PATENT.getCode() == type) {
|
|
|
+ res.setData(orgIntellectualPropertyService.selectPatentTypeDetail(id));
|
|
|
+ } else if (IntellectualPropertyType.COPYRIGHT.getCode() == type) {
|
|
|
+ res.setData(orgIntellectualPropertyService.selectCopyrightTypeDetail(id));
|
|
|
+ } else if (IntellectualPropertyType.COMMON.getCode() == type) {
|
|
|
+ OrgIntellectualPropertyDetailBo oipdb = new OrgIntellectualPropertyDetailBo();
|
|
|
+ BeanUtils.copyProperties(oip, oipdb);
|
|
|
+ res.setData(oipdb);
|
|
|
+ } else {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权TYPE"));
|
|
|
+ }
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 知识产权稿件下载
|
|
|
+ *
|
|
|
* @param response
|
|
|
* @param sign
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/downloadManuscriptUrl", method = RequestMethod.GET)
|
|
|
- public Result downloadManuscriptUrl(HttpServletResponse response, String sign, String id) {
|
|
|
+ @RequestMapping(value = "/downloadManuscript", method = RequestMethod.GET)
|
|
|
+ public Result downloadManuscript(HttpServletResponse response, String sign, String id, Integer type) {
|
|
|
Result res = new Result();
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
@@ -152,22 +260,49 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ if (null == type) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "知识产权TYPE"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
OrgIntellectualProperty olp = orgIntellectualPropertyService.selectByPrimaryKey(id);
|
|
|
- if (olp == null || !curUser.getId().equals(olp.getUid())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权id"));
|
|
|
+ if (olp == null) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ String fileName = null;
|
|
|
+ String downloadUrl = null;
|
|
|
+ if (IntellectualPropertyType.PATENT.getCode() == type) {
|
|
|
+ PatentInfo pi = patentInfoService.selectByPrimaryKey(olp.getPid());
|
|
|
+ if (null == pi) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID及TYPE"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ fileName = pi.getPatentWritingDownloadFileName();
|
|
|
+ downloadUrl = pi.getPatentWritingUrl();
|
|
|
+ } else if (IntellectualPropertyType.COPYRIGHT.getCode() == type) {
|
|
|
+ CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(id);
|
|
|
+ if (null == ci) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID及TYPE"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ fileName = ci.getApplicationUrlDownloadFileName();
|
|
|
+ downloadUrl = ci.getApplicationUrl();
|
|
|
+ } else {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权TYPE"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
if (attachmentType == AttachmentType.MANUSCRIPT) {
|
|
|
- //downloadFile(response, olp.getManuscriptDownloadFileName(), olp.getManuscriptUrl());
|
|
|
+ downloadFile(response, fileName, downloadUrl);
|
|
|
} else {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除知识产权记录
|
|
|
*
|
|
|
@@ -184,7 +319,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除标准制定情况记录
|
|
|
*
|
|
|
@@ -202,7 +337,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除企业研究开发活动情况
|
|
|
*
|
|
|
@@ -220,7 +355,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除企业年度研究开发费用结构明细记录
|
|
|
*
|
|
|
@@ -237,7 +372,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除技术中心明细
|
|
|
*
|
|
|
@@ -254,7 +389,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除上年度高新技术产品(服务)情况记录
|
|
|
*
|
|
|
@@ -271,7 +406,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 刪除企业纳税申报信息
|
|
|
*
|
|
|
@@ -288,7 +423,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除财务报表
|
|
|
*
|
|
|
@@ -305,7 +440,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除科技成果转化情况
|
|
|
*
|
|
|
@@ -322,7 +457,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 删除企业荣誉及其他证明材料
|
|
|
*
|
|
|
@@ -349,7 +484,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/uploadRoster", method = RequestMethod.POST)
|
|
|
- public Result uploadRoster(HttpServletRequest req, String sign, String year) {
|
|
|
+ public Result uploadRoster(HttpServletRequest req, String sign, String year) {
|
|
|
Result res = new Result();
|
|
|
|
|
|
if (StringUtils.isBlank(year)) {
|
|
|
@@ -382,7 +517,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/uploadSocialSecurity", method = RequestMethod.POST)
|
|
|
- public Result uploadSocialSecurity(HttpServletRequest req, String sign, String year) {
|
|
|
+ public Result uploadSocialSecurity(HttpServletRequest req, String sign, String year) {
|
|
|
Result res = new Result();
|
|
|
|
|
|
if (StringUtils.isBlank(year)) {
|
|
|
@@ -417,7 +552,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadHumanResource", method = RequestMethod.GET)
|
|
|
public Result downloadHumanResource(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
@@ -506,7 +641,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 高新技术产品台帐上传
|
|
|
*
|
|
|
@@ -545,12 +680,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadTecProduct", method = RequestMethod.GET)
|
|
|
public Result downloadTecProduct(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高新技术产品id"));
|
|
|
return res;
|
|
|
@@ -570,7 +705,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 研发活动立项证明材料上传
|
|
|
*
|
|
|
@@ -613,14 +748,14 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
OrgActivity oa = orgActivityService.selectOrgActivityByPrimaryKey(id);
|
|
|
- if (oa == null || !curUser.getId().equals(oa.getUid())) {
|
|
|
+ if (oa == null || !curUser.getId().equals(oa.getUid())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -633,7 +768,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 研发活动费用台帐上传
|
|
|
*
|
|
|
@@ -672,12 +807,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadActivityCost", method = RequestMethod.GET)
|
|
|
public Result downloadActivityCost(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", " 研发活动费用id"));
|
|
|
return res;
|
|
|
@@ -697,7 +832,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 企业纳税申报表上传
|
|
|
*
|
|
|
@@ -742,12 +877,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
|
|
|
public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
|
|
|
return res;
|
|
|
@@ -767,7 +902,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 企业财务报表上传
|
|
|
*
|
|
|
@@ -779,7 +914,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/uploadFinance", method = RequestMethod.POST)
|
|
|
public Result uploadFinance(HttpServletRequest req, String sign, String year) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
@@ -812,12 +947,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadFinance", method = RequestMethod.GET)
|
|
|
public Result downloadFinance(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业财务报表id"));
|
|
|
return res;
|
|
|
@@ -837,7 +972,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 科技成果附件上传
|
|
|
*
|
|
|
@@ -875,12 +1010,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadAchievement", method = RequestMethod.GET)
|
|
|
public Result downloadAchievement(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果id"));
|
|
|
return res;
|
|
|
@@ -900,8 +1035,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 荣誉及其他证明材料上传
|
|
|
*
|
|
|
@@ -940,12 +1074,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadHonor", method = RequestMethod.GET)
|
|
|
public Result downloadHonor(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "荣誉及其他证明材料id"));
|
|
|
return res;
|
|
|
@@ -965,7 +1099,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 研发部门制度上传
|
|
|
*
|
|
|
@@ -1004,12 +1138,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadInstitution", method = RequestMethod.GET)
|
|
|
public Result downloadInstitution(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发部门id"));
|
|
|
return res;
|
|
|
@@ -1029,7 +1163,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 产学研技术中心协议上传
|
|
|
*
|
|
|
@@ -1042,7 +1176,6 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
public Result uploadProtocol(HttpServletRequest req, String sign) {
|
|
|
Result res = new Result();
|
|
|
|
|
|
-
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
@@ -1069,12 +1202,12 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/downloadProtocol", method = RequestMethod.GET)
|
|
|
public Result downloadProtocol(HttpServletResponse response, String sign, String id) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "产学研技术中心id"));
|
|
|
return res;
|
|
|
@@ -1086,8 +1219,8 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
OrgTechCenter otc = orgTechCenterService.selectByPrimaryKey(otcd.getCid());
|
|
|
-
|
|
|
- if (otc == null || !curUser.getId().equals(otc.getUid())){
|
|
|
+
|
|
|
+ if (otc == null || !curUser.getId().equals(otc.getUid())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "产学研技术中心id"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1101,8 +1234,6 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* 企业研究开发活动情况表入口
|
|
|
@@ -1313,8 +1444,8 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
OrgStandardFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (null == orgStandard.getYear()){
|
|
|
+
|
|
|
+ if (null == orgStandard.getYear()) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "年份"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1345,9 +1476,10 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
res.setData(orgStandard);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 上传标准制定附件
|
|
|
+ *
|
|
|
* @param req
|
|
|
* @param sign
|
|
|
* @param uid
|
|
|
@@ -1356,7 +1488,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/uploadStandard", method = RequestMethod.POST)
|
|
|
public Result uploadStandard(HttpServletRequest req, String sign) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
User curUser = TokenManager.getUserToken();
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
@@ -1371,9 +1503,10 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 下载标准制定
|
|
|
+ *
|
|
|
* @param response
|
|
|
* @param sign
|
|
|
* @param id
|
|
|
@@ -1386,7 +1519,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isEmpty(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "标准制定id"));
|
|
|
return res;
|
|
|
@@ -1397,7 +1530,6 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "标准指定id"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
if (attachmentType == AttachmentType.STANDARD) {
|
|
|
@@ -1844,8 +1976,6 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
OrgHonorDatumFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
if (!checkUserLogin(res)) {
|
|
|
return res;
|
|
|
@@ -1862,8 +1992,8 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
} catch (ParseException e) {
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- if (null == honor.getYear()){
|
|
|
+
|
|
|
+ if (null == honor.getYear()) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "年份"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1930,7 +2060,8 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
|
|
|
if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
|
|
|
try {
|
|
|
- orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ orgTechCenter
|
|
|
+ .setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
} catch (ParseException e) {
|
|
|
}
|
|
|
}
|
|
|
@@ -2214,28 +2345,28 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(cog.getId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
OrgCognizance o = orgCognizanceService.selectByPrimaryKey(cog.getId());
|
|
|
-
|
|
|
- if (null == o){
|
|
|
+
|
|
|
+ if (null == o) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (OrgCognizanceStatus.CALLBACK.getCode() == o.getState()){
|
|
|
+
|
|
|
+ if (OrgCognizanceStatus.CALLBACK.getCode() == o.getState()) {
|
|
|
res.getError().add(buildError(ErrorConstants.RECORD_CALLBACK, "当前记录已退单,无法修改!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (OrgCognizanceStatus.SETTLEMENT.getCode() == o.getState()){
|
|
|
+
|
|
|
+ if (OrgCognizanceStatus.SETTLEMENT.getCode() == o.getState()) {
|
|
|
res.getError().add(buildError(ErrorConstants.RECORD_SETTLEMENT, "当前记录已结款,无法修改!"));
|
|
|
return res;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
OrgCognizance oc = new OrgCognizance();
|
|
|
BeanUtils.copyProperties(cog, oc);
|