|
@@ -162,16 +162,15 @@ public class AdminApiController extends CertifyApiController {
|
|
|
private AdminService adminService;
|
|
private AdminService adminService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private OrgTechCenterDetailService orgTechCenterDetailService;
|
|
private OrgTechCenterDetailService orgTechCenterDetailService;
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 管理员本人信息详情
|
|
* 管理员本人信息详情
|
|
|
|
|
+ *
|
|
|
* @param id
|
|
* @param id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
|
|
|
- public Result adminInfo(){
|
|
|
|
|
|
|
+ public Result adminInfo() {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (!checkAdminLogin(res)) {
|
|
if (!checkAdminLogin(res)) {
|
|
|
return res;
|
|
return res;
|
|
@@ -183,36 +182,37 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(adminService.selectByPrimaryKey(TokenManager.getAdminId()));
|
|
res.setData(adminService.selectByPrimaryKey(TokenManager.getAdminId()));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 管理员修改本人信息
|
|
* 管理员修改本人信息
|
|
|
|
|
+ *
|
|
|
* @param admin
|
|
* @param admin
|
|
|
* @param bindingResult
|
|
* @param bindingResult
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
|
|
|
- public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult){
|
|
|
|
|
|
|
+ public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (!checkAdminLogin(res)) {
|
|
if (!checkAdminLogin(res)) {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (bindingResult.hasErrors()) {
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
AdminFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- if (StringUtils.isBlank(admin.getId())){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (StringUtils.isBlank(admin.getId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (StringUtils.isBlank(admin.getMobile())) {
|
|
if (StringUtils.isBlank(admin.getMobile())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
|
|
|
return res;
|
|
return res;
|
|
@@ -222,26 +222,26 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Admin a = adminService.selectByMobile(admin.getMobile().trim());
|
|
Admin a = adminService.selectByMobile(admin.getMobile().trim());
|
|
|
if (!TokenManager.getAdminId().equals(a.getId())) {
|
|
if (!TokenManager.getAdminId().equals(a.getId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Admin ad = new Admin();
|
|
Admin ad = new Admin();
|
|
|
BeanUtils.copyProperties(admin, ad);
|
|
BeanUtils.copyProperties(admin, ad);
|
|
|
Admin aa = adminService.selectByPrimaryKey(TokenManager.getAdminId());
|
|
Admin aa = adminService.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
ad.setMobile(ad.getMobile().trim());
|
|
ad.setMobile(ad.getMobile().trim());
|
|
|
ad.setCreateTime(aa.getCreateTime());
|
|
ad.setCreateTime(aa.getCreateTime());
|
|
|
-
|
|
|
|
|
- if (!StringUtils.isBlank(ad.getPassword())){
|
|
|
|
|
- if (StringUtils.isBlank(pwd)){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (!StringUtils.isBlank(ad.getPassword())) {
|
|
|
|
|
+ if (StringUtils.isBlank(pwd)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "原密码"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "原密码"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
if (!aa.getPassword().equals(passwordUtil.getEncryptPwd(pwd, aa.getCreateTime()))) {
|
|
if (!aa.getPassword().equals(passwordUtil.getEncryptPwd(pwd, aa.getCreateTime()))) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR,"","原密码"));
|
|
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.PWD_NOT_MATCH_ERROR, "", "原密码"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
@@ -251,8 +251,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(adminService.updateByPrimaryKey(ad));
|
|
res.setData(adminService.updateByPrimaryKey(ad));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 管理员列表
|
|
* 管理员列表
|
|
|
*
|
|
*
|
|
@@ -282,10 +281,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(adminService.listAdmin(province, number, mobile, name, pNo, pSize));
|
|
res.setData(adminService.listAdmin(province, number, mobile, name, pNo, pSize));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 新增管理员
|
|
* 新增管理员
|
|
@@ -317,7 +312,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
|
|
|
Admin a = adminService.selectByMobile(admin.getMobile().trim());
|
|
Admin a = adminService.selectByMobile(admin.getMobile().trim());
|
|
|
if (null != a) {
|
|
if (null != a) {
|
|
@@ -331,7 +325,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
BeanUtils.copyProperties(admin, ad);
|
|
BeanUtils.copyProperties(admin, ad);
|
|
|
ad.setId(UUID.randomUUID().toString());
|
|
ad.setId(UUID.randomUUID().toString());
|
|
|
ad.setCreateTime(now.getTime());
|
|
ad.setCreateTime(now.getTime());
|
|
|
- if (StringUtils.isBlank(ad.getPassword())){
|
|
|
|
|
|
|
+ if (StringUtils.isBlank(ad.getPassword())) {
|
|
|
ad.setPassword("123456");
|
|
ad.setPassword("123456");
|
|
|
}
|
|
}
|
|
|
ad.setPassword(passwordUtil.getEncryptPwd(ad));
|
|
ad.setPassword(passwordUtil.getEncryptPwd(ad));
|
|
@@ -339,21 +333,22 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 管理员详情
|
|
* 管理员详情
|
|
|
|
|
+ *
|
|
|
* @param id
|
|
* @param id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/adminDetail", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/adminDetail", method = RequestMethod.GET)
|
|
|
- public Result adminDetail(String id){
|
|
|
|
|
|
|
+ public Result adminDetail(String id) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
-
|
|
|
|
|
- if (StringUtils.isBlank(id)){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
AdminDetail ad = adminService.selectAdminDetail(id);
|
|
AdminDetail ad = adminService.selectAdminDetail(id);
|
|
|
res.setData(ad);
|
|
res.setData(ad);
|
|
|
return res;
|
|
return res;
|
|
@@ -393,24 +388,26 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Admin aa = adminService.selectByMobile(admin.getMobile().trim());
|
|
Admin aa = adminService.selectByMobile(admin.getMobile().trim());
|
|
|
- if (!admin.getId().equals(aa.getId()) ){
|
|
|
|
|
|
|
+ if (!admin.getId().equals(aa.getId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Admin a = adminService.selectByPrimaryKey(admin.getId());
|
|
Admin a = adminService.selectByPrimaryKey(admin.getId());
|
|
|
-
|
|
|
|
|
- if (null == a){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (null == a) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
Admin ad = new Admin();
|
|
Admin ad = new Admin();
|
|
|
BeanUtils.copyProperties(admin, ad);
|
|
BeanUtils.copyProperties(admin, ad);
|
|
|
List<String> roles = new ArrayList<String>();
|
|
List<String> roles = new ArrayList<String>();
|
|
|
- for (String role : roleIds){
|
|
|
|
|
- roles.add(role);
|
|
|
|
|
|
|
+ if (roleIds != null && roleIds.length > 0) {
|
|
|
|
|
+ for (String role : roleIds) {
|
|
|
|
|
+ roles.add(role);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
res.setData(adminService.updateByPrimaryKeySelective(ad, roles));
|
|
res.setData(adminService.updateByPrimaryKeySelective(ad, roles));
|
|
|
return res;
|
|
return res;
|
|
@@ -418,6 +415,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 重置管理员密码
|
|
* 重置管理员密码
|
|
|
|
|
+ *
|
|
|
* @param id
|
|
* @param id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -431,10 +429,9 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Admin admin = adminService.selectByPrimaryKey(id);
|
|
Admin admin = adminService.selectByPrimaryKey(id);
|
|
|
- if (null == admin){
|
|
|
|
|
|
|
+ if (null == admin) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户id"));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
@@ -446,7 +443,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(adminService.updateByPrimaryKey(a));
|
|
res.setData(adminService.updateByPrimaryKey(a));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 新增用户
|
|
* 新增用户
|
|
|
*
|
|
*
|
|
@@ -493,7 +490,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 个人用户列表
|
|
* 个人用户列表
|
|
|
*
|
|
*
|
|
@@ -780,7 +776,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 企业花名册上传
|
|
* 企业花名册上传
|
|
|
*
|
|
*
|
|
@@ -967,7 +963,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(orgStandard);
|
|
res.setData(orgStandard);
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除标准制定情况记录
|
|
* 删除标准制定情况记录
|
|
|
*
|
|
*
|
|
@@ -988,8 +984,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 知识产权列表
|
|
* 知识产权列表
|
|
|
*
|
|
*
|
|
@@ -1022,7 +1017,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid));
|
|
res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, uid));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 知识产权信息新增及修改
|
|
* 知识产权信息新增及修改
|
|
|
*
|
|
*
|
|
@@ -1071,7 +1066,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 知识产权证书上传
|
|
* 知识产权证书上传
|
|
|
*
|
|
*
|
|
@@ -1136,7 +1131,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 删除知识产权记录
|
|
* 删除知识产权记录
|
|
|
*
|
|
*
|
|
@@ -1157,8 +1151,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 上年度高新技术产品(服务)情况列表
|
|
* 上年度高新技术产品(服务)情况列表
|
|
|
*
|
|
*
|
|
@@ -1191,7 +1183,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(orgTechProductService.listTechProduct(pNo, pSize, uid));
|
|
res.setData(orgTechProductService.listTechProduct(pNo, pSize, uid));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 上年度高新技术产品(服务)情况(新增+修改)
|
|
* 上年度高新技术产品(服务)情况(新增+修改)
|
|
|
*
|
|
*
|
|
@@ -1237,7 +1229,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(orgTechProduct);
|
|
res.setData(orgTechProduct);
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 高新技术产品台帐上传
|
|
* 高新技术产品台帐上传
|
|
|
*
|
|
*
|
|
@@ -1301,7 +1293,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除上年度高新技术产品(服务)情况记录
|
|
* 删除上年度高新技术产品(服务)情况记录
|
|
|
*
|
|
*
|
|
@@ -1416,7 +1408,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(orgActivity);
|
|
res.setData(orgActivity);
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 研发活动立项证明材料上传
|
|
* 研发活动立项证明材料上传
|
|
|
*
|
|
*
|
|
@@ -1480,7 +1472,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除企业研究开发活动情况
|
|
* 删除企业研究开发活动情况
|
|
|
*
|
|
*
|
|
@@ -1592,7 +1584,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 研发活动费用台帐上传
|
|
* 研发活动费用台帐上传
|
|
|
*
|
|
*
|
|
@@ -1656,7 +1648,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除企业年度研究开发费用结构明细记录
|
|
* 删除企业年度研究开发费用结构明细记录
|
|
|
*
|
|
*
|
|
@@ -1676,7 +1668,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 获取当前用户已录入项目标号列表
|
|
* 获取当前用户已录入项目标号列表
|
|
|
*
|
|
*
|
|
@@ -1779,7 +1771,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 企业纳税申报表上传
|
|
* 企业纳税申报表上传
|
|
|
*
|
|
*
|
|
@@ -1849,7 +1841,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 刪除企业纳税申报信息
|
|
* 刪除企业纳税申报信息
|
|
|
*
|
|
*
|
|
@@ -1952,7 +1944,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 企业财务报表上传
|
|
* 企业财务报表上传
|
|
|
*
|
|
*
|
|
@@ -2022,7 +2014,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除财务报表
|
|
* 删除财务报表
|
|
|
*
|
|
*
|
|
@@ -2043,7 +2035,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 科技成果转化情况列表
|
|
* 科技成果转化情况列表
|
|
|
*
|
|
*
|
|
@@ -2118,7 +2109,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 科技成果附件上传
|
|
* 科技成果附件上传
|
|
|
*
|
|
*
|
|
@@ -2182,7 +2173,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除科技成果转化情况
|
|
* 删除科技成果转化情况
|
|
|
*
|
|
*
|
|
@@ -2282,7 +2273,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 荣誉及其他证明材料上传
|
|
* 荣誉及其他证明材料上传
|
|
|
*
|
|
*
|
|
@@ -2346,7 +2337,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除企业荣誉及其他证明材料
|
|
* 删除企业荣誉及其他证明材料
|
|
|
*
|
|
*
|
|
@@ -2436,7 +2427,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 研发部门制度上传
|
|
* 研发部门制度上传
|
|
|
*
|
|
*
|
|
@@ -2501,7 +2492,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 产学研情况列表
|
|
* 产学研情况列表
|
|
|
*
|
|
*
|
|
@@ -2564,14 +2554,16 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
|
|
if (!StringUtils.isBlank(termStartTimeFormattedDate)) {
|
|
|
try {
|
|
try {
|
|
|
- orgTechCenterDetail.setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
|
|
|
|
|
|
|
+ orgTechCenterDetail
|
|
|
|
|
+ .setTermStartTime(DateUtils.parseDate(termStartTimeFormattedDate, AFTConstants.YYYYMMDD));
|
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- if (!StringUtils.isBlank(termEndTimeFormattedDate)){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if (!StringUtils.isBlank(termEndTimeFormattedDate)) {
|
|
|
try {
|
|
try {
|
|
|
- orgTechCenterDetail.setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
|
|
|
|
|
|
|
+ orgTechCenterDetail
|
|
|
|
|
+ .setTermEndTime(DateUtils.parseDate(termEndTimeFormattedDate, AFTConstants.YYYYMMDD));
|
|
|
} catch (ParseException e) {
|
|
} catch (ParseException e) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -2588,7 +2580,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 产学研技术中心协议上传
|
|
* 产学研技术中心协议上传
|
|
|
*
|
|
*
|
|
@@ -2658,7 +2650,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 删除技术中心明细
|
|
* 删除技术中心明细
|
|
|
*
|
|
*
|
|
@@ -2679,7 +2671,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 获取公司联系人
|
|
* 获取公司联系人
|
|
|
*
|
|
*
|
|
@@ -2698,7 +2689,22 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(organizationIdentityService.selectContactsByUserId(uid));
|
|
res.setData(organizationIdentityService.selectContactsByUserId(uid));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 获取公司
|
|
|
|
|
+ */
|
|
|
|
|
+ @RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
|
|
|
|
|
+ public Result getUnitNames() {
|
|
|
|
|
+ Result res = new Result();
|
|
|
|
|
+ List<OrganizationIdentity> list = organizationIdentityService.selectAllOrgIndentity();
|
|
|
|
|
+ Map<String, String> map = new TreeMap<String, String>();
|
|
|
|
|
+ for (OrganizationIdentity o : list) {
|
|
|
|
|
+ map.put(o.getUid(), o.getUnitName());
|
|
|
|
|
+ }
|
|
|
|
|
+ res.setData(map);
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 高企认定列表
|
|
* 高企认定列表
|
|
|
*
|
|
*
|
|
@@ -2772,7 +2778,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 高企认定详情入口
|
|
* 高企认定详情入口
|
|
|
*
|
|
*
|
|
@@ -2808,24 +2814,20 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 高企认定流转状态下拉
|
|
* 高企认定流转状态下拉
|
|
|
|
|
+ *
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/cognizanceStatus", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/cognizanceStatus", method = RequestMethod.GET)
|
|
|
- public Result cognizanceStatus(){
|
|
|
|
|
|
|
+ public Result cognizanceStatus() {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (!checkAdminLogin(res)) {
|
|
if (!checkAdminLogin(res)) {
|
|
|
return res;
|
|
return res;
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
res.setData(disposeCognizanceStatus());
|
|
res.setData(disposeCognizanceStatus());
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 高企认定流转状态
|
|
* 高企认定流转状态
|
|
@@ -2848,8 +2850,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 保存高企认定详情
|
|
* 保存高企认定详情
|
|
|
*
|
|
*
|
|
@@ -2893,7 +2893,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 刪除高企认定
|
|
* 刪除高企认定
|
|
|
*
|
|
*
|
|
@@ -2990,7 +2990,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 企业年报详情
|
|
* 企业年报详情
|
|
|
*
|
|
*
|
|
@@ -3017,7 +3017,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(handleAnnualReport(uid, year));
|
|
res.setData(handleAnnualReport(uid, year));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 高企年报新增+修改
|
|
* 高企年报新增+修改
|
|
|
*
|
|
*
|
|
@@ -3068,8 +3068,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 删除企业年报记录
|
|
* 删除企业年报记录
|
|
|
*
|
|
*
|
|
@@ -3091,8 +3089,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 高企培育列表
|
|
* 高企培育列表
|
|
|
*
|
|
*
|
|
@@ -3114,7 +3110,6 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.setData(orgCognizanceService.listCultivation(uid, province, unitName, pNo, pSize));
|
|
res.setData(orgCognizanceService.listCultivation(uid, province, unitName, pNo, pSize));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 高企相关材料上传
|
|
* 高企相关材料上传
|
|
@@ -3174,55 +3169,57 @@ public class AdminApiController extends CertifyApiController {
|
|
|
private AnnualReportBo handleAnnualReport(String uid, Integer year) {
|
|
private AnnualReportBo handleAnnualReport(String uid, Integer year) {
|
|
|
return orgAnnualReportService.selectAnnualReportBo(uid, year);
|
|
return orgAnnualReportService.selectAnnualReportBo(uid, year);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
private Map<String, String> disposeCognizanceStatus() {
|
|
private Map<String, String> disposeCognizanceStatus() {
|
|
|
- Map<String, String> status = new TreeMap<String, String>();
|
|
|
|
|
|
|
+ Map<String, String> status = new TreeMap<String, String>();
|
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
- for (OrgCognizanceStatus p : OrgCognizanceStatus.values()){
|
|
|
|
|
|
|
+ for (OrgCognizanceStatus p : OrgCognizanceStatus.values()) {
|
|
|
status.put(p.getCode().toString(), p.getDesc());
|
|
status.put(p.getCode().toString(), p.getDesc());
|
|
|
status.remove(OrgCognizanceStatus.OTHER.getCode().toString());
|
|
status.remove(OrgCognizanceStatus.OTHER.getCode().toString());
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CREATE.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CREATE.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.CREATE.getCode().toString(), OrgCognizanceStatus.CREATE.getDesc());
|
|
status.put(OrgCognizanceStatus.CREATE.getCode().toString(), OrgCognizanceStatus.CREATE.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SIGN.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SIGN.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.SIGN.getCode().toString(), OrgCognizanceStatus.SIGN.getDesc());
|
|
status.put(OrgCognizanceStatus.SIGN.getCode().toString(), OrgCognizanceStatus.SIGN.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.DELIVERD.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.DELIVERD.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.DELIVERD.getCode().toString(), OrgCognizanceStatus.DELIVERD.getDesc());
|
|
status.put(OrgCognizanceStatus.DELIVERD.getCode().toString(), OrgCognizanceStatus.DELIVERD.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CIRCULATION.getCode())){
|
|
|
|
|
- status.put(OrgCognizanceStatus.CIRCULATION.getCode().toString(), OrgCognizanceStatus.CIRCULATION.getDesc());
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CIRCULATION.getCode())) {
|
|
|
|
|
+ status.put(OrgCognizanceStatus.CIRCULATION.getCode().toString(),
|
|
|
|
|
+ OrgCognizanceStatus.CIRCULATION.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.PREPARE.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.PREPARE.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.PREPARE.getCode().toString(), OrgCognizanceStatus.PREPARE.getDesc());
|
|
status.put(OrgCognizanceStatus.PREPARE.getCode().toString(), OrgCognizanceStatus.PREPARE.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SUBMIT.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SUBMIT.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.SUBMIT.getCode().toString(), OrgCognizanceStatus.SUBMIT.getDesc());
|
|
status.put(OrgCognizanceStatus.SUBMIT.getCode().toString(), OrgCognizanceStatus.SUBMIT.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ACCEPT.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ACCEPT.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.ACCEPT.getCode().toString(), OrgCognizanceStatus.ACCEPT.getDesc());
|
|
status.put(OrgCognizanceStatus.ACCEPT.getCode().toString(), OrgCognizanceStatus.ACCEPT.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.APPRVOVED.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.APPRVOVED.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.APPRVOVED.getCode().toString(), OrgCognizanceStatus.APPRVOVED.getDesc());
|
|
status.put(OrgCognizanceStatus.APPRVOVED.getCode().toString(), OrgCognizanceStatus.APPRVOVED.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.REJECT.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.REJECT.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.REJECT.getCode().toString(), OrgCognizanceStatus.REJECT.getDesc());
|
|
status.put(OrgCognizanceStatus.REJECT.getCode().toString(), OrgCognizanceStatus.REJECT.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ISSUING.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.ISSUING.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.ISSUING.getCode().toString(), OrgCognizanceStatus.ISSUING.getDesc());
|
|
status.put(OrgCognizanceStatus.ISSUING.getCode().toString(), OrgCognizanceStatus.ISSUING.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.EXPIRED.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.EXPIRED.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.EXPIRED.getCode().toString(), OrgCognizanceStatus.EXPIRED.getDesc());
|
|
status.put(OrgCognizanceStatus.EXPIRED.getCode().toString(), OrgCognizanceStatus.EXPIRED.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.FOSTER.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.FOSTER.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.FOSTER.getCode().toString(), OrgCognizanceStatus.FOSTER.getDesc());
|
|
status.put(OrgCognizanceStatus.FOSTER.getCode().toString(), OrgCognizanceStatus.FOSTER.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SETTLEMENT.getCode())){
|
|
|
|
|
- status.put(OrgCognizanceStatus.SETTLEMENT.getCode().toString(), OrgCognizanceStatus.SETTLEMENT.getDesc());
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.SETTLEMENT.getCode())) {
|
|
|
|
|
+ status.put(OrgCognizanceStatus.SETTLEMENT.getCode().toString(),
|
|
|
|
|
+ OrgCognizanceStatus.SETTLEMENT.getDesc());
|
|
|
}
|
|
}
|
|
|
- if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CALLBACK.getCode())){
|
|
|
|
|
|
|
+ if (TokenManager.hasPermission("CognizanceStatus" + OrgCognizanceStatus.CALLBACK.getCode())) {
|
|
|
status.put(OrgCognizanceStatus.CALLBACK.getCode().toString(), OrgCognizanceStatus.CALLBACK.getDesc());
|
|
status.put(OrgCognizanceStatus.CALLBACK.getCode().toString(), OrgCognizanceStatus.CALLBACK.getDesc());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|