|
|
@@ -840,10 +840,6 @@ public class AdminApiController extends BaseApiController {
|
|
|
public Result applyCognizance(String contacts, String comment, String consultant, String uid, Integer year,
|
|
|
Integer state) {
|
|
|
Result res = new Result();
|
|
|
- if (null == year) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "申请认定年份不能为空!"));
|
|
|
- }
|
|
|
-
|
|
|
if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, uid)) {
|
|
|
res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
|
|
|
}
|
|
|
@@ -856,14 +852,16 @@ public class AdminApiController extends BaseApiController {
|
|
|
c.setConsultant(consultant);
|
|
|
c.setYear(year);
|
|
|
c.setDeletedSign(0);
|
|
|
+ c.setState(state);
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
+ now.set(Calendar.MILLISECOND, 0);
|
|
|
+ c.setCreateTime(now.getTime());
|
|
|
orgCognizanceService.insert(c);
|
|
|
|
|
|
OrgCognizanceLog log = new OrgCognizanceLog();
|
|
|
log.setId(UUID.randomUUID().toString());
|
|
|
log.setCid(c.getId());
|
|
|
- Calendar now = Calendar.getInstance();
|
|
|
- now.set(Calendar.MILLISECOND, 0);
|
|
|
- log.setRecordTime(now.getTime());
|
|
|
+ log.setRecordTime(c.getCreateTime());
|
|
|
log.setState(state);
|
|
|
log.setComment(comment);
|
|
|
log.setPrincipal(userService.selectByPrimaryKey(uid).getAid());
|
|
|
@@ -1038,10 +1036,6 @@ public class AdminApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
|
|
|
public Result annualReportDetail(String uid, Integer year) {
|
|
|
Result res = new Result();
|
|
|
- if (null == year) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "当前年份年报数据异常!"));
|
|
|
- return res;
|
|
|
- }
|
|
|
res.setData(handleAnnualReport(uid, year));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1087,30 +1081,35 @@ public class AdminApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/uploadTemplate", method = RequestMethod.POST)
|
|
|
public Result uploadPatentTemplate(HttpServletRequest req, String sign) {
|
|
|
Result res = new Result();
|
|
|
+ System.out.println("init");
|
|
|
String fileName = "";
|
|
|
List<MultipartFile> files = getFiles(req);
|
|
|
MultipartFile mf = files.get(0);
|
|
|
String suffix = mf.getOriginalFilename().substring(mf.getOriginalFilename().lastIndexOf("."));
|
|
|
- if (suffix.equals("doc") || suffix.equals("doxc")) {
|
|
|
+ System.err.println("suffix" + " " + suffix);
|
|
|
+ if (suffix.equals(".doc") || suffix.equals(".docx")) {
|
|
|
if ("patent_prory_statement".equals(sign)) {
|
|
|
fileName = "patent_prory_statement" + suffix;
|
|
|
} else {
|
|
|
fileName = System.nanoTime() + "";
|
|
|
}
|
|
|
- res.setData(handleFile(res, req, fileName, files, mf));
|
|
|
- if (res.getData() != "") {
|
|
|
+ String name = handleFile(res, req, fileName, files, mf);
|
|
|
+ res.setData(name);
|
|
|
+ System.out.println(name);
|
|
|
+ if (res.getData() != "" && res.getData() != null && null == aftFileService.selectAftFileBySign(sign)) {
|
|
|
AftFile f = new AftFile();
|
|
|
f.setId(UUID.randomUUID().toString());
|
|
|
- if ("patent_prory_statement".equals(sign)) {
|
|
|
- f.setFileName("专利代理委托书模版");
|
|
|
- f.setSign(sign);
|
|
|
- }
|
|
|
- f.setFilePath("/admin/" + fileName);
|
|
|
- f.setDeleletedSign(0);
|
|
|
- aftFileService.insert(f);
|
|
|
+ if ("patent_prory_statement".equals(sign)) {
|
|
|
+ f.setFileName("专利代理委托书模版");
|
|
|
+ f.setSign(sign);
|
|
|
+ }
|
|
|
+ f.setFilePath("/admin/" + fileName);
|
|
|
+ f.setDeleletedSign(0);
|
|
|
+ aftFileService.insert(f);
|
|
|
+
|
|
|
}
|
|
|
} else {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_PATTERN_ERROR, "文件格式错误,请重新上传!"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "文件格式错误,请重新上传!"));
|
|
|
}
|
|
|
return res;
|
|
|
}
|