Antiloveg 9 years ago
parent
commit
efa2ed0896
41 changed files with 1166 additions and 817 deletions
  1. 6 0
      schema/2017-03-30.sql
  2. 5 0
      src/main/java/com/goafanti/admin/bo/InputAdmin.java
  3. 766 25
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  4. 52 11
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  5. 1 1
      src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java
  6. 19 0
      src/main/java/com/goafanti/admin/service/AdminService.java
  7. 76 0
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  8. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgActivityCostService.java
  9. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgFinanceService.java
  10. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgHonorDatumService.java
  11. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java
  12. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgRatepayService.java
  13. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgTechAchievementService.java
  14. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgTechCenterDetailService.java
  15. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgTechCenterService.java
  16. 2 0
      src/main/java/com/goafanti/cognizance/service/OrgTechProductService.java
  17. 6 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java
  18. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgFinanceServiceImpl.java
  19. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgHonorDatumServiceImpl.java
  20. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java
  21. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgRatepayServiceImpl.java
  22. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechAchievementServiceImpl.java
  23. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java
  24. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterServiceImpl.java
  25. 5 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechProductServiceImpl.java
  26. 1 1
      src/main/java/com/goafanti/common/controller/WebpageController.java
  27. 5 1
      src/main/java/com/goafanti/common/enums/AttachmentType.java
  28. 55 4
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml
  29. 12 0
      src/main/java/com/goafanti/common/mapper/PermissionMapper.xml
  30. 15 0
      src/main/java/com/goafanti/common/model/Admin.java
  31. 1 1
      src/main/java/com/goafanti/core/shiro/token/UserRealm.java
  32. 0 6
      src/main/java/com/goafanti/patent/bo/InputPatentRegistration.java
  33. 44 5
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  34. 19 696
      src/main/java/com/goafanti/patent/controller/PatentApiController.java
  35. 0 15
      src/main/java/com/goafanti/patent/service/AdminService.java
  36. 0 32
      src/main/java/com/goafanti/patent/service/impl/AdminServiceImpl.java
  37. 16 14
      src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java
  38. 1 3
      src/main/java/com/goafanti/permission/controller/PermissionApiController.java
  39. 1 1
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  40. 2 0
      src/main/java/com/goafanti/user/service/OrgHumanResourceService.java
  41. 5 0
      src/main/java/com/goafanti/user/service/impl/OrgHumanResourceServiceImpl.java

+ 6 - 0
schema/2017-03-30.sql

@@ -0,0 +1,6 @@
+ALTER TABLE `admin` 
+add COLUMN `province` VARCHAR(12) NULL COMMENT '所在省份',
+ADD INDEX index_number(number),
+MODIFY COLUMN `number` int(6) NOT NULL auto_increment;
+
+ALTER TABLE `admin` auto_increment = 1;

+ 5 - 0
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -0,0 +1,5 @@
+package com.goafanti.admin.bo;
+
+public class InputAdmin {
+
+}

+ 766 - 25
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -9,6 +9,7 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springframework.beans.BeanUtils;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import com.goafanti.admin.bo.InputAdmin;
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.cognizance.bo.ActivityNumberBo;
 import com.goafanti.cognizance.bo.AnnualReportBo;
 import com.goafanti.cognizance.bo.CognizanceDetailBo;
@@ -96,7 +99,6 @@ import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.bo.InputOrganizationIdentity;
 import com.goafanti.user.bo.InputUserAbility;
 import com.goafanti.user.bo.InputUserIdentity;
@@ -153,6 +155,64 @@ public class AdminApiController extends CertifyApiController {
 	private AdminService					adminService;
 	@Resource
 	private OrgTechCenterDetailService		orgTechCenterDetailService;
+	
+	/**
+	 * 管理员列表
+	 * @param province
+	 * @param number
+	 * @param mobile
+	 * @param name
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@RequestMapping(value = "/adminList", method = RequestMethod.GET)
+	public Result adminList(String province, Integer number, String mobile, String name, String pageNo,
+			String pageSize) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(adminService.listAdmin(province, number, mobile, name, pNo, pSize));
+		return res;
+	}
+	
+	
+	/**
+	 * 新增管理员
+	 * @param admin
+	 * @param bindingResult
+	 * @return
+	 */
+	@RequestMapping(value = "/insertAdmin", method = RequestMethod.POST)
+	public Result insertAdmin(@Valid InputAdmin admin, BindingResult bindingResult){
+		Result res = new Result();
+		
+		
+		return res;
+	}
+	
+	/**
+	 * 修改管理员信息
+	 * @param admin
+	 * @param bindingResult
+	 * @return
+	 */
+	@RequestMapping(value = "/updateAdmin", method = RequestMethod.POST)
+	public Result updateAdmin(@Valid InputAdmin admin, BindingResult bindingResult){
+		Result res = new Result();
+		return res;
+	}
+	
+	
 
 	/**
 	 * 新增用户
@@ -2015,9 +2075,10 @@ public class AdminApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 研发部门制度上传
+	 * 
 	 * @param req
 	 * @param sign
 	 * @param uid
@@ -2029,7 +2090,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-        
+
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -2041,24 +2102,72 @@ public class AdminApiController extends CertifyApiController {
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
 		}
-		
+
 		return res;
 	}
-	
+
+	/**
+	 * 研发部门制度下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadInstitution", method = RequestMethod.GET)
+	public Result downloadInstitution(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发部门id"));
+			return res;
+		}
+		OrgTechCenter otc = orgTechCenterService.selectByPrimaryKey(id);
+		if (otc == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发部门id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.INSTITUTION) {
+			downloadFile(response, otc.getSystemDownloadFileName(), otc.getSystemUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
 	/**
 	 * 产学研技术中心协议上传
+	 * 
 	 * @param req
 	 * @param sign
 	 * @param uid
 	 * @return
 	 */
 	@RequestMapping(value = "/uploadProtocol", method = RequestMethod.POST)
-	public Result uploadProtocol(HttpServletRequest req, String sign, String uid) {
+	public Result uploadProtocol(HttpServletRequest req, String sign, String cid) {
 		Result res = new Result();
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-        
+
+		if (null == cid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发中心ID"));
+			return res;
+		}
+
+		OrgTechCenter otc = orgTechCenterService.selectByPrimaryKey(cid);
+
+		if (null == otc) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发中心ID"));
+			return res;
+		}
+
+		String uid = otc.getUid();
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -2070,12 +2179,48 @@ public class AdminApiController extends CertifyApiController {
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
 		}
-		
+
 		return res;
 	}
-	
+
+	/**
+	 * 产学研技术中心协议下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadProtocol", method = RequestMethod.GET)
+	public Result downloadProtocol(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "产学研技术中心id"));
+			return res;
+		}
+
+		OrgTechCenterDetail otcd = orgTechCenterDetailService.selectByPrimaryKey(id);
+		if (otcd == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "产学研技术中心id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.PROTOCOL) {
+			downloadFile(response, otcd.getProtocolDownloadFileName(), otcd.getProtocolUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
 	/**
 	 * 研发活动立项证明材料上传
+	 * 
 	 * @param req
 	 * @param sign
 	 * @param uid
@@ -2087,7 +2232,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-        
+
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -2099,32 +2244,628 @@ public class AdminApiController extends CertifyApiController {
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
 		}
-		
+
 		return res;
 	}
-	
-	
-	
-	
-	
-	
-	
-	
+
 	/**
-	 * 高企相关材料上传
+	 * 研发活动立项证明材料下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadProof", method = RequestMethod.GET)
+	public Result downloadProof(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
+			return res;
+		}
+
+		OrgActivity oa = orgActivityService.selectOrgActivityByPrimaryKey(id);
+		if (oa == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.PROOF) {
+			downloadFile(response, oa.getProofDownloadFileName(), oa.getProofUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 研发活动费用台帐上传
+	 * 
 	 * @param req
 	 * @param sign
 	 * @param uid
 	 * @return
 	 */
-	@RequestMapping(value = "/upload", method = RequestMethod.POST)
-	public Result cognizanceFile(HttpServletRequest req, String sign, String uid) {
+	@RequestMapping(value = "/uploadActivityCost", method = RequestMethod.POST)
+	public Result uploadActivityCost(HttpServletRequest req, String sign, String uid) {
 		Result res = new Result();
-		if (!checkUserLogin(res)) {
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.ACTIVITY_COST_ACCOUNT) {
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 研发活动费用台帐下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadActivityCost", method = RequestMethod.GET)
+	public Result downloadActivityCost(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", " 研发活动费用id"));
+			return res;
+		}
+
+		OrgActivityCost oac = orgActivityCostService.selectByPrimaryKey(id);
+		if (oac == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", " 研发活动费用id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.ACTIVITY_COST_ACCOUNT) {
+			downloadFile(response, oac.getAccountDownloadFileName(), oac.getAccountUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 高新技术产品台帐上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadTecProduct", method = RequestMethod.POST)
+	public Result uploadTecProduct(HttpServletRequest req, String sign, String uid) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.TECH_PRODUCT) {
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 高新技术产品台帐下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadTecProduct", method = RequestMethod.GET)
+	public Result downloadTecProduct(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高新技术产品id"));
+			return res;
+		}
+
+		OrgTechProduct otp = orgTechProductService.selectByPrimaryKey(id);
+		if (otp == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高新技术产品id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.TECH_PRODUCT) {
+			downloadFile(response, otp.getAccountDownloadFileName(), otp.getAccountUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 知识产权证书上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadPropertyRight", method = RequestMethod.POST)
+	public Result uploadPropertyRight(HttpServletRequest req, String sign, String uid) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
 			return res;
 		}
-        
-		if (StringUtils.isBlank(uid)){
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.PROPERTY_RIGHT) {
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 知识产权证书下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadPropertyRight", method = RequestMethod.GET)
+	public Result downloadPropertyRight(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权id"));
+			return res;
+		}
+
+		OrgIntellectualProperty olp = orgIntellectualPropertyService.selectByPrimaryKey(id);
+		if (olp == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.PROPERTY_RIGHT) {
+			downloadFile(response, olp.getPropertyRightDownloadFileName(), olp.getPropertyRightUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 科技成果附件上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadAchievement", method = RequestMethod.POST)
+	public Result uploadAchievement(HttpServletRequest req, String sign, String uid) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.ACHIEVEMENT) {
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 科技成果附件下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadAchievement", method = RequestMethod.GET)
+	public Result downloadAchievement(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果id"));
+			return res;
+		}
+
+		OrgTechAchievement ota = orgTechAchievementService.selectByPrimaryKey(id);
+		if (ota == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "科技成果id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.ACHIEVEMENT) {
+			downloadFile(response, ota.getEnclosureDownloadFileName(), ota.getEnclosureUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 企业纳税申报表上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadRatepay", method = RequestMethod.POST)
+	public Result uploadRatepay(HttpServletRequest req, String sign, String uid, String year) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(year)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.RATEPAY) {
+			sign = sign + "_" + year;
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 企业纳税申报表下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
+	public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
+			return res;
+		}
+
+		OrgRatepay ratepay = orgRatepayService.selectByPrimaryKey(id);
+		if (ratepay == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.RATEPAY) {
+			downloadFile(response, ratepay.getTaxReturnDownloadFileName(), ratepay.getTaxReturnUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 企业财务报表上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadFinance", method = RequestMethod.POST)
+	public Result uploadFinance(HttpServletRequest req, String sign, String uid, String year) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(year)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.FINANCE) {
+			sign = sign + "_" + year;
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 企业财务报表下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadFinance", method = RequestMethod.GET)
+	public Result downloadFinance(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业财务报表id"));
+			return res;
+		}
+
+		OrgFinance of = orgFinanceService.selectByPrimaryKey(id);
+		if (of == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业财务报表id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.FINANCE) {
+			downloadFile(response, of.getFinanceDownloadFileName(), of.getFinanceUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 企业花名册上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadRoster", method = RequestMethod.POST)
+	public Result uploadRoster(HttpServletRequest req, String sign, String uid, String year) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(year)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.ROSTER) {
+			sign = sign + "_" + year;
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 企业社保情况表上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadSocialSecurity", method = RequestMethod.POST)
+	public Result uploadSocialSecurity(HttpServletRequest req, String sign, String uid, String year) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(year)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示年份"));
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.SOCIAL_SECURITY) {
+			sign = sign + "_" + year;
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 企业花名册及社保情况表下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadHumanResource", method = RequestMethod.GET)
+	public Result downloadHumanResource(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业人员情况id"));
+			return res;
+		}
+
+		OrgHumanResource ohr = orgHumanResourceService.selectByPrimaryKey(id);
+		if (ohr == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业人员情况id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.ROSTER) {
+			downloadFile(response, ohr.getRosterDownloadFileName(), ohr.getRosterUrl());
+		} else if (attachmentType == AttachmentType.SOCIAL_SECURITY) {
+			downloadFile(response, ohr.getSocialSecurityDownloadFileName(), ohr.getSocialSecurityUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 荣誉及其他证明材料上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/uploadHonor", method = RequestMethod.POST)
+	public Result uploadHonor(HttpServletRequest req, String sign, String uid) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(uid);
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.HONOR) {
+			res.setData(handleFiles(res, "/cognizance/", true, req, sign, uid));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 荣誉及其他证明材料下载
+	 * 
+	 * @param response
+	 * @param sign
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadHonor", method = RequestMethod.GET)
+	public Result downloadHonor(HttpServletResponse response, String sign, String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isEmpty(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "荣誉及其他证明材料id"));
+			return res;
+		}
+
+		OrgHonorDatum ohd = orgHonorDatumService.selectByPrimaryKey(id);
+		if (ohd == null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "荣誉及其他证明材料id"));
+			return res;
+		}
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.HONOR) {
+			downloadFile(response, ohd.getEnclosureDownloadFileName(), ohd.getEnclosureUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
+	 * 高企相关材料上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/upload", method = RequestMethod.POST)
+	public Result cognizanceFile(HttpServletRequest req, String sign, String uid) {
+		Result res = new Result();
+		if (!checkUserLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(uid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}

+ 52 - 11
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -28,8 +28,10 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.alibaba.fastjson.JSON;
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
+import com.goafanti.cognizance.service.OrgRatepayService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
@@ -40,6 +42,7 @@ import com.goafanti.common.enums.PatentInfoFields;
 import com.goafanti.common.enums.PatentInfoStatus;
 import com.goafanti.common.enums.PatentRegistrationFields;
 import com.goafanti.common.model.AftFile;
+import com.goafanti.common.model.OrgRatepay;
 import com.goafanti.common.model.PatentCost;
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
@@ -53,10 +56,8 @@ import com.goafanti.patent.bo.InputPatentCost;
 import com.goafanti.patent.bo.InputPatentInfo;
 import com.goafanti.patent.bo.InputPatentRegistration;
 import com.goafanti.patent.bo.PatentApplicationFeeBo;
-import com.goafanti.patent.bo.PatentCompositeBo;
 import com.goafanti.patent.bo.PatentManageListBo;
 import com.goafanti.patent.bo.PatentPendingBo;
-import com.goafanti.patent.service.AdminService;
 import com.goafanti.patent.service.PatentCostService;
 import com.goafanti.patent.service.PatentInfoService;
 import com.goafanti.patent.service.PatentLogService;
@@ -85,6 +86,8 @@ public class AdminPatentApiController extends CertifyApiController {
 	private UserService						userService;
 	@Resource
 	private AftFileService					aftFileService;
+	@Resource
+	private OrgRatepayService				orgRatepayService;
 
 	/**
 	 * 专利相关材料上传
@@ -100,7 +103,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		if (!checkAdminLogin(res)) {
 			return res;
 		}
-        
+
 		User curUser = userService.selectByPrimaryKey(uid);
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -108,12 +111,13 @@ public class AdminPatentApiController extends CertifyApiController {
 
 		AttachmentType attachmentType = AttachmentType.getField(sign);
 		if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT || attachmentType == AttachmentType.PATENT_WRITING
-			|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE || attachmentType == AttachmentType.PATENT_CERTIFICATE) {
+				|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE
+				|| attachmentType == AttachmentType.PATENT_CERTIFICATE) {
 			res.setData(handleFiles(res, "/patent/", true, req, sign, uid));
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
 		}
-		
+
 		return res;
 	}
 
@@ -190,6 +194,42 @@ public class AdminPatentApiController extends CertifyApiController {
 	}
 
 	/**
+	 * 下载上年度纳税申报表
+	 * @param response
+	 * @param uid
+	 * @param year
+	 * @param sign
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
+	public Result downloadRatepay(HttpServletResponse response, String uid, String sign) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isBlank(uid)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
+			return res;
+		}
+		
+		Calendar cal = Calendar.getInstance();
+		OrgRatepay ratepay = orgRatepayService.selectRatepayByUidAndYear(uid, cal.get(Calendar.YEAR)-1);
+		
+		if (null == ratepay){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到上年度纳税申报表", "上年度纳税申报表"));
+			return res;
+		}
+		
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+		if (attachmentType == AttachmentType.LAST_YEAR_RATEPAY) {
+			downloadFile(response, ratepay.getTaxReturnDownloadFileName(), ratepay.getTaxReturnUrl());
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+		return res;
+	}
+
+	/**
 	 * 上传专利代理委托书模版
 	 * 
 	 * @param req
@@ -537,8 +577,8 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/saveRecieveSend", method = RequestMethod.POST)
-	public Result recieveSendDetail(BindingResult bindingResult, String rid, String pid,
-			@Valid InputPatentRegistration patentRegistrationBo) {
+	public Result recieveSendDetail(@Valid InputPatentRegistration patentRegistrationBo, BindingResult bindingResult,
+			String rid, String pid) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
@@ -625,8 +665,8 @@ public class AdminPatentApiController extends CertifyApiController {
 		Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
 		String lp = ("undefined".equals(locationProvince)) ? null : locationProvince;
 		@SuppressWarnings("unchecked")
-		List<PatentCompositeBo> composites = (List<PatentCompositeBo>) getManagePatentList(sn, patentNumber, office, lp,
-				unitName, pc, patentName, ps, createTime, patentApplicationDate, author, 1, 1000).getList();
+		List<PatentManageListBo> composites = (List<PatentManageListBo>) getManagePatentList(sn, patentNumber, office,
+				lp, unitName, pc, patentName, ps, createTime, patentApplicationDate, author, 1, 1000).getList();
 		if (res.getError().isEmpty()) {
 			exportComosites(response, composites);
 		} else {
@@ -796,7 +836,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 	}
 
-	private void exportComosites(HttpServletResponse response, List<PatentCompositeBo> composites) {
+	private void exportComosites(HttpServletResponse response, List<PatentManageListBo> composites) {
 		String sheetName = "专利综合管理报表";
 		HSSFWorkbook workbook = createWorkbook(sheetName,
 				new String[] { "编号", "申请号/专利号", "事务所", "省份", "公司名称", "专利名称", "专利状态", "派单日", "申请日", "授权日", "资料撰写人" });
@@ -804,7 +844,7 @@ public class AdminPatentApiController extends CertifyApiController {
 
 		// 将查询出的数据设置到sheet对应的单元格中
 		for (int i = 0; i < composites.size(); i++) {
-			PatentCompositeBo obj = composites.get(i);// 遍历每个对象
+			PatentManageListBo obj = composites.get(i);// 遍历每个对象
 			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
 			if (null == obj.getSerialNumber()) {
 				row.createCell(0).setCellValue("");
@@ -994,5 +1034,6 @@ public class AdminPatentApiController extends CertifyApiController {
 		}
 		return fileName;
 	}
+	
 
 }

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -42,7 +42,7 @@ import com.goafanti.techproject.service.TechWebsiteService;
 import com.goafanti.user.service.UserService;
 
 @Controller
-@RequestMapping(value = "/api/admintechproject")
+@RequestMapping(value = "/api/admin/techproject")
 public class AdminTechProjectApiController extends CertifyApiController {
 	@Value(value = "${aesSecretKey}")
 	private String					aesSecretKey	= null;

+ 19 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -0,0 +1,19 @@
+package com.goafanti.admin.service;
+
+import java.util.List;
+
+import com.goafanti.common.model.Admin;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface AdminService {
+
+	List<Admin> selectAllAdmin();
+
+	Admin selectByMobile(String username);
+
+	Admin selectByPrimaryKey(String key);
+
+	Pagination<Admin> listAdmin(String province, Integer number, String mobile, String name, Integer pNo,
+			Integer pSize);
+
+}

+ 76 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -0,0 +1,76 @@
+package com.goafanti.admin.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.admin.service.AdminService;
+import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+
+@Service
+public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements AdminService {
+	@Autowired
+	private AdminMapper adminMapper;
+
+	@Override
+	public List<Admin> selectAllAdmin() {
+		return adminMapper.selectAllAdmin();
+	}
+
+	@Override
+	public Admin selectByMobile(String mobile) {
+		return adminMapper.selectByMobile(mobile);
+	}
+
+	@Override
+	public Admin selectByPrimaryKey(String key) {
+		return adminMapper.selectByPrimaryKey(key);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<Admin> listAdmin(String province, Integer number, String mobile, String name, Integer pageNo,
+			Integer pageSize) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (!TokenManager.hasRole("999999")) {
+			return null;
+		}
+
+		if (StringUtils.isNotBlank(province)) {
+			params.put("province", province);
+		}
+
+		if (StringUtils.isNotBlank(mobile)) {
+			params.put("mobile", mobile);
+		}
+		
+		if (StringUtils.isNotBlank(name)) {
+			params.put("name", name);
+		}
+
+		if (null != number) {
+			params.put("number", number);
+		}
+
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+
+		return (Pagination<Admin>) findPage("findAdminListByPage", "findAdminCount", params, pageNo,
+				pageSize);
+	}
+
+}

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgActivityCostService.java

@@ -23,4 +23,6 @@ public interface OrgActivityCostService {
 
 	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String userId);
 
+	OrgActivityCost selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgFinanceService.java

@@ -18,4 +18,6 @@ public interface OrgFinanceService {
 
 	OrgFinance selectFinanceByUidAndYear(String uid, Integer year);
 
+	OrgFinance selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgHonorDatumService.java

@@ -15,4 +15,6 @@ public interface OrgHonorDatumService {
 
 	int deleteByPrimaryKey(List<String> id);
 
+	OrgHonorDatum selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgIntellectualPropertyService.java

@@ -19,4 +19,6 @@ public interface OrgIntellectualPropertyService {
 
 	OrgIntellectualProperty selectOrgIntellectualPropertyByPid(String id);
 
+	OrgIntellectualProperty selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgRatepayService.java

@@ -18,4 +18,6 @@ public interface OrgRatepayService {
 
 	OrgRatepay selectRatepayByUidAndYear(String userId, Integer year);
 
+	OrgRatepay selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgTechAchievementService.java

@@ -15,4 +15,6 @@ public interface OrgTechAchievementService {
 
 	int deleteByPrimaryKey(List<String> id);
 
+	OrgTechAchievement selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgTechCenterDetailService.java

@@ -15,4 +15,6 @@ public interface OrgTechCenterDetailService {
 
 	int deleteByPrimaryKey(List<String> id);
 
+	OrgTechCenterDetail selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgTechCenterService.java

@@ -10,4 +10,6 @@ public interface OrgTechCenterService {
 
 	int updateByPrimaryKeySelective(OrgTechCenter orgTechCenter);
 
+	OrgTechCenter selectByPrimaryKey(String id);
+
 }

+ 2 - 0
src/main/java/com/goafanti/cognizance/service/OrgTechProductService.java

@@ -15,4 +15,6 @@ public interface OrgTechProductService {
 
 	int deleteByPrimaryKey(List<String> id);
 
+	OrgTechProduct selectByPrimaryKey(String id);
+
 }

+ 6 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -93,7 +93,12 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 
 	@Override
 	public OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid) {
-		// TODO Auto-generated method stub
 		return orgActivityCostMapper.selectOrgActivityCostByUidAndAid(aid, uid);
 	}
+
+
+	@Override
+	public OrgActivityCost selectByPrimaryKey(String id) {
+		return orgActivityCostMapper.selectByPrimaryKey(id);
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgFinanceServiceImpl.java

@@ -63,5 +63,10 @@ public class OrgFinanceServiceImpl  extends BaseMybatisDao<OrgFinanceMapper> imp
 	public OrgFinance selectFinanceByUidAndYear(String uid, Integer year) {
 		return orgFinanceMapper.selectFinanceByUidAndYear(uid, year);
 	}
+
+	@Override
+	public OrgFinance selectByPrimaryKey(String id) {
+		return orgFinanceMapper.selectByPrimaryKey(id);
+	}
 	
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgHonorDatumServiceImpl.java

@@ -53,4 +53,9 @@ public class OrgHonorDatumServiceImpl extends BaseMybatisDao<OrgHonorDatumMapper
 	public int deleteByPrimaryKey(List<String> id) {
 		return orgHonorDatumMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public OrgHonorDatum selectByPrimaryKey(String id) {
+		return orgHonorDatumMapper.selectByPrimaryKey(id);
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java

@@ -66,4 +66,9 @@ public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntell
 		return orgIntellectualPropertyMapper.selectOrgIntellectualPropertyByPid(pid);
 	}
 
+	@Override
+	public OrgIntellectualProperty selectByPrimaryKey(String id) {
+		return orgIntellectualPropertyMapper.selectByPrimaryKey(id);
+	}
+
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgRatepayServiceImpl.java

@@ -64,4 +64,9 @@ public class OrgRatepayServiceImpl extends BaseMybatisDao<OrgRatepayMapper> impl
 		return orgRatepayMapper.selectRatepayByUidAndYear(uid, year);
 	}
 
+	@Override
+	public OrgRatepay selectByPrimaryKey(String id) {
+		return orgRatepayMapper.selectByPrimaryKey(id);
+	}
+
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgTechAchievementServiceImpl.java

@@ -53,4 +53,9 @@ public class OrgTechAchievementServiceImpl extends BaseMybatisDao<OrgTechAchieve
 	public int deleteByPrimaryKey(List<String> id) {
 		return orgTechAchievementMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public OrgTechAchievement selectByPrimaryKey(String id) {
+		return orgTechAchievementMapper.selectByPrimaryKey(id);
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java

@@ -55,4 +55,9 @@ public class OrgTechCenterDetailServiceImpl extends BaseMybatisDao<OrgTechCenter
 	public int deleteByPrimaryKey(List<String> id) {
 		return orgTechCenterDetailMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public OrgTechCenterDetail selectByPrimaryKey(String id) {
+		return orgTechCenterDetailMapper.selectByPrimaryKey(id);
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterServiceImpl.java

@@ -26,4 +26,9 @@ public class OrgTechCenterServiceImpl implements OrgTechCenterService {
 	public int updateByPrimaryKeySelective(OrgTechCenter orgTechCenter) {
 		return orgTechCenterMapper.updateByPrimaryKeySelective(orgTechCenter);
 	}
+
+	@Override
+	public OrgTechCenter selectByPrimaryKey(String id) {
+		return orgTechCenterMapper.selectByPrimaryKey(id);
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgTechProductServiceImpl.java

@@ -56,4 +56,9 @@ public class OrgTechProductServiceImpl extends BaseMybatisDao<OrgTechProductMapp
 	public int deleteByPrimaryKey(List<String> id) {
 		return orgTechProductMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public OrgTechProduct selectByPrimaryKey(String id) {
+		return orgTechProductMapper.selectByPrimaryKey(id);
+	}
 }

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -9,10 +9,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.service.UserService;
 
 

+ 5 - 1
src/main/java/com/goafanti/common/enums/AttachmentType.java

@@ -7,7 +7,11 @@ public enum AttachmentType {
 	COPYRIGHT_AUTH("copyright_auth", "软著证书"), COPYRIGHT_APPLY("copyright_apply", "软著申请书"), DEFAULT("attachment", "附件"),
 	PATENT_PRORY_STATEMENT("patent_prory_statement", "专利代理委托书"), PATENT_WRITING("patent_writing", "专利稿件"),
 	AUTHORIZATION_NOTICE("authorization_notice", "授权通知书 "), PATENT_CERTIFICATE("patent_certificate", "专利证书"),
-	INSTITUTION("institution", "研发部门制度"), PROTOCOL("protocol", "产学研技术中心协议"), PROOF("proof", "研发活动立项证明材料");
+	INSTITUTION("institution", "研发部门制度"), PROTOCOL("protocol", "产学研技术中心协议"), PROOF("proof", "研发活动立项证明材料"),
+	ACTIVITY_COST_ACCOUNT("activity_cost_account", "研发活动费用台帐"), TECH_PRODUCT("tech_product", "高新技术产品台帐"),
+	PROPERTY_RIGHT("property_right", "知识产权证书"), ACHIEVEMENT("achievement", "科技成果附件"), RATEPAY("ratepay", "企业纳税申报表"),
+	FINANCE("finance", "企业财务报表"), ROSTER("roster", "企业花名册"), SOCIAL_SECURITY("social_security", "企业社保情况表"), 
+	HONOR("honor", "荣誉及其他证明材料"), LAST_YEAR_RATEPAY("last_year_ratepay", "上年度纳税申报表");
 
 	private AttachmentType(String code, String desc) {
 		this.code = code;

+ 55 - 4
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -9,9 +9,10 @@
     <result column="email" property="email" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="number" property="number" jdbcType="INTEGER" />
+    <result column="province" property="province" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, mobile, name, password, email, create_time, number
+    id, mobile, name, password, email, create_time, number, province
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -26,10 +27,10 @@
   <insert id="insert" parameterType="com.goafanti.common.model.Admin" >
     insert into admin (id, mobile, name, 
       password, email, create_time, 
-      number)
+      number, province)
     values (#{id,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{number,jdbcType=INTEGER})
+      #{number,jdbcType=INTEGER}, #{province,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Admin" >
     insert into admin
@@ -55,6 +56,9 @@
       <if test="number != null" >
         number,
       </if>
+       <if test="province != null" >
+        province,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -78,6 +82,9 @@
       <if test="number != null" >
         #{number,jdbcType=INTEGER},
       </if>
+      <if test="province != null" >
+        #{province,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Admin" >
@@ -101,6 +108,9 @@
       <if test="number != null" >
         number = #{number,jdbcType=INTEGER},
       </if>
+       <if test="province != null" >
+        province = #{province,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -111,7 +121,8 @@
       password = #{password,jdbcType=VARCHAR},
       email = #{email,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      number = #{number,jdbcType=INTEGER}
+      number = #{number,jdbcType=INTEGER},
+      province = #{province,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -127,4 +138,44 @@
     from admin 
     where mobile = #{mobile,jdbcType=VARCHAR}
   </select> 
+  
+  <select id= "findAdminListByPage" parameterType="java.lang.String" resultMap="BaseResultMap" >
+  	 select 
+    <include refid="Base_Column_List" />
+    from admin
+    where 1 = 1
+    <if test = "province != null">
+    	and province = #{province,jdbcType=VARCHAR}
+    </if>
+    <if test = "mobile != null"> 
+    	and mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+    <if test = "name != null"> 
+    	and name = #{name,jdbcType=VARCHAR}
+    </if>
+    <if test = "number != null">
+    	and number = #{number,jdbcType=INTEGER}
+    </if>
+    order by number 
+    <if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+  <select id = "findAdminCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+   select count(1) from admin
+    where 1 = 1
+    <if test = "province != null">
+    	and province = #{province,jdbcType=VARCHAR}
+    </if>
+    <if test = "mobile != null"> 
+    	and mobile = #{mobile,jdbcType=VARCHAR}
+    </if>
+     <if test = "name != null"> 
+    	and name = #{name,jdbcType=VARCHAR}
+    </if>
+    <if test = "number != null">
+    	and number = #{number,jdbcType=INTEGER}
+    </if>
+  </select>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -80,6 +80,18 @@
     <include refid="Base_Column_List" />
     from permission
   </select>
+  
+  <insert id="insertBatch" parameterType="com.goafanti.common.model.Permission">
+    insert into t_permission (id, name, url)
+    values 
+    <foreach item="item" index="index" collection="list" separator=",">
+      (#{item.id,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR})
+    </foreach>
+    ON DUPLICATE KEY UPDATE
+	    name = values(name),
+	    url = values(url)
+  </insert>
+  
   <delete id="deleteByPrimaryKeys" parameterType="java.lang.String">
     delete from permission
     where id in 

+ 15 - 0
src/main/java/com/goafanti/common/model/Admin.java

@@ -38,6 +38,11 @@ public class Admin extends BaseModel implements AftUser{
     * 员工工号
     */
     private Integer number;
+    
+    /**
+     * 所在省份
+     */
+    private String province;
 
     public String getId() {
         return id;
@@ -95,6 +100,16 @@ public class Admin extends BaseModel implements AftUser{
     public void setNumber(Integer number) {
         this.number = number;
     }
+    
+    
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
 
 	@Override
 	public String getAid() {

+ 1 - 1
src/main/java/com/goafanti/core/shiro/token/UserRealm.java

@@ -17,11 +17,11 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.subject.SimplePrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftUser;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.PasswordUtil;
-import com.goafanti.patent.service.AdminService;
 import com.goafanti.permission.service.PermissionService;
 import com.goafanti.permission.service.RoleService;
 import com.goafanti.user.service.UserService;

+ 0 - 6
src/main/java/com/goafanti/patent/bo/InputPatentRegistration.java

@@ -6,10 +6,8 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class InputPatentRegistration {
 	
-	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	acceptanceReceiveTime;
 
-	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	acceptanceIssueTime;
 	
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -18,10 +16,8 @@ public class InputPatentRegistration {
 	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	acceptanceExpressCompany;
 	
-	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	authorizationReceiveTime;
 
-	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	authorizationIssueTime;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -30,10 +26,8 @@ public class InputPatentRegistration {
 	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	authorizationExpressCompany;
 
-	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	certificateRecieveTime;
 
-	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	certificateIssueTime;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 44 - 5
src/main/java/com/goafanti/patent/bo/PatentManageListBo.java

@@ -2,6 +2,8 @@ package com.goafanti.patent.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 public class PatentManageListBo {
 	private String	id;
 
@@ -12,11 +14,11 @@ public class PatentManageListBo {
 	private String	patentNumber;
 
 	private String	office;
-	
-	private String locationProvince;
+
+	private String	locationProvince;
 
 	private String	unitName;
-    
+
 	private String	patentName;
 
 	private Integer	patentState;
@@ -132,7 +134,44 @@ public class PatentManageListBo {
 	public void setAuthor(String author) {
 		this.author = author;
 	}
-	
-	
+
+	// 授权日/发文日
+	public String getAuthorizedFormattedDate() {
+		if (this.authorizedDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+		}
+	}
+
+	public void setAuthorizedFormattedDate(String authorizedFormattedDate) {
+
+	}
+
+	// 申请日/受理日
+	public String getPatentApplicationFormattedDate() {
+		if (this.patentApplicationDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+		}
+	}
+
+	public void setPatentApplicationFormattedDate(String patentApplicationFormattedDate) {
+
+	}
+
+	// 创建时间
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		}
+	}
+
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
+	}
 
 }

+ 19 - 696
src/main/java/com/goafanti/patent/controller/PatentApiController.java

@@ -1,9 +1,5 @@
 package com.goafanti.patent.controller;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,19 +10,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AftFileService;
 import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
 import com.goafanti.common.bo.Result;
@@ -38,25 +29,13 @@ import com.goafanti.common.enums.PatentInfoStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftFile;
 import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.PatentCost;
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
-import com.goafanti.common.model.PatentRegistration;
 import com.goafanti.common.model.User;
-import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.FileUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.patent.bo.InputPatentInfo;
-import com.goafanti.patent.bo.PatentApplicationFeeBo;
-import com.goafanti.patent.bo.PatentCompositeBo;
-import com.goafanti.patent.bo.PatentManageListBo;
-import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
-import com.goafanti.patent.bo.PatentPendingBo;
-import com.goafanti.patent.bo.PatentRecieveSendBo;
-import com.goafanti.patent.bo.PatentRegistrationBo;
-import com.goafanti.patent.service.AdminService;
 import com.goafanti.patent.service.PatentCostService;
 import com.goafanti.patent.service.PatentInfoService;
 import com.goafanti.patent.service.PatentLogService;
@@ -84,20 +63,21 @@ public class PatentApiController extends CertifyApiController {
 	@Resource
 	private UserService						userService;
 	@Resource
-	private AftFileService aftFileService;
+	private AftFileService					aftFileService;
 
 	@Value(value = "${upload.private.path}")
 	private String							uploadPrivatePath	= null;
-	
+
 	/**
 	 * 专利相关材料上传
+	 * 
 	 * @param req
 	 * @param uid
 	 * @param sign
 	 * @return
 	 */
 	@RequestMapping(value = "/upload", method = RequestMethod.POST)
-	public Result upload(HttpServletRequest req, String sign){
+	public Result upload(HttpServletRequest req, String sign) {
 		Result res = new Result();
 		if (!checkUserLogin(res)) {
 			return res;
@@ -106,19 +86,19 @@ public class PatentApiController extends CertifyApiController {
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
-		
+
 		AttachmentType attachmentType = AttachmentType.getField(sign);
 		if (attachmentType == AttachmentType.PATENT_PRORY_STATEMENT || attachmentType == AttachmentType.PATENT_WRITING
-			|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE || attachmentType == AttachmentType.PATENT_CERTIFICATE) {
+				|| attachmentType == AttachmentType.AUTHORIZATION_NOTICE
+				|| attachmentType == AttachmentType.PATENT_CERTIFICATE) {
 			res.setData(handleFiles(res, "/patent/", true, req, sign, TokenManager.getUserId()));
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
 		}
-		
+
 		return res;
 	}
-	
-	
+
 	/**
 	 * 下载专利相关材料
 	 * 
@@ -152,15 +132,15 @@ public class PatentApiController extends CertifyApiController {
 				downloadFile(response, pi.getPatentWritingDownloadFileName(), pi.getPatentWritingUrl());
 			} else if (attachmentType == AttachmentType.AUTHORIZATION_NOTICE) {
 				downloadFile(response, pi.getAuthorizationNoticeDownloadFileName(), pi.getAuthorizationNoticeUrl());
-			} else if (attachmentType == AttachmentType.PATENT_CERTIFICATE){
+			} else if (attachmentType == AttachmentType.PATENT_CERTIFICATE) {
 				downloadFile(response, pi.getPatentCertificateDownloadFileName(), pi.getPatentCertificateUrl());
 			}
-		} else{
+		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 下载模版文件(专利代理委托书)
 	 * 
@@ -190,7 +170,7 @@ public class PatentApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 用户端专利申请
 	 */
@@ -283,14 +263,14 @@ public class PatentApiController extends CertifyApiController {
 		PatentInfo pi = patentInfoService.selectByPrimaryKey(pid);
 		if (null != pi.getUid() && pi.getUid().equals(TokenManager.getUserId())) {
 			List<PatentLog> list = patentLogService.selectProcessByPid(pid);
-			for (PatentLog log : list){
-				if (PatentInfoStatus.getStatus(log.getState()) ==  PatentInfoStatus.SIGN){
+			for (PatentLog log : list) {
+				if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SIGN) {
 					log.setState(PatentInfoStatus.CREATE.getCode());
 				}
-				if (PatentInfoStatus.getStatus(log.getState()) ==  PatentInfoStatus.CIRCULATION){
+				if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.CIRCULATION) {
 					log.setState(PatentInfoStatus.DELIVERD.getCode());
 				}
-				if (PatentInfoStatus.getStatus(log.getState()) ==  PatentInfoStatus.SETTLEMENT){
+				if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.SETTLEMENT) {
 					log.setState(PatentInfoStatus.LICENSE.getCode());
 				}
 			}
@@ -312,7 +292,7 @@ public class PatentApiController extends CertifyApiController {
 		if (!checkUserLogin(res)) {
 			return res;
 		}
-		if (StringUtils.isBlank(pid)){
+		if (StringUtils.isBlank(pid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "专利d"));
 			return res;
 		}
@@ -324,48 +304,6 @@ public class PatentApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 删除专利记录
-	 * 
-	 * @param ids
-	 * @return
-	 */
-	@RequestMapping(value = "/deletePatent", method = RequestMethod.POST)
-	public Result deletePatent(@RequestParam(name = "ids[]", required = true) String[] ids) {
-		Result res = new Result();
-		List<String> id = new ArrayList<String>();
-		for (String s : ids) {
-			id.add(s);
-		}
-		res.setData(patentInfoService.batchDeleteByPrimaryKey(id));
-		return res;
-	}
-
-	/**
-	 * 管理端申请专利列表
-	 * 
-	 * @throws ParseException
-	 */
-	@RequestMapping(value = "/managePatentList", method = RequestMethod.POST)
-	public Result managePatentList(Integer serialNumber, String patentNumber, String office, String locationProvince,
-			String unitName, Integer patentCatagory, String patentName, Integer patentState,
-			@RequestParam(name = "createTime[]", required = false) String[] createTime,
-			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String author, String pageNo, String pageSize) throws ParseException {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName, patentCatagory,
-				patentName, patentState, createTime, patentApplicationDate, author, pNo, pSize));
-		return res;
-	}
-
-	/**
 	 * 获取公司
 	 */
 	@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
@@ -395,502 +333,6 @@ public class PatentApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 管理端新增专利申请
-	 */
-	@RequestMapping(value = "/manageApplyPatent", method = RequestMethod.POST)
-	public Result manageApplyPatent(PatentInfo patentInfo, String uid) {
-		Result res = new Result();
-		res = checkCertify(res, uid);
-		if (res.getError().isEmpty()) {
-			String aid = userService.selectByPrimaryKey(uid).getAid();
-			res.setData(patentInfoService.savePatentInfo(patentInfo, aid));
-		}
-		return res;
-	}
-
-	/**
-	 * 管理端专利详情修改保存
-	 * 
-	 * @throws ParseException
-	 */
-	@RequestMapping(value = "/managePatentInfo", method = RequestMethod.POST)
-	public Result managePatentInfo(String patentNumber, String patentName, String patentCatagory, String patentField,
-			String patentDes, String patentWritingUrl, String authorizationNoticeUrl, String patentCertificateUrl,
-			String xid, PatentLog patentLog, String recordTimeFormattedDate, Integer pState) throws ParseException {
-		Result res = new Result();
-		PatentInfo patentInfo = new PatentInfo();
-		patentInfo.setId(xid);
-		patentInfo.setPatentState(pState);
-		patentInfo.setPatentName(patentName);
-		patentInfo.setPatentNumber(patentNumber);
-		patentInfo.setPatentCatagory(StringUtils.isNumeric(patentCatagory) ? Integer.parseInt(patentCatagory) : null);
-		patentInfo.setPatentField(StringUtils.isNumeric(patentField) ? Integer.parseInt(patentField) : null);
-		patentInfo.setPatentDes(patentDes);
-		patentInfo.setPatentWritingUrl(patentWritingUrl);
-		patentInfo.setAuthorizationNoticeUrl(authorizationNoticeUrl);
-		patentInfo.setPatentCertificateUrl(patentCertificateUrl);
-		Date recordTime = null;
-		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
-			recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
-		}
-		patentInfoService.updatePatentInfo(patentInfo, patentLog, recordTime);
-
-		return res;
-	}
-
-	/**
-	 * 待缴费专利管理
-	 */
-	@RequestMapping(value = "/managePendingPaymentList", method = RequestMethod.POST)
-	public Result managePendingPaymentList(String locationProvince, String pageNo, String pageSize) {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getManagePendingPaymentList(locationProvince, pNo, pSize));
-		return res;
-	}
-
-	/**
-	 * 年费确认缴费
-	 */
-	@RequestMapping(value = "/confirmPayment", method = RequestMethod.POST)
-	public Result confirmPayment(String cid) {
-		Result res = new Result();
-		if (StringUtils.isBlank(cid)) {
-			res.getError().add(buildError("", "确认缴费失败!"));
-			return res;
-		}
-		PatentCost patentCost = new PatentCost();
-		patentCost.setId(cid);
-		patentCost.setAnnualFeeState(1);
-		patentCostService.updateByPrimaryKeySelective(patentCost);
-		return res;
-	}
-
-	/**
-	 * 补正审查通知列表
-	 */
-	@RequestMapping(value = "/noticeOfCorrectionList", method = RequestMethod.POST)
-	public Result noticeOfCorrectionList(Date authorizedDate, Integer serialNumber, String patentNumber, String office,
-			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
-			String author, String pageNo, String pageSize) {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getNoticeOfCorrectionList(authorizedDate, serialNumber, patentNumber, office, locationProvince,
-				unitName, patentCatagory, patentName, patentState, author, pNo, pSize));
-		return res;
-	}
-
-	/**
-	 * 补正审查通知答复确认
-	 */
-	@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
-	public Result replyConfirm(String pid, Integer patentState) {
-		Result res = new Result();
-		patentInfoService.updateNoticeOfCorrection(pid, patentState);
-		return res;
-	}
-
-	/**
-	 * 收发详情入口/收发纸件登记
-	 */
-	@RequestMapping(value = "/getRecieveSendList", method = RequestMethod.POST)
-	public Result RecieveSendList(String pageNo, String pageSize) {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getRecieveSendList(pNo, pSize));
-		return res;
-	}
-
-	/**
-	 * 收发登记详情编辑保存
-	 * 
-	 * @throws ParseException
-	 */
-	@RequestMapping(value = "/saveRecieveSend", method = RequestMethod.POST)
-	public Result recieveSendDetail(String rid, String pid, PatentRegistrationBo patentRegistrationBo)
-			throws ParseException {
-		Result res = new Result();
-		patentRegistrationService.updateByPrimaryKey(regBo2Reg(rid, pid, patentRegistrationBo));
-		return res;
-	}
-
-	/**
-	 * 专利申请费用管理
-	 */
-	@RequestMapping(value = "/getApplicationFeeList", method = RequestMethod.POST)
-	public Result getApplicationFeeList(
-			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String locationProvince, String pageNo, String pageSize) throws ParseException {
-		Result res = new Result();
-		Integer pNo = 1;
-		Integer pSize = 10;
-		if (StringUtils.isNumeric(pageSize)) {
-			pSize = Integer.parseInt(pageSize);
-		}
-		if (StringUtils.isNumeric(pageNo)) {
-			pNo = Integer.parseInt(pageNo);
-		}
-		res.setData(getApplicationFeeList(patentApplicationDate, locationProvince, pNo, pSize));
-		return res;
-	}
-
-	/**
-	 * 登记申请费用
-	 */
-	@RequestMapping(value = "/registerApplicationFee", method = RequestMethod.POST)
-	public Result registerApplicationFee(PatentCost patentCost, String cid) {
-		Result res = new Result();
-		PatentCost p = new PatentCost();
-		p.setId(cid);
-		p.setApplicationFee(patentCost.getApplicationFee());
-		p.setReimbursement(patentCost.getReimbursement());
-		p.setFunds(patentCost.getFunds());
-		p.setTrialFee(patentCost.getTrialFee());
-		p.setPrintingFee(patentCost.getPrintingFee());
-		p.setPaymentState(patentCost.getPaymentState());
-		res.setData(patentCostService.updateByPrimaryKeySelective(p));
-		return res;
-	}
-
-	/**
-	 * 专利综合管理报表导出
-	 * 
-	 * @throws ParseException
-	 */
-	@RequestMapping(value = "/exportComposite", method = RequestMethod.GET)
-	public Result exportComposite(@RequestParam(name = "serialNumber", required = false) String serialNumber,
-			String patentNumber, String office, String locationProvince, String unitName,
-			@RequestParam(name = "patentCatagory", required = false) String patentCatagory, String patentName,
-			@RequestParam(name = "patentState", required = false) String patentState,
-			@RequestParam(name = "createTime[]", required = false) String[] createTime,
-			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String author, HttpServletResponse response) throws ParseException {
-		Result res = new Result();
-
-		Integer sn = (!StringUtils.isNumeric(serialNumber) ? null : Integer.parseInt(serialNumber));
-		Integer pc = (!StringUtils.isNumeric(patentCatagory) ? null : Integer.parseInt(patentCatagory));
-		Integer ps = (!StringUtils.isNumeric(patentState) ? null : Integer.parseInt(patentState));
-		String lp = ("undefined".equals(locationProvince)) ? null : locationProvince;
-		@SuppressWarnings("unchecked")
-		List<PatentCompositeBo> composites = (List<PatentCompositeBo>) getManagePatentList(sn, patentNumber, office, lp,
-				unitName, pc, patentName, ps, createTime, patentApplicationDate, author, 1, 1000).getList();
-		if (res.getError().isEmpty()) {
-			exportComosites(response, composites);
-		} else {
-			FileUtils.out(response, res.toString());
-		}
-		return res;
-	}
-
-	/**
-	 * 待缴年登印费专利管理报表导出
-	 */
-	@RequestMapping(value = "/exportPending", method = RequestMethod.GET)
-	public Result exportPending(String locationProvince, HttpServletResponse response) {
-		Result res = new Result();
-		@SuppressWarnings("unchecked")
-		List<PatentPendingBo> pendings = (List<PatentPendingBo>) getManagePendingPaymentList(locationProvince, 1, 1000)
-				.getList();
-		if (res.getError().isEmpty()) {
-			exportPendings(response, pendings);
-		} else {
-			FileUtils.out(response, res.toString());
-		}
-		return res;
-	}
-
-	/**
-	 * 专利申请费用管理报表导出
-	 * 
-	 * @throws ParseException
-	 */
-	@RequestMapping(value = "/exportApplicationFee", method = RequestMethod.GET)
-	public Result exportApplicationFee(
-			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
-			String locationProvince, HttpServletResponse response) throws ParseException {
-		Result res = new Result();
-		@SuppressWarnings("unchecked")
-		List<PatentApplicationFeeBo> fees = (List<PatentApplicationFeeBo>) getApplicationFeeList(patentApplicationDate,
-				locationProvince, 1, 1000).getList();
-		if (res.getError().isEmpty()) {
-			exportFees(response, fees);
-		} else {
-			FileUtils.out(response, res.toString());
-		}
-
-		return res;
-	}
-
-	// 专利申请费用管理报表
-	private void exportFees(HttpServletResponse response, List<PatentApplicationFeeBo> fees) {
-		String sheetName = "专利申请费用管理报表";
-		HSSFWorkbook workbook = createWorkbook(sheetName, new String[] { "编号", "申请号/专利号", "省份", "公司名称", "专利名称", "缴费状态",
-				"申请费", "实审费", "文印费", "是否请款", "是否报销", "申请日", "缴费截止时间" });
-
-		HSSFSheet sheet = workbook.getSheet(sheetName);
-
-		for (int i = 0; i < fees.size(); i++) {
-			PatentApplicationFeeBo obj = fees.get(i);
-			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
-			if (null == obj.getSerialNumber()) {
-				row.createCell(0).setCellValue("");
-			} else {
-				row.createCell(0).setCellValue(obj.getSerialNumber());
-			}
-			row.createCell(1).setCellValue(obj.getPatentNumber());
-			row.createCell(2).setCellValue(obj.getLocationProvince());
-			row.createCell(3).setCellValue(obj.getUnitName());
-			row.createCell(4).setCellValue(obj.getPatentName());
-			if (null != obj.getPaymentState()) {
-				switch (obj.getPaymentState()) {
-				case 0:
-					row.createCell(5).setCellValue("未缴费");
-					break;
-				case 1:
-					row.createCell(5).setCellValue("已缴费");
-				}
-			} else {
-				row.createCell(5).setCellValue("未缴费");
-			}
-			row.createCell(6).setCellValue(null == obj.getApplicationFee() ? 0 : obj.getApplicationFee());
-			row.createCell(7).setCellValue(null == obj.getTrialFee() ? 0 : obj.getTrialFee());
-			row.createCell(8).setCellValue(null == obj.getPrintingFee() ? 0 : obj.getPrintingFee());
-
-			if (null != obj.getFunds()) {
-				switch (obj.getFunds()) {
-				case 0:
-					row.createCell(9).setCellValue("否");
-					break;
-				case 1:
-					row.createCell(9).setCellValue("是");
-				}
-			} else {
-				row.createCell(9).setCellValue("否");
-			}
-
-			if (null != obj.getReimbursement()) {
-				switch (obj.getReimbursement()) {
-				case 0:
-					row.createCell(10).setCellValue("否");
-					break;
-				case 1:
-					row.createCell(10).setCellValue("是");
-				}
-			} else {
-				row.createCell(10).setCellValue("否");
-			}
-
-			row.createCell(11).setCellValue(obj.getPatentApplicationDateFormattedDate());
-			row.createCell(12).setCellValue(null == obj.getPatentApplicationDateFormattedDate() ? ""
-					: calDeadline(obj.getPatentApplicationDateFormattedDate()));
-
-		}
-		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
-	}
-
-	// 待缴年登印费专利管理报表
-	private void exportPendings(HttpServletResponse response, List<PatentPendingBo> pendings) {
-		String sheetName = "待缴年登印费专利管理报表";
-		HSSFWorkbook workbook = createWorkbook(sheetName,
-				new String[] { "编号", "申请号/专利号", "省份", "公司名称", "专利类型", "专利名称", "专利状态", "缴费状态", "缴费截止日期" });
-
-		HSSFSheet sheet = workbook.getSheet(sheetName);
-
-		for (int i = 0; i < pendings.size(); i++) {
-			PatentPendingBo obj = pendings.get(i);
-			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
-			if (null == obj.getSerialNumber()) {
-				row.createCell(0).setCellValue("");
-			} else {
-				row.createCell(0).setCellValue(obj.getSerialNumber());
-			}
-			row.createCell(1).setCellValue(obj.getPatentNumber());
-			row.createCell(2).setCellValue(obj.getLocationProvince());
-			row.createCell(3).setCellValue(obj.getUnitName());
-			if (null != obj.getPatentCatagory()) {
-				switch (obj.getPatentCatagory()) {
-				case 0:
-					row.createCell(4).setCellValue("发明型专利");
-					break;
-				case 1:
-					row.createCell(4).setCellValue("科技型专利");
-					break;
-				case 2:
-					row.createCell(4).setCellValue("外观型专利");
-					break;
-				}
-			} else {
-				row.createCell(4).setCellValue("");
-			}
-			row.createCell(5).setCellValue(obj.getPatentName());
-			row.createCell(6).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			if (null != obj.getAnnualFeeState()) {
-				switch (obj.getAnnualFeeState()) {
-				case 0:
-					row.createCell(7).setCellValue("未缴费");
-					break;
-				case 1:
-					row.createCell(7).setCellValue("已缴费");
-					break;
-				}
-			} else {
-				row.createCell(7).setCellValue("未缴费");
-			}
-			row.createCell(8).setCellValue(null == obj.getAuthorizedDateFormattedDate() ? ""
-					: calDeadline(obj.getAuthorizedDateFormattedDate()));
-
-		}
-		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
-	}
-
-	private void exportComosites(HttpServletResponse response, List<PatentCompositeBo> composites) {
-		String sheetName = "专利综合管理报表";
-		HSSFWorkbook workbook = createWorkbook(sheetName,
-				new String[] { "编号", "申请号/专利号", "事务所", "省份", "公司名称", "专利名称", "专利状态", "派单日", "申请日", "授权日", "资料撰写人" });
-		HSSFSheet sheet = workbook.getSheet(sheetName);
-
-		// 将查询出的数据设置到sheet对应的单元格中
-		for (int i = 0; i < composites.size(); i++) {
-			PatentCompositeBo obj = composites.get(i);// 遍历每个对象
-			HSSFRow row = sheet.createRow(i + 2);// 创建所需的行数
-			if (null == obj.getSerialNumber()) {
-				row.createCell(0).setCellValue("");
-			} else {
-				row.createCell(0).setCellValue(obj.getSerialNumber());
-			}
-			row.createCell(1).setCellValue(obj.getPatentNumber());
-			row.createCell(2).setCellValue(obj.getOffice());
-			row.createCell(3).setCellValue(obj.getLocationProvince());
-			row.createCell(4).setCellValue(obj.getUnitName());
-			row.createCell(5).setCellValue(obj.getPatentName());
-			row.createCell(6).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			row.createCell(7).setCellValue(null == obj.getPatentState() ? "" : switchPatState(obj.getPatentState()));
-			row.createCell(8).setCellValue(obj.getCreateTimeFormattedDate());
-			row.createCell(9).setCellValue(obj.getPatentApplicationFormattedDate());
-			row.createCell(10).setCellValue(obj.getPatentApplicationFormattedDate());
-			row.createCell(11).setCellValue(obj.getAuthor());
-		}
-		FileUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
-
-	}
-
-	private HSSFWorkbook createWorkbook(String sheetName, String[] colNames) {
-		HSSFWorkbook workbook = new HSSFWorkbook();
-		HSSFSheet sheet = workbook.createSheet(sheetName);
-		// 产生表格标题行
-		HSSFRow rowm = sheet.createRow(0);
-		HSSFCell cellTitle = rowm.createCell(0);
-		cellTitle.setCellValue(sheetName);
-		sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, (colNames.length - 1)));
-
-		HSSFRow rowRowName = sheet.createRow(1); // 在索引2的位置创建行(最顶端的行开始的第二行)
-
-		// 将列头设置到sheet的单元格中
-		for (int n = 0; n < colNames.length; n++) {
-			rowRowName.createCell(n).setCellValue(colNames[n]);
-		}
-		return workbook;
-	}
-
-	
-	
-	
-	
-
-	/**
-	 * 专利相关材料上传
-	 * 
-	 * @param req
-	 * @param sign
-	 *            材料类型标记,其中'patent_prory_statement'为专利代理委托书标记
-	 * @return
-	 *//*
-	@RequestMapping(value = "/patentFile", method = RequestMethod.POST)
-	public Result patentFile(HttpServletRequest req, String sign, String oid) {
-		Result res = new Result();
-		res.setData(handleFile(res, "/cognizannce/", true, req, sign, oid));
-		return res;
-	}*/
-	
-
-	/*private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req, String sign,
-			String oid) {
-		List<MultipartFile> files = getFiles(req);
-		MultipartFile mf = files.get(0);
-		String fileName = FileUtils.mosaicFileName(mf, isPrivate, sign, path,
-				StringUtils.isBlank(oid) ? TokenManager.getUserId() : oid);
-		if (!files.isEmpty()) {
-			try {
-				mf.transferTo(toPrivateFile(fileName));
-				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
-			} catch (IllegalStateException | IOException e) {
-				LoggerUtils.error(getClass(), "文件上传失败", e);
-				res.getError().add(buildError("", "文件上传失败!"));
-				return "";
-			}
-		} else {
-			res.getError().add(buildError("", "文件上传失败!"));
-			return "";
-		}
-		return fileName;
-	}*/
-
-	// 专利纸件收发登记
-	private Pagination<PatentRecieveSendBo> getRecieveSendList(Integer pNo, Integer pSize) {
-		return patentRegistrationService.getRecieveSendList(pNo, pSize);
-	}
-
-	// 专利申请费用管理
-	private Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate,
-			String locationProvince, Integer pNo, Integer pSize) throws ParseException {
-		return patentCostService.getApplicationFeeList(patentApplicationDate, locationProvince, pNo, pSize);
-	}
-
-	// 补正审查通知列表
-	private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
-			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
-			String patentName, Integer patentState, String author, Integer pNo, Integer pSize) {
-		return patentInfoService.getNoticeOfCorrectionList(authorizedDate, serialNumber, patentNumber, office,
-				locationProvince, unitName, patentCatagory, patentName, patentState, author, pNo, pSize);
-	}
-
-	// 待缴费专利管理
-	private Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo,
-			Integer pSize) {
-		return patentInfoService.getManagePendingPaymentList(locationProvince, pNo, pSize);
-	}
-
-	// 管理端申请专利列表(专利综合管理)
-	private Pagination<PatentManageListBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
-			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
-			String[] createTime, String[] patentApplicationDate, String author, Integer pNo, Integer pSize)
-			throws ParseException {
-		return patentInfoService.getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName,
-				patentCatagory, patentName, patentState, createTime, patentApplicationDate, author, pNo, pSize);
-	}
-
 	// 用户端申请专利列表
 	private Pagination<PatentInfo> getClientApplyList(Result res, String patentNumber, String patentName,
 			Integer patentCatagory, Integer patentState, Integer pNo, Integer pSize) {
@@ -898,123 +340,4 @@ public class PatentApiController extends CertifyApiController {
 				patentState, pNo, pSize);
 	}
 
-	private PatentRegistration regBo2Reg(String rid, String pid, PatentRegistrationBo patentRegistrationBo)
-			throws ParseException {
-		PatentRegistration patentRegistration = new PatentRegistration();
-		patentRegistration.setId(rid);
-		patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
-		if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
-			patentRegistration.setAcceptanceIssueTime(
-					DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), "yyyy-MM-dd"));
-		} else {
-			patentRegistration.setAcceptanceIssueTime(null);
-		}
-		if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
-			patentRegistration.setAcceptanceReceiveTime(
-					DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), "yyyy-MM-dd"));
-		} else {
-			patentRegistration.setAcceptanceReceiveTime(null);
-		}
-		patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
-		patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
-		if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
-			patentRegistration.setAuthorizationIssueTime(
-					DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), "yyyy-MM-dd"));
-		} else {
-			patentRegistration.setAuthorizationIssueTime(null);
-		}
-		if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
-			patentRegistration.setAuthorizationReceiveTime(
-					DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), "yyyy-MM-dd"));
-		} else {
-			patentRegistration.setAuthorizationReceiveTime(null);
-		}
-		patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
-		patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
-		if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
-			patentRegistration.setCertificateIssueTime(
-					DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), "yyyy-MM-dd"));
-
-		} else {
-			patentRegistration.setCertificateIssueTime(null);
-		}
-		if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
-			patentRegistration.setCertificateRecieveTime(
-					DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), "yyyy-MM-dd"));
-		} else {
-			patentRegistration.setCertificateRecieveTime(null);
-		}
-		patentRegistration.setCertificateTrackingNumber(patentRegistrationBo.getCertificateTrackingNumber());
-		patentRegistration.setPid(pid);
-		return patentRegistration;
-	}
-
-	// 缴费截止日期
-	private String calDeadline(String s) {
-		String[] arr = s.split("-");
-		String y = arr[0];
-		String m = arr[1];
-		String d = arr[2];
-		if ("11".equals(arr[0])) {
-			m = "01";
-			y = String.valueOf(Integer.parseInt(y) + 1);
-		} else if ("12".equals(arr[0])) {
-			m = "02";
-			y = String.valueOf(Integer.parseInt(y) + 1);
-		} else {
-			m = String.valueOf(Integer.parseInt(m) + 2);
-		}
-		return y + m + d;
-	}
-
-	// 专利状态
-	private String switchPatState(Integer s) {
-		String state = "";
-		switch (s) {
-		case 11:
-			state = "撤销";
-			break;
-		case 1:
-			state = "申请";
-			break;
-		case 2:
-			state = "撰写";
-			break;
-		case 3:
-			state = "受理";
-			break;
-		case 4:
-			state = "审查意见通知";
-			break;
-		case 5:
-			state = "审查意见已答复";
-			break;
-		case 6:
-			state = "补正通知";
-			break;
-		case 7:
-			state = "补正已答复";
-			break;
-		case 8:
-			state = "授权";
-			break;
-		case 9:
-			state = "驳回";
-			break;
-		case 10:
-			state = "发证";
-			break;
-		}
-		return state;
-	}
-
-	// 判断用户是否通过认证
-	private Result checkCertify(Result res, String uid) {
-		OrganizationIdentity o = organizationIdentityServivce.selectOrgIdentityByUserId(uid);
-		if (null == o || 5 != o.getAuditStatus()) {
-			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
-		}
-		return res;
-	}
-
 }

+ 0 - 15
src/main/java/com/goafanti/patent/service/AdminService.java

@@ -1,15 +0,0 @@
-package com.goafanti.patent.service;
-
-import java.util.List;
-
-import com.goafanti.common.model.Admin;
-
-public interface AdminService {
-
-	List<Admin> selectAllAdmin();
-
-	Admin selectByMobile(String username);
-
-	Admin selectByPrimaryKey(String key);
-
-}

+ 0 - 32
src/main/java/com/goafanti/patent/service/impl/AdminServiceImpl.java

@@ -1,32 +0,0 @@
-package com.goafanti.patent.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.model.Admin;
-import com.goafanti.patent.service.AdminService;
-
-@Service
-public class AdminServiceImpl implements AdminService {
-	@Autowired
-	private AdminMapper adminMapper;
-
-	@Override
-	public List<Admin> selectAllAdmin() {
-		return adminMapper.selectAllAdmin();
-	}
-
-	@Override
-	public Admin selectByMobile(String mobile) {
-		return adminMapper.selectByMobile(mobile);
-	}
-
-	@Override
-	public Admin selectByPrimaryKey(String key) {
-		return adminMapper.selectByPrimaryKey(key);
-	}
-
-}

+ 16 - 14
src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java

@@ -17,6 +17,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.patent.bo.PatentApplicationFeeBo;
 import com.goafanti.patent.service.PatentCostService;
+
 @Service
 public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> implements PatentCostService {
 	@Autowired
@@ -29,33 +30,34 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] pDate,
-			String locationProvince, Integer pageNo, Integer pageSize) throws ParseException {
+	public Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] pDate, String locationProvince,
+			Integer pageNo, Integer pageSize) throws ParseException {
 		Map<String, Object> params = new HashMap<>();
 		Date pStart = null;
 		Date pEnd = null;
-		
+
 		if (!TokenManager.hasRole("999999")) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-		
+
 		if (pDate != null && pDate.length > 0) {
 			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			pEnd = StringUtils.isBlank(pDate[1]) ? null :  DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			pEnd = StringUtils.isBlank(pDate[1]) ? null
+					: DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
 		}
-		
-		if (pStart != null){
+
+		if (pStart != null) {
 			params.put("pStart", pStart);
 		}
-		
-		if (pEnd != null){
+
+		if (pEnd != null) {
 			params.put("pEnd", pEnd);
 		}
-		
-		if (locationProvince != null && locationProvince != ""){
+
+		if (locationProvince != null && locationProvince != "") {
 			params.put("locationProvince", locationProvince);
 		}
-		
+
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}
@@ -63,8 +65,8 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 		if (pageSize == null || pageSize < 0) {
 			pageSize = 10;
 		}
-		return (Pagination<PatentApplicationFeeBo>) findPage("findApplicationFeeListByPage", "findApplicationFeeCount", params, pageNo,
-				pageSize);
+		return (Pagination<PatentApplicationFeeBo>) findPage("findApplicationFeeListByPage", "findApplicationFeeCount",
+				params, pageNo, pageSize);
 	}
 
 	@Override

+ 1 - 3
src/main/java/com/goafanti/permission/controller/PermissionApiController.java

@@ -4,9 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +22,7 @@ public class PermissionApiController extends BaseApiController {
 	private PermissionService permissionService;
 
 	@RequestMapping(value = "/permissions", method = RequestMethod.GET)
-	public Result permissions(String roomid, HttpServletRequest request, Model model) {
+	public Result permissions() {
 		Result res = new Result();
 		res.setData(permissionService.findPermissions());
 		return res;

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
@@ -24,7 +25,6 @@ import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.service.UserService;
 
 @Controller

+ 2 - 0
src/main/java/com/goafanti/user/service/OrgHumanResourceService.java

@@ -17,4 +17,6 @@ public interface OrgHumanResourceService {
 
 	OrgHumanResource selectOrgHumanResourceByUidAndYear(Integer year, String uid);
 
+	OrgHumanResource selectByPrimaryKey(String id);
+
 }

+ 5 - 0
src/main/java/com/goafanti/user/service/impl/OrgHumanResourceServiceImpl.java

@@ -63,4 +63,9 @@ public class OrgHumanResourceServiceImpl extends BaseMybatisDao<OrgHumanResource
 		return orgHumanResourceMapper.selectOrgHumanResourceByUidAndYear(year, uid);
 	}
 
+	@Override
+	public OrgHumanResource selectByPrimaryKey(String id) {
+		return orgHumanResourceMapper.selectByPrimaryKey(id);
+	}
+
 }