|
|
@@ -189,14 +189,14 @@ public class AdminApiController extends CertifyApiController {
|
|
|
private CopyrightInfoService copyrightInfoService;
|
|
|
@Resource
|
|
|
private OrgCognizanceProportionService orgCognizanceProportionService;
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 统计专利、软著及科技项目申报业务情况
|
|
|
*/
|
|
|
- @RequestMapping(value = "/getBusinessCount", method = RequestMethod.GET )
|
|
|
- public Result countBusiness(String uid){
|
|
|
+ @RequestMapping(value = "/getBusinessCount", method = RequestMethod.GET)
|
|
|
+ public Result countBusiness(String uid) {
|
|
|
Result res = new Result();
|
|
|
- if (StringUtils.isBlank(uid)){
|
|
|
+ if (StringUtils.isBlank(uid)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户ID"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1171,7 +1171,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/intellectualList", method = RequestMethod.POST)
|
|
|
- public Result intellectualList(String pageNo, String pageSize, String uid) {
|
|
|
+ public Result intellectualList(String pageNo, String pageSize, String uid, String startDate, String endDate) {
|
|
|
Result res = new Result();
|
|
|
|
|
|
if (StringUtils.isBlank(uid)) {
|
|
|
@@ -1189,7 +1189,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid));
|
|
|
+ res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid, startDate, endDate));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -2769,15 +2769,14 @@ public class AdminApiController extends CertifyApiController {
|
|
|
public Result disposeCenterDetail(@Valid InputOrgTechCenterDetail orgTechCenterDetail, BindingResult bindingResult,
|
|
|
String projectTimeFormattedDate, String termStartTimeFormattedDate, String termEndTimeFormattedDate) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
OrgTechCenterDetailFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (StringUtils.isBlank(orgTechCenterDetail.getCid())){
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(orgTechCenterDetail.getCid())) {
|
|
|
res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "研发部门相关信息未保存,无法保存!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -2981,7 +2980,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
List<Admin> list = adminService.selectCognizancePrincipal();
|
|
|
Map<String, String> map = new TreeMap<String, String>();
|
|
|
for (Admin o : list) {
|
|
|
- map.put(o.getId(), o.getName()+ " " + o.getPosition());
|
|
|
+ map.put(o.getId(), o.getName() + " " + o.getPosition());
|
|
|
}
|
|
|
res.setData(map);
|
|
|
return res;
|
|
|
@@ -3080,16 +3079,16 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
OrgCognizance oc = orgCognizanceService.selectByPrimaryKey(cid);
|
|
|
- if (null == oc){
|
|
|
+ if (null == oc) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (year - oc.getYear() != 0){
|
|
|
+
|
|
|
+ if (year - oc.getYear() != 0) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID及年份"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
res.setData(handleCognizanceDetail(uid, cid, year));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -3144,8 +3143,8 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "高企认定"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (null == cog.getYear()){
|
|
|
+
|
|
|
+ if (null == cog.getYear()) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到", "年份"));
|
|
|
return res;
|
|
|
}
|