Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	schema/2017-03-14.sql
albertshaw 9 years ago
parent
commit
82b2ccb6fb
84 changed files with 867 additions and 798 deletions
  1. 2 0
      schema/2017-03-14.sql
  2. 66 96
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  3. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/ActivityNumberBo.java
  4. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportBo.java
  5. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportMainBo.java
  6. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportPropertyRightBo.java
  7. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceBo.java
  8. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceCatagoryBo.java
  9. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceDetailBo.java
  10. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceManageCostBo.java
  11. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceOrgInfoBo.java
  12. 1 1
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceResearchCostBo.java
  13. 38 70
      src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java
  14. 3 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgActivityCostService.java
  15. 4 2
      src/main/java/com/goafanti/techservice/cognizance/service/OrgActivityService.java
  16. 4 4
      src/main/java/com/goafanti/techservice/cognizance/service/OrgAnnualReportService.java
  17. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceLogService.java
  18. 13 7
      src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceService.java
  19. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgFinanceService.java
  20. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgHonorDatumService.java
  21. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgIntellectualPropertyService.java
  22. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgRatepayService.java
  23. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgStandardService.java
  24. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgTechAchievementService.java
  25. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgTechCenterDetailService.java
  26. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgTechCenterService.java
  27. 1 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgTechProductService.java
  28. 9 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgActivityCostServiceImpl.java
  29. 32 3
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgActivityServiceImpl.java
  30. 147 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  31. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceLogServiceImpl.java
  32. 212 0
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  33. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgFinanceServiceImpl.java
  34. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgHonorDatumServiceImpl.java
  35. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java
  36. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgRatepayServiceImpl.java
  37. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgStandardServiceImpl.java
  38. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechAchievementServiceImpl.java
  39. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java
  40. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechCenterServiceImpl.java
  41. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechProductServiceImpl.java
  42. 1 1
      src/main/java/com/goafanti/common/controller/WebpageController.java
  43. 2 0
      src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java
  44. 1 1
      src/main/java/com/goafanti/common/dao/OrgActivityMapper.java
  45. 2 2
      src/main/java/com/goafanti/common/dao/OrgAnnualReportMapper.java
  46. 4 4
      src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java
  47. 1 1
      src/main/java/com/goafanti/common/dao/PatentInfoMapper.java
  48. 1 1
      src/main/java/com/goafanti/common/dao/PatentRegistrationMapper.java
  49. 7 0
      src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml
  50. 1 1
      src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml
  51. 2 2
      src/main/java/com/goafanti/common/mapper/OrgAnnualReportMapper.xml
  52. 5 5
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  53. 1 1
      src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml
  54. 5 5
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  55. 1 1
      src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml
  56. 1 1
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  57. 5 0
      src/main/java/com/goafanti/common/model/Admin.java
  58. 2 0
      src/main/java/com/goafanti/common/model/AftUser.java
  59. 2 1
      src/main/java/com/goafanti/common/model/User.java
  60. 1 1
      src/main/java/com/goafanti/core/shiro/token/UserRealm.java
  61. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentApplicationFeeBo.java
  62. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentCompositeBo.java
  63. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentNoticeOfCorrectionBo.java
  64. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentPendingBo.java
  65. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentRecieveSendBo.java
  66. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentRegistrationBo.java
  67. 28 111
      src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java
  68. 1 1
      src/main/java/com/goafanti/techservice/patent/service/AdminService.java
  69. 2 2
      src/main/java/com/goafanti/techservice/patent/service/PatentCostService.java
  70. 11 5
      src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java
  71. 1 1
      src/main/java/com/goafanti/techservice/patent/service/PatentLogService.java
  72. 2 2
      src/main/java/com/goafanti/techservice/patent/service/PatentRegistrationService.java
  73. 2 2
      src/main/java/com/goafanti/techservice/patent/service/impl/AdminServiceImpl.java
  74. 3 3
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentCostServiceImpl.java
  75. 186 112
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentInfoServiceImpl.java
  76. 2 2
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentLogServiceImpl.java
  77. 3 3
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentRegistrationServiceImpl.java
  78. 0 144
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  79. 0 146
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceServiceImpl.java
  80. 1 1
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  81. 1 1
      src/main/resources/props/config_dev.properties
  82. 1 1
      src/main/resources/props/config_local.properties
  83. 1 1
      src/main/resources/props/config_prod.properties
  84. 1 1
      src/main/resources/props/config_test.properties

+ 2 - 0
schema/2017-03-14.sql

@@ -29,3 +29,5 @@ CREATE TABLE `copyright_log` (
   PRIMARY KEY (`id`),
   KEY `fk_copyright_log_copyright_info1_idx` (`cid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+alter table admin MODIFY COLUMN `id` VARCHAR(36) NOT NULL ;

+ 66 - 96
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -17,6 +18,22 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.admin.service.AftFileService;
+import com.goafanti.cognizance.bo.ActivityNumberBo;
+import com.goafanti.cognizance.bo.AnnualReportBo;
+import com.goafanti.cognizance.bo.CognizanceDetailBo;
+import com.goafanti.cognizance.service.OrgActivityCostService;
+import com.goafanti.cognizance.service.OrgActivityService;
+import com.goafanti.cognizance.service.OrgAnnualReportService;
+import com.goafanti.cognizance.service.OrgCognizanceLogService;
+import com.goafanti.cognizance.service.OrgCognizanceService;
+import com.goafanti.cognizance.service.OrgFinanceService;
+import com.goafanti.cognizance.service.OrgHonorDatumService;
+import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
+import com.goafanti.cognizance.service.OrgRatepayService;
+import com.goafanti.cognizance.service.OrgStandardService;
+import com.goafanti.cognizance.service.OrgTechAchievementService;
+import com.goafanti.cognizance.service.OrgTechCenterService;
+import com.goafanti.cognizance.service.OrgTechProductService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -45,23 +62,7 @@ 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.techservice.cognizance.bo.ActivityNumberBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceDetailBo;
-import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
-import com.goafanti.techservice.cognizance.service.OrgActivityService;
-import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
-import com.goafanti.techservice.cognizance.service.OrgCognizanceLogService;
-import com.goafanti.techservice.cognizance.service.OrgCognizanceService;
-import com.goafanti.techservice.cognizance.service.OrgFinanceService;
-import com.goafanti.techservice.cognizance.service.OrgHonorDatumService;
-import com.goafanti.techservice.cognizance.service.OrgIntellectualPropertyService;
-import com.goafanti.techservice.cognizance.service.OrgRatepayService;
-import com.goafanti.techservice.cognizance.service.OrgStandardService;
-import com.goafanti.techservice.cognizance.service.OrgTechAchievementService;
-import com.goafanti.techservice.cognizance.service.OrgTechCenterService;
-import com.goafanti.techservice.cognizance.service.OrgTechProductService;
-import com.goafanti.techservice.patent.service.AdminService;
+import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrgHumanResourceService;
@@ -203,7 +204,15 @@ public class AdminApiController extends BaseApiController {
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, "yyyy-MM-dd"));
 		}
-		res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
+		if (StringUtils.isBlank(userIdentity.getId())){
+			userIdentity.setId(UUID.randomUUID().toString());
+			userIdentity.setAuditStatus(0);
+			userIdentity.setProcess(0);
+			userIdentity.setWrongCount(0);
+			res.setData(userIdentityService.insert(userIdentity));
+		} else {
+			res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
+		}
 		return res;
 	}
 
@@ -264,7 +273,18 @@ public class AdminApiController extends BaseApiController {
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, "yyyy-MM-dd"));
 		}
-		res.setData(organizationIdentityService.updateByPrimaryKeySelective(orgIdentity));
+		if (StringUtils.isBlank(orgIdentity.getId())){
+			orgIdentity.setId(UUID.randomUUID().toString());
+			orgIdentity.setIdentityType(0);
+			orgIdentity.setAuditStatus(0);
+			orgIdentity.setProcess(0);
+			orgIdentity.setWrongCount(0);
+			orgIdentity.setListed(0);
+			orgIdentity.setListedType(0);
+			res.setData(organizationIdentityService.insert(orgIdentity));
+		} else {
+			res.setData(organizationIdentityService.updateByPrimaryKeySelective(orgIdentity));
+		}
 		return res;
 	}
 
@@ -302,7 +322,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/updateOrgHumanResource", method = RequestMethod.POST)
 	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource) {
 		Result res = new Result();
-		if (null == orgHumanResource.getId()) {
+		if (StringUtils.isBlank(orgHumanResource.getId())) {
 			if (null != orgHumanResourceService.selectOrgHumanResourceByUidAndYear(orgHumanResource.getYear(),
 					orgHumanResource.getUid())){
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度人力资源情况已录入!"));
@@ -381,8 +401,7 @@ public class AdminApiController extends BaseApiController {
 			orgIntellectualProperty
 					.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == orgIntellectualProperty.getId()) {
-
+		if (StringUtils.isBlank(orgIntellectualProperty.getId())) {
 			orgIntellectualProperty.setId(UUID.randomUUID().toString());
 			orgIntellectualProperty.setUid(uid);
 			orgIntellectualProperty.setEvaluationCategory(
@@ -502,26 +521,7 @@ public class AdminApiController extends BaseApiController {
 			orgActivity.setUid(TokenManager.getUserId());
 			orgActivityService.insert(orgActivity);
 		} else {
-			orgActivityService.updateByPrimaryKeySelective(orgActivity);
-			Boolean flag = false;
-			OrgActivityCost cost = orgActivityCostService.selectOrgActivityCostByAid(orgActivity.getId());
-			if (null != cost) {
-				if (!StringUtils.isBlank(orgActivity.getActivityNumber())) {
-					cost.setActivityNumber(orgActivity.getActivityNumber());
-					flag = true;
-				}
-				if (null == orgActivity.getStartDate()) {
-					cost.setStartDate(orgActivity.getStartDate());
-					flag = true;
-				}
-				if (null == orgActivity.getEndDate()) {
-					cost.setEndDate(orgActivity.getEndDate());
-					flag = true;
-				}
-			}
-			if (flag) {
-				orgActivityCostService.updateByPrimaryKeySelective(cost);
-			}
+			orgActivityService.updateOrgActivity(orgActivity);
 		}
 		res.setData(orgActivity);
 		return res;
@@ -566,7 +566,12 @@ public class AdminApiController extends BaseApiController {
 			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
 		}
 
-		if (null == orgActivityCost.getId()) {
+		if (StringUtils.isBlank(orgActivityCost.getId())) {
+			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
+					TokenManager.getUserId())){
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
+				return res;
+			}
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
 			orgActivityCost.setStartDate(ac.getStartDate());
 			orgActivityCost.setEndDate(ac.getEndDate());
@@ -589,7 +594,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/techProduct", method = RequestMethod.POST)
 	public Result techProduct(OrgTechProduct orgTechProduct) {
 		Result res = new Result();
-		if (null == orgTechProduct.getId()) {
+		if (StringUtils.isBlank(orgTechProduct.getId())) {
 			orgTechProduct.setId(UUID.randomUUID().toString());
 			orgTechProduct.setDeletedSign(0);
 			Calendar now = Calendar.getInstance();
@@ -633,7 +638,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeRatepay", method = RequestMethod.POST)
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
-		if (null == orgRatepay.getId()) {
+		if (StringUtils.isBlank(orgRatepay.getId())) {
 			if (null == orgRatepayService.selectRatepayByUidAndYear(orgRatepay.getUid(), orgRatepay.getYear())) {
 				orgRatepay.setId(UUID.randomUUID().toString());
 				orgRatepay.setDeletedSign(0);
@@ -680,7 +685,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
-		if (null == orgFinance.getId()) {
+		if (StringUtils.isBlank(orgFinance.getId())) {
 			if (null == orgFinanceService.selectFinanceByUidAndYear(orgFinance.getUid(), orgFinance.getYear())) {
 				orgFinance.setId(UUID.randomUUID().toString());
 				orgFinance.setDeletedSign(0);
@@ -744,7 +749,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
 	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
 		Result res = new Result();
-		if (null == achievement.getId()) {
+		if (StringUtils.isBlank(achievement.getId())) {
 			achievement.setId(UUID.randomUUID().toString());
 			achievement.setDeletedSign(0);
 			orgTechAchievementService.inset(achievement);
@@ -790,7 +795,7 @@ public class AdminApiController extends BaseApiController {
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == honor.getId()) {
+		if (StringUtils.isBlank(honor.getId())) {
 			honor.setId(UUID.randomUUID().toString());
 			honor.setUid(uid);
 			honor.setDeletedSign(0);
@@ -829,7 +834,7 @@ public class AdminApiController extends BaseApiController {
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == orgTechCenter.getId()) {
+		if (StringUtils.isBlank(orgTechCenter.getId())) {
 			orgTechCenter.setId(UUID.randomUUID().toString());
 			orgTechCenter.setUid(uid);
 			orgTechCenter.setDeletedSign(0);
@@ -864,30 +869,10 @@ public class AdminApiController extends BaseApiController {
 		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, uid)) {
 			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
 		}
-
-		OrgCognizance c = new OrgCognizance();
-		c.setId(UUID.randomUUID().toString());
-		c.setUid(uid);
-		c.setContacts(contacts);
-		c.setComment(comment);
-		c.setConsultant(consultant);
-		c.setYear(year);
-		c.setDeletedSign(0);
-		c.setState(state);
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		c.setRecordTime(now.getTime());
-		orgCognizanceService.insert(c);
-
-		OrgCognizanceLog log = new OrgCognizanceLog();
-		log.setId(UUID.randomUUID().toString());
-		log.setCid(c.getId());
-		log.setRecordTime(c.getCreateTime());
-		log.setState(state);
-		log.setComment(comment);
-		log.setPrincipal(userService.selectByPrimaryKey(uid).getAid());
-		log.setOperator(TokenManager.getAdminId());
-		orgCognizanceLogService.insert(log);
+		
+		String aid = userService.selectByPrimaryKey(uid).getAid();
+		orgCognizanceService.insertCognizance(contacts, comment, year,  state, aid, uid);
+		
 		return res;
 	}
 
@@ -951,28 +936,13 @@ public class AdminApiController extends BaseApiController {
 	public Result disposeCognizanceDetail(OrgCognizance cog, OrgCognizanceLog log, String recordTimeFormattedDate)
 			throws ParseException {
 		Result res = new Result();
-		if (null != log.getState()) {
-			cog.setState(log.getState());
-			switch (log.getState()) {
-			case 1:
-				cog.setCreateTime(log.getRecordTime());
-				break;
-			case 2:
-				cog.setAcceptDate(log.getRecordTime());
-				break;
-			case 5:
-				cog.setIssuingDate(log.getRecordTime());
-				break;
-			}
-			log.setId(UUID.randomUUID().toString());
-			log.setCid(cog.getId());
-			log.setOperator(TokenManager.getAdminId());
-			if (!StringUtils.isBlank(recordTimeFormattedDate)) {
-				log.setRecordTime(DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd"));
-			}
-			orgCognizanceLogService.insert(log);
+		Date recordTime = null;
+		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
+			recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
 		}
-		orgCognizanceService.updateByPrimaryKeySelective(cog);
+		orgCognizanceService.updateCognizance(cog, log, recordTime, TokenManager.getAdminId());
+		
+		
 		return res;
 	}
 
@@ -1015,7 +985,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAble", method = RequestMethod.POST)
 	public Result disposeAble(UserAbility u) {
 		Result res = new Result();
-		if (null == u.getId()) {
+		if (StringUtils.isBlank(u.getId())) {
 			u.setId(UUID.randomUUID().toString());
 			userAbilityService.insert(u);
 		} else {
@@ -1070,7 +1040,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
 	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
 		Result res = new Result();
-		if (null == orgAnnualReport.getId()) {
+		if (StringUtils.isBlank(orgAnnualReport.getId())) {
 			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
 					orgAnnualReport.getUid())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/ActivityNumberBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 /**
  * 项目活动编号
  */

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportMainBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 import java.util.Date;

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportPropertyRightBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 public class AnnualReportPropertyRightBo {
 	private String uid;

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceCatagoryBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceDetailBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceManageCostBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceOrgInfoBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceResearchCostBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.bo;
+package com.goafanti.cognizance.bo;
 
 import java.math.BigDecimal;
 

+ 38 - 70
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.controller;
+package com.goafanti.cognizance.controller;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -16,6 +16,23 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.goafanti.cognizance.bo.ActivityNumberBo;
+import com.goafanti.cognizance.bo.AnnualReportBo;
+import com.goafanti.cognizance.bo.CognizanceDetailBo;
+import com.goafanti.cognizance.service.OrgActivityCostService;
+import com.goafanti.cognizance.service.OrgActivityService;
+import com.goafanti.cognizance.service.OrgAnnualReportService;
+import com.goafanti.cognizance.service.OrgCognizanceLogService;
+import com.goafanti.cognizance.service.OrgCognizanceService;
+import com.goafanti.cognizance.service.OrgFinanceService;
+import com.goafanti.cognizance.service.OrgHonorDatumService;
+import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
+import com.goafanti.cognizance.service.OrgRatepayService;
+import com.goafanti.cognizance.service.OrgStandardService;
+import com.goafanti.cognizance.service.OrgTechAchievementService;
+import com.goafanti.cognizance.service.OrgTechCenterDetailService;
+import com.goafanti.cognizance.service.OrgTechCenterService;
+import com.goafanti.cognizance.service.OrgTechProductService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -39,23 +56,6 @@ import com.goafanti.common.utils.FileUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceDetailBo;
-import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
-import com.goafanti.techservice.cognizance.service.OrgActivityService;
-import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
-import com.goafanti.techservice.cognizance.service.OrgCognizanceLogService;
-import com.goafanti.techservice.cognizance.service.OrgCognizanceService;
-import com.goafanti.techservice.cognizance.service.OrgFinanceService;
-import com.goafanti.techservice.cognizance.service.OrgHonorDatumService;
-import com.goafanti.techservice.cognizance.service.OrgIntellectualPropertyService;
-import com.goafanti.techservice.cognizance.service.OrgRatepayService;
-import com.goafanti.techservice.cognizance.service.OrgStandardService;
-import com.goafanti.techservice.cognizance.service.OrgTechAchievementService;
-import com.goafanti.techservice.cognizance.service.OrgTechCenterDetailService;
-import com.goafanti.techservice.cognizance.service.OrgTechCenterService;
-import com.goafanti.techservice.cognizance.service.OrgTechProductService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserService;
 
@@ -151,26 +151,7 @@ public class CognizanceApiController extends BaseApiController {
 			orgActivity.setUid(TokenManager.getUserId());
 			orgActivityService.insert(orgActivity);
 		} else {
-			orgActivityService.updateByPrimaryKeySelective(orgActivity);
-			Boolean flag = false;
-			OrgActivityCost cost = orgActivityCostService.selectOrgActivityCostByAid(orgActivity.getId());
-			if (null != cost) {
-				if (!StringUtils.isBlank(orgActivity.getActivityNumber())) {
-					cost.setActivityNumber(orgActivity.getActivityNumber());
-					flag = true;
-				}
-				if (null == orgActivity.getStartDate()) {
-					cost.setStartDate(orgActivity.getStartDate());
-					flag = true;
-				}
-				if (null == orgActivity.getEndDate()) {
-					cost.setEndDate(orgActivity.getEndDate());
-					flag = true;
-				}
-			}
-			if (flag) {
-				orgActivityCostService.updateByPrimaryKeySelective(cost);
-			}
+			orgActivityService.updateOrgActivity(orgActivity);
 		}
 		res.setData(orgActivity);
 		return res;
@@ -232,7 +213,13 @@ public class CognizanceApiController extends BaseApiController {
 		if (!StringUtils.isBlank(signDateFormattedDate)) {
 			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == orgActivityCost.getId()) {
+		if (StringUtils.isBlank(orgActivityCost.getId())) {
+			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
+					TokenManager.getUserId())){
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
+				return res;
+			}
+			
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
 			orgActivityCost.setStartDate(ac.getStartDate());
 			orgActivityCost.setEndDate(ac.getEndDate());
@@ -343,7 +330,7 @@ public class CognizanceApiController extends BaseApiController {
 			orgIntellectualProperty
 					.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == orgIntellectualProperty.getId()) {
+		if (StringUtils.isBlank(orgIntellectualProperty.getId())) {
 			orgIntellectualProperty.setId(UUID.randomUUID().toString());
 			orgIntellectualProperty.setUid(TokenManager.getUserId());
 			orgIntellectualProperty.setEvaluationCategory(
@@ -496,7 +483,7 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeRatepay", method = RequestMethod.POST)
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
-		if (null == orgRatepay.getId()) {
+		if (StringUtils.isBlank(orgRatepay.getId())) {
 			if (null == orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), orgRatepay.getYear())) {
 				orgRatepay.setId(UUID.randomUUID().toString());
 				orgRatepay.setUid(TokenManager.getUserId());
@@ -561,7 +548,7 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
-		if (null == orgFinance.getId()) {
+		if (StringUtils.isBlank(orgFinance.getId())) {
 			if (null == orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), orgFinance.getYear())) {
 				orgFinance.setId(UUID.randomUUID().toString());
 				orgFinance.setUid(TokenManager.getUserId());
@@ -658,7 +645,7 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
 	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
 		Result res = new Result();
-		if (null == achievement.getId()) {
+		if (StringUtils.isBlank(achievement.getId())) {
 			achievement.setId(UUID.randomUUID().toString());
 			achievement.setUid(TokenManager.getUserId());
 			achievement.setDeletedSign(0);
@@ -722,7 +709,7 @@ public class CognizanceApiController extends BaseApiController {
 		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == honor.getId()) {
+		if (StringUtils.isBlank(honor.getId())) {
 			honor.setId(UUID.randomUUID().toString());
 			honor.setUid(TokenManager.getUserId());
 			honor.setDeletedSign(0);
@@ -777,7 +764,7 @@ public class CognizanceApiController extends BaseApiController {
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == orgTechCenter.getId()) {
+		if (StringUtils.isBlank(orgTechCenter.getId())) {
 			orgTechCenter.setId(UUID.randomUUID().toString());
 			orgTechCenter.setUid(TokenManager.getUserId());
 			orgTechCenter.setDeletedSign(0);
@@ -829,7 +816,7 @@ public class CognizanceApiController extends BaseApiController {
 		if (!StringUtils.isBlank(termTimeFormattedDate)) {
 			orgTechCenterDetail.setTermTime(DateUtils.parseDate(termTimeFormattedDate, "yyyy-MM-dd"));
 		}
-		if (null == orgTechCenterDetail.getId()) {
+		if (StringUtils.isBlank(orgTechCenterDetail.getId())) {
 			orgTechCenterDetail.setId(UUID.randomUUID().toString());
 			orgTechCenterDetail.setDeletedSign(0);
 			orgTechCenterDetailService.inset(orgTechCenterDetail);
@@ -902,29 +889,10 @@ public class CognizanceApiController extends BaseApiController {
 		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, TokenManager.getUserId())){
 			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
 		}
+		String aid = TokenManager.getToken().getAid();
+		orgCognizanceService.insertCognizance(contacts, comment, year,  state, aid, TokenManager.getUserId());
 		
-		OrgCognizance c = new OrgCognizance();
-		c.setId(UUID.randomUUID().toString());
-		c.setUid(TokenManager.getUserId());
-		c.setContacts(contacts);
-		c.setComment(comment);
-		c.setDeletedSign(0);
-		c.setYear(year);
-		c.setState(state);
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		c.setRecordTime(now.getTime());
-		orgCognizanceService.insert(c);
-
-		OrgCognizanceLog log = new OrgCognizanceLog();
-		log.setId(UUID.randomUUID().toString());
-		log.setCid(c.getId());
 		
-		log.setRecordTime(c.getCreateTime());
-		log.setState(state);
-		log.setComment(comment);
-		log.setPrincipal(userService.selectByPrimaryKey(TokenManager.getUserId()).getAid());
-		orgCognizanceLogService.insert(log);
 		return res;
 	}
 
@@ -1012,12 +980,12 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
 	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
 		Result res = new Result();
-		if (null == orgAnnualReport.getId()) {
+		if (StringUtils.isBlank(orgAnnualReport.getId())) {
 			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
 					TokenManager.getUserId())) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
 				return res;
-			} else {
+			} 
 				orgAnnualReport.setId(UUID.randomUUID().toString());
 				orgAnnualReport.setUid(TokenManager.getUserId());
 				Calendar now = Calendar.getInstance();
@@ -1026,7 +994,7 @@ public class CognizanceApiController extends BaseApiController {
 				orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
 				orgAnnualReport.setDeletedSign(0);
 				orgAnnualReportService.insert(orgAnnualReport);
-			}
+			
 		} else {
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);

+ 3 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgActivityCostService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.text.ParseException;
 import java.util.List;
@@ -21,4 +21,6 @@ public interface OrgActivityCostService {
 
 	int batchDeleteByAid(List<String> id);
 
+	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String userId);
+
 }

+ 4 - 2
src/main/java/com/goafanti/techservice/cognizance/service/OrgActivityService.java

@@ -1,11 +1,11 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.text.ParseException;
 import java.util.List;
 
+import com.goafanti.cognizance.bo.ActivityNumberBo;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
 
 public interface OrgActivityService {
 
@@ -22,5 +22,7 @@ public interface OrgActivityService {
 
 	List<ActivityNumberBo> selectOrgActivityNumberBoByUid(String uid);
 
+	void updateOrgActivity(OrgActivity orgActivity);
+
 
 }

+ 4 - 4
src/main/java/com/goafanti/techservice/cognizance/service/OrgAnnualReportService.java

@@ -1,13 +1,13 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.goafanti.cognizance.bo.AnnualReportBo;
+import com.goafanti.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.common.model.OrgAnnualReport;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.bo.AnnualReportBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 
 public interface OrgAnnualReportService {
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceLogService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 13 - 7
src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceService.java

@@ -1,16 +1,18 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
+import com.goafanti.cognizance.bo.CognizanceBo;
+import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
+import com.goafanti.cognizance.bo.CognizanceDetailBo;
+import com.goafanti.cognizance.bo.CognizanceManageCostBo;
+import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
+import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.common.model.OrgCognizance;
+import com.goafanti.common.model.OrgCognizanceLog;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.bo.CognizanceBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceCatagoryBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceDetailBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceManageCostBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceOrgInfoBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceResearchCostBo;
 
 public interface OrgCognizanceService {
 
@@ -36,5 +38,9 @@ public interface OrgCognizanceService {
 
 	CognizanceDetailBo selectCognizanceDetailBo(String uid, String cid, Integer year);
 
+	void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid);
+
+	void insertCognizance(Integer contacts, String comment, Integer year, Integer state, String aid, String uid);
+
 
 }

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgFinanceService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgHonorDatumService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgIntellectualPropertyService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgRatepayService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgStandardService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgTechAchievementService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgTechCenterDetailService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgTechCenterService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import com.goafanti.common.model.OrgTechCenter;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgTechProductService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.util.List;
 

+ 9 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -10,12 +10,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgActivityCostService;
 import com.goafanti.common.dao.OrgActivityCostMapper;
 import com.goafanti.common.model.OrgActivityCost;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
 @Service
 public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMapper> implements OrgActivityCostService {
 	@Autowired
@@ -91,4 +91,11 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 	public int batchDeleteByAid(List<String> aid) {
 		return orgActivityCostMapper.batchDeleteByAid(aid);
 	}
+
+
+	@Override
+	public OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid) {
+		// TODO Auto-generated method stub
+		return orgActivityCostMapper.selectOrgActivityCostByUidAndAid(aid, uid);
+	}
 }

+ 32 - 3
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -10,17 +10,21 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.bo.ActivityNumberBo;
+import com.goafanti.cognizance.service.OrgActivityService;
+import com.goafanti.common.dao.OrgActivityCostMapper;
 import com.goafanti.common.dao.OrgActivityMapper;
 import com.goafanti.common.model.OrgActivity;
+import com.goafanti.common.model.OrgActivityCost;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
-import com.goafanti.techservice.cognizance.service.OrgActivityService;
 @Service
 public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> implements OrgActivityService {
 	@Autowired
 	private OrgActivityMapper orgActivityMapper;
+	@Autowired
+	private OrgActivityCostMapper orgActivityCostMapper;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -90,4 +94,29 @@ public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> im
 	public List<ActivityNumberBo> selectOrgActivityNumberBoByUid(String uid) {
 		return orgActivityMapper.selectOrgActivityNumberBoByUid(uid);
 	}
+
+	@Override
+	public void updateOrgActivity(OrgActivity orgActivity) {
+		orgActivityMapper.updateByPrimaryKeySelective(orgActivity);
+		Boolean flag = false;
+		OrgActivityCost cost = orgActivityCostMapper.selectOrgActivityCostByAid(orgActivity.getId());
+		if (null != cost) {
+			if (!StringUtils.isBlank(orgActivity.getActivityNumber())) {
+				cost.setActivityNumber(orgActivity.getActivityNumber());
+				flag = true;
+			}
+			if (null == orgActivity.getStartDate()) {
+				cost.setStartDate(orgActivity.getStartDate());
+				flag = true;
+			}
+			if (null == orgActivity.getEndDate()) {
+				cost.setEndDate(orgActivity.getEndDate());
+				flag = true;
+			}
+		}
+		if (flag) {
+			orgActivityCostMapper.updateByPrimaryKeySelective(cost);
+		}
+		
+	}
 }

+ 147 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -0,0 +1,147 @@
+package com.goafanti.cognizance.service.impl;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.cognizance.bo.AnnualReportBo;
+import com.goafanti.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
+import com.goafanti.cognizance.service.OrgAnnualReportService;
+import com.goafanti.common.dao.OrgAnnualReportMapper;
+import com.goafanti.common.model.OrgAnnualReport;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+
+@Service
+public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMapper>
+		implements OrgAnnualReportService {
+	@Autowired
+	private OrgAnnualReportMapper orgAnnualReportMapper;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgAnnualReport> listOrgAnnualReport(Integer year, Integer state, Integer pageNo,
+			Integer pageSize, String uid) {
+		Map<String, Object> params = new HashMap<>();
+
+		if (year != null) {
+			params.put("year", year);
+		}
+
+		if (state != null) {
+			params.put("state", state);
+		}
+
+		if (!StringUtils.isBlank(uid)) {
+			params.put("uid", uid);
+		}
+
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<OrgAnnualReport>) findPage("findOrgAnnualReportListByPage", "findOrgAnnualReportCount",
+				params, pageNo, pageSize);
+	}
+
+	@Override
+	public int batchDeleteByPrimaryKey(List<String> id) {
+		return orgAnnualReportMapper.batchDeleteByPrimaryKey(id);
+	}
+
+	@Override
+	public OrgAnnualReport insert(OrgAnnualReport orgAnnualReport) {
+		orgAnnualReportMapper.insert(orgAnnualReport);
+		return orgAnnualReport;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgAnnualReport orgAnnualReport) {
+		return orgAnnualReportMapper.updateByPrimaryKeySelective(orgAnnualReport);
+	}
+
+	@Override
+	public AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(Integer year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+	}
+
+	@Override
+	public BigDecimal selectAnnualReportTerritoryByYearAndUid(Integer year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
+	}
+
+	@Override
+	public AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(Integer year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
+	}
+
+	@Override
+	public OrgAnnualReport selectAnnualReportByYearAndUid(Integer year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportByYearAndUid(year, uid);
+	}
+
+	@Override
+	public AnnualReportBo selectAnnualReportBo(String uid, Integer year) {
+		AnnualReportBo report = new AnnualReportBo();
+
+		AnnualReportPropertyRightBo p = orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+		if (null != p) {
+			report.setInventionPatent(null == p.getInventionPatent() ? 0 : p.getInventionPatent());
+			report.setDefensePatent(null == p.getDefensePatent() ? 0 : p.getDefensePatent());
+			report.setNationalCrop(null == p.getNationalCrop() ? 0 : p.getNationalCrop());
+			report.setNewPlantCariety(null == p.getNewPlantCariety() ? 0 : p.getNewPlantCariety());
+			report.setNationalDrug(null == p.getNationalDrug() ? 0 : p.getNationalDrug());
+			report.setChineseMedicine(null == p.getChineseMedicine() ? 0 : p.getChineseMedicine());
+			report.setUtilityPatent(null == p.getUtilityPatent() ? 0 : p.getUtilityPatent());
+			report.setCircuitDesign(null == p.getCircuitDesign() ? 0 : p.getCircuitDesign());
+			report.setExteriorPatent(null == p.getExteriorPatent() ? 0 : p.getExteriorPatent());
+			report.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
+		}
+
+		BigDecimal t = orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
+		report.setTerritory(null == t ? new BigDecimal(0) : t);
+
+		AnnualReportMainBo m = orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
+		if (null != m) {
+			report.setUid(m.getUid());
+			report.setUnitName(m.getUnitName());
+			report.setOrgCode(m.getOrgCode());
+			report.setLocationProvince(m.getLocationProvince());
+			report.setLocationCity(m.getLocationCity());
+			report.setLocationArea(m.getLocationArea());
+			report.setListed(m.getListed().toString());
+			if (null != m.getListedDate()) {
+				report.setListedDate(DateFormatUtils.format(m.getListedDate(), "yyyy-MM-dd"));
+			}
+			report.setListedType(m.getListedType().toString());
+			report.setStockCode(m.getStockCode());
+			report.setFirmTotal(null == m.getFirmTotal() ? 0 : m.getFirmTotal());
+			report.setTechTotal(null == m.getTechTotal() ? 0 : m.getTechTotal());
+			report.setNewEmployment(null == m.getNewEmployment() ? 0 : m.getNewEmployment());
+			report.setGraduateNumber(null == m.getGraduateNumber() ? 0 : m.getGraduateNumber());
+			report.setSalesRevenue(null == m.getSalesRevenue() ? new BigDecimal(0) : m.getSalesRevenue());
+			report.setGrossProfit(null == m.getGrossProfit() ? new BigDecimal(0) : m.getGrossProfit());
+			report.setNetAsset(null == m.getNetAsset() ? new BigDecimal(0) : m.getNetAsset());
+			report.setCertificateNumber(m.getCertificateNumber());
+			if (null != m.getIssuingDate()) {
+				report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), "yyyy-MM-dd"));
+			}
+			report.setContacts(m.getContacts());
+			report.setResearchCost(null == m.getResearchCost() ? new BigDecimal(0) : m.getResearchCost());
+			report.setTotalRevenue(null == m.getTotalRevenue() ? new BigDecimal(0) : m.getTotalRevenue());
+			report.setLastYearRevenue(null == m.getLastYearRevenue() ? new BigDecimal(0) : m.getLastYearRevenue());
+		}
+		return report;
+	}
+
+}

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceLogServiceImpl.java

@@ -1,13 +1,13 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgCognizanceLogService;
 import com.goafanti.common.dao.OrgCognizanceLogMapper;
 import com.goafanti.common.model.OrgCognizanceLog;
-import com.goafanti.techservice.cognizance.service.OrgCognizanceLogService;
 @Service
 public class OrgCognizanceLogServiceImpl implements OrgCognizanceLogService {
 	@Autowired

+ 212 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -0,0 +1,212 @@
+package com.goafanti.cognizance.service.impl;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.cognizance.bo.CognizanceBo;
+import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
+import com.goafanti.cognizance.bo.CognizanceDetailBo;
+import com.goafanti.cognizance.bo.CognizanceManageCostBo;
+import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
+import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
+import com.goafanti.cognizance.service.OrgCognizanceService;
+import com.goafanti.common.dao.OrgCognizanceLogMapper;
+import com.goafanti.common.dao.OrgCognizanceMapper;
+import com.goafanti.common.model.OrgCognizance;
+import com.goafanti.common.model.OrgCognizanceLog;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+@Service
+public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper> implements OrgCognizanceService {
+	@Autowired
+	private OrgCognizanceMapper orgCognizanceMapper;
+	@Autowired
+	private OrgCognizanceLogMapper orgCognizanceLogMapper;
+
+	@Override
+	public OrgCognizance insert(OrgCognizance c) {
+		orgCognizanceMapper.insert(c);
+		return c;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<CognizanceBo> listCognizance(String uid, String locationProvince,  Integer pageNo,
+			Integer pageSize) {
+		Map<String, Object> params = new HashMap<>();
+		
+		if (!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
+		if (!StringUtils.isBlank(locationProvince)){
+			params.put("locationProvince", locationProvince);
+		}
+		
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<CognizanceBo>) findPage("findCognizanceBoByPage","findCognizanceBoCount", params, pageNo,
+				pageSize);
+	}
+	
+	@Override
+	public CognizanceDetailBo selectCognizanceDetailBo(String uid, String cid, Integer year){
+		CognizanceDetailBo cog = new CognizanceDetailBo();
+		
+		CognizanceOrgInfoBo orgInfo = orgCognizanceMapper.selectCognizanceOrgInfoBoByUidAndCid(uid, cid);
+		if (null != orgInfo){
+			cog.setUid(null == orgInfo.getUid() ? "" : orgInfo.getUid());
+			cog.setCid(null == orgInfo.getCid() ? "" : orgInfo.getCid());
+			cog.setUnitName(null == orgInfo.getUnitName() ? "" : orgInfo.getUnitName());
+			cog.setOrgCode(null == orgInfo.getOrgCode() ? "" : orgInfo.getOrgCode());
+			cog.setPostalAddress(null == orgInfo.getPostalAddress() ? "" : orgInfo.getPostalAddress());
+			cog.setContacts(null == orgInfo.getContacts() ? "" : orgInfo.getContacts().toString());//联系人
+			cog.setTechnicalField1(null == orgInfo.getTechnicalField1() ? 0 : orgInfo.getTechnicalField1());
+			cog.setTechnicalField2(null == orgInfo.getTechnicalField2() ? 0 : orgInfo.getTechnicalField2());
+			cog.setTechnicalField3(null == orgInfo.getTechnicalField3() ? 0 : orgInfo.getTechnicalField3());
+			cog.setBasicResearchCost(
+					null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
+			cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
+		}
+		
+		CognizanceResearchCostBo researchCost = orgCognizanceMapper.selectCognizanceResearchCostBoByUidAndYear(year,
+				uid);
+		if (null != researchCost) {
+			cog.setResearchCost(
+					null == researchCost.getResearchCost() ? new BigDecimal(0) : researchCost.getResearchCost());
+			cog.setTerritory(null == researchCost.getTerritory() ? new BigDecimal(0) : researchCost.getTerritory());
+		}
+		
+		CognizanceManageCostBo manageCost = orgCognizanceMapper.selectCognizanceManageCostBoByUidAndYear(year, uid);
+		if (null != manageCost) {
+			cog.setNetAsset1(null == manageCost.getNetAsset1() ? new BigDecimal(0) : manageCost.getNetAsset1());
+			cog.setNetAsset2(null == manageCost.getNetAsset2() ? new BigDecimal(0) : manageCost.getNetAsset2());
+			cog.setNetAsset3(null == manageCost.getNetAsset3() ? new BigDecimal(0) : manageCost.getNetAsset3());
+			cog.setSalesRevenue1(null == manageCost.getSalesRevenue1() ? new BigDecimal(0) : manageCost.getSalesRevenue1());
+			cog.setSalesRevenue2(null == manageCost.getSalesRevenue2() ? new BigDecimal(0) : manageCost.getSalesRevenue2());
+			cog.setSalesRevenue3(null == manageCost.getSalesRevenue3() ? new BigDecimal(0) : manageCost.getSalesRevenue3());
+			cog.setGrossProfit1(null == manageCost.getGrossProfit1() ? new BigDecimal(0) : manageCost.getGrossProfit1());
+			cog.setGrossProfit2(null == manageCost.getGrossProfit2() ? new BigDecimal(0) : manageCost.getGrossProfit2());
+			cog.setGrossProfit3(null == manageCost.getGrossProfit3() ? new BigDecimal(0) : manageCost.getGrossProfit3());
+		}
+		
+		CognizanceCatagoryBo catagory = orgCognizanceMapper.selectCognizanceCatagoryBoByUidAndYear(year, uid);
+		if (null != catagory){
+			cog.setFirstCatagory(null == catagory.getFirstCatagory() ? 0 : catagory.getFirstCatagory());
+			cog.setSecondCatagory(null == catagory.getSecondCatagory() ? 0 : catagory.getSecondCatagory());
+			cog.setFirmTotal(null == catagory.getFirmTotal() ? 0 : catagory.getFirmTotal());
+			cog.setTechTotal(null == catagory.getTechTotal() ? 0 : catagory.getTechTotal());
+			cog.setTotalRevenue(null == catagory.getTotalRevenue() ? new BigDecimal(0) : catagory.getTotalRevenue());
+		}
+		BigDecimal revenue = orgCognizanceMapper.selectLastYearRevenueByUidAndYear(year, uid);
+		cog.setLastYearRevenue(null == revenue ? new BigDecimal(0) : revenue);
+		return cog;
+	}
+
+	@Override
+	public CognizanceOrgInfoBo selectCognizanceOrgInfoBoByUidAndCid(String uid, String cid) {
+		return orgCognizanceMapper.selectCognizanceOrgInfoBoByUidAndCid(uid, cid);
+	}
+
+	@Override
+	public CognizanceResearchCostBo selectCognizanceResearchCostBoByUidAndYear(Integer year, String uid) {
+		return orgCognizanceMapper.selectCognizanceResearchCostBoByUidAndYear(year, uid);
+	}
+
+	@Override
+	public CognizanceManageCostBo selectCognizanceManageCostBoByUidAndYear(Integer year, String uid) {
+		return orgCognizanceMapper.selectCognizanceManageCostBoByUidAndYear(year, uid);
+	}
+
+	@Override
+	public CognizanceCatagoryBo selectCognizanceCatagoryBoByUidAndYear(Integer year, String uid) {
+		return orgCognizanceMapper.selectCognizanceCatagoryBoByUidAndYear(year, uid);
+	}
+
+	@Override
+	public BigDecimal selectLastYearRevenueByUidAndYear(Integer year, String uid) {
+		return orgCognizanceMapper.selectLastYearRevenueByUidAndYear(year, uid);
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgCognizance cog) {
+		return orgCognizanceMapper.updateByPrimaryKeySelective(cog);
+	}
+
+	@Override
+	public OrgCognizance selectCognizanceByUidAndYear(Integer year, String uid) {
+		return orgCognizanceMapper.selectCognizanceByUidAndYear(year, uid);
+	}
+
+	@Override
+	public int batchDeleteByPrimaryKey(List<String> id) {
+		return orgCognizanceMapper.batchDeleteByPrimaryKey(id);
+	}
+
+	@Override
+	public void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid) {
+		if (null != log.getState()) {
+			log.setRecordTime(recordTime);
+			cog.setState(log.getState());
+			switch (log.getState()) {
+			case 1:
+				cog.setCreateTime(log.getRecordTime());
+				break;
+			case 2:
+				cog.setAcceptDate(log.getRecordTime());
+				break;
+			case 5:
+				cog.setIssuingDate(log.getRecordTime());
+				break;
+			}
+			log.setId(UUID.randomUUID().toString());
+			log.setCid(cog.getId());
+			log.setOperator(aid);
+			orgCognizanceLogMapper.insert(log);
+		}
+		orgCognizanceMapper.updateByPrimaryKeySelective(cog);
+		
+	}
+
+	@Override
+	public void insertCognizance(Integer contacts, String comment, Integer year, Integer state, String aid, String uid) {
+		OrgCognizance c = new OrgCognizance();
+		c.setId(UUID.randomUUID().toString());
+		c.setUid(uid);
+		c.setContacts(contacts);
+		c.setComment(comment);
+		c.setDeletedSign(0);
+		c.setYear(year);
+		c.setState(state);
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		c.setRecordTime(now.getTime());
+		orgCognizanceMapper.insert(c);
+
+		OrgCognizanceLog log = new OrgCognizanceLog();
+		log.setId(UUID.randomUUID().toString());
+		log.setCid(c.getId());
+		
+		log.setRecordTime(c.getCreateTime());
+		log.setState(state);
+		log.setComment(comment);
+		log.setPrincipal(aid);
+		orgCognizanceLogMapper.insert(log);
+		
+	}
+}

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgFinanceServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgFinanceService;
 import com.goafanti.common.dao.OrgFinanceMapper;
 import com.goafanti.common.model.OrgFinance;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgFinanceService;
 @Service
 public class OrgFinanceServiceImpl  extends BaseMybatisDao<OrgFinanceMapper> implements OrgFinanceService {
 	@Autowired

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgHonorDatumServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgHonorDatumService;
 import com.goafanti.common.dao.OrgHonorDatumMapper;
 import com.goafanti.common.model.OrgHonorDatum;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgHonorDatumService;
 @Service
 public class OrgHonorDatumServiceImpl extends BaseMybatisDao<OrgHonorDatumMapper> implements OrgHonorDatumService {
 	@Autowired

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgIntellectualPropertyServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.model.OrgIntellectualProperty;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgIntellectualPropertyService;
 
 @Service
 public class OrgIntellectualPropertyServiceImpl extends BaseMybatisDao<OrgIntellectualPropertyMapper>

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgRatepayServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgRatepayService;
 import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.model.OrgRatepay;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgRatepayService;
 @Service
 public class OrgRatepayServiceImpl extends BaseMybatisDao<OrgRatepayMapper> implements OrgRatepayService {
 	@Autowired

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgStandardServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgStandardService;
 import com.goafanti.common.dao.OrgStandardMapper;
 import com.goafanti.common.model.OrgStandard;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgStandardService;
 
 @Service
 public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> implements OrgStandardService {

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechAchievementServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgTechAchievementService;
 import com.goafanti.common.dao.OrgTechAchievementMapper;
 import com.goafanti.common.model.OrgTechAchievement;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgTechAchievementService;
 @Service
 public class OrgTechAchievementServiceImpl extends BaseMybatisDao<OrgTechAchievementMapper> implements OrgTechAchievementService {
 	@Autowired

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -8,11 +8,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgTechCenterDetailService;
 import com.goafanti.common.dao.OrgTechCenterDetailMapper;
 import com.goafanti.common.model.OrgTechCenterDetail;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgTechCenterDetailService;
 @Service
 public class OrgTechCenterDetailServiceImpl extends BaseMybatisDao<OrgTechCenterDetailMapper> implements OrgTechCenterDetailService {
 	@Autowired

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechCenterServiceImpl.java

@@ -1,11 +1,11 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgTechCenterService;
 import com.goafanti.common.dao.OrgTechCenterMapper;
 import com.goafanti.common.model.OrgTechCenter;
-import com.goafanti.techservice.cognizance.service.OrgTechCenterService;
 @Service
 public class OrgTechCenterServiceImpl implements OrgTechCenterService {
 	@Autowired

+ 2 - 2
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgTechProductServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -9,11 +9,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.cognizance.service.OrgTechProductService;
 import com.goafanti.common.dao.OrgTechProductMapper;
 import com.goafanti.common.model.OrgTechProduct;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.service.OrgTechProductService;
 @Service
 public class OrgTechProductServiceImpl extends BaseMybatisDao<OrgTechProductMapper> implements OrgTechProductService {
 	@Autowired

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

@@ -12,7 +12,7 @@ import org.springframework.web.servlet.view.RedirectView;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.techservice.patent.service.AdminService;
+import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.service.UserService;
 
 

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java

@@ -22,4 +22,6 @@ public interface OrgActivityCostMapper {
 	OrgActivityCost selectOrgActivityCostByAid(String aid);
 
 	int batchDeleteByAid(List<String> aid);
+
+	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid);
 }

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrgActivityMapper.java

@@ -2,8 +2,8 @@ package com.goafanti.common.dao;
 
 import java.util.List;
 
+import com.goafanti.cognizance.bo.ActivityNumberBo;
 import com.goafanti.common.model.OrgActivity;
-import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
 
 public interface OrgActivityMapper {
     int deleteByPrimaryKey(String id);

+ 2 - 2
src/main/java/com/goafanti/common/dao/OrgAnnualReportMapper.java

@@ -3,9 +3,9 @@ package com.goafanti.common.dao;
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.goafanti.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.common.model.OrgAnnualReport;
-import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 
 public interface OrgAnnualReportMapper {
     int deleteByPrimaryKey(String id);

+ 4 - 4
src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java

@@ -3,11 +3,11 @@ package com.goafanti.common.dao;
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.goafanti.cognizance.bo.CognizanceCatagoryBo;
+import com.goafanti.cognizance.bo.CognizanceManageCostBo;
+import com.goafanti.cognizance.bo.CognizanceOrgInfoBo;
+import com.goafanti.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.common.model.OrgCognizance;
-import com.goafanti.techservice.cognizance.bo.CognizanceCatagoryBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceManageCostBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceOrgInfoBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceResearchCostBo;
 
 public interface OrgCognizanceMapper {
     int deleteByPrimaryKey(String id);

+ 1 - 1
src/main/java/com/goafanti/common/dao/PatentInfoMapper.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.model.PatentInfo;
-import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
+import com.goafanti.patent.bo.PatentRecieveSendBo;
 
 public interface PatentInfoMapper {
     int deleteByPrimaryKey(String id);

+ 1 - 1
src/main/java/com/goafanti/common/dao/PatentRegistrationMapper.java

@@ -2,7 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.PatentRegistration;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
+import com.goafanti.patent.bo.PatentRecieveSendBo;
 
 public interface PatentRegistrationMapper {
     int deleteByPrimaryKey(String id);

+ 7 - 0
src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml

@@ -339,4 +339,11 @@
 		#{item}
 	</foreach>
   </update>
+  
+  <select id="selectOrgActivityCostByUidAndAid" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_activity_cost
+    where aid = #{0} and uid = #{1} and deleted_sign = 0
+  </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml

@@ -360,7 +360,7 @@
   </update>
   
   
-  <select id="selectOrgActivityNumberBoByUid" parameterType="java.lang.String" resultType="com.goafanti.techservice.cognizance.bo.ActivityNumberBo">
+  <select id="selectOrgActivityNumberBoByUid" parameterType="java.lang.String" resultType="com.goafanti.cognizance.bo.ActivityNumberBo">
   	  select id as aid, uid as uid, activity_number as activityNumber, activity_name as activityName
   	  from org_activity 
   	  where uid = #{uid,jdbcType=VARCHAR} and deleted_sign = 0

+ 2 - 2
src/main/java/com/goafanti/common/mapper/OrgAnnualReportMapper.xml

@@ -207,7 +207,7 @@
 		</foreach>
   </update>
   
-  <select id="selectAnnualReportPropertyRightBoByYearAndUid" resultType="com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo">
+  <select id="selectAnnualReportPropertyRightBoByYearAndUid" resultType="com.goafanti.cognizance.bo.AnnualReportPropertyRightBo">
   	select u.id as uid, a.utilityPatent, b.exteriorPatent, c.softwareWorks, d.defensePatent, e.newPlantCariety, f.nationalCrop,
 g.nationalDrug, h.chineseMedicine, i.circuitDesign, j.inventionPatent from 
 (
@@ -319,7 +319,7 @@ select uid, count(1) as inventionPatent
 		) m
   </select>
   
-  <select id="selectAnnualReportMainBoByYearAndUid" resultType="com.goafanti.techservice.cognizance.bo.AnnualReportMainBo">
+  <select id="selectAnnualReportMainBoByYearAndUid" resultType="com.goafanti.cognizance.bo.AnnualReportMainBo">
 		  select u.id as uid, o.unit_name as unitName, o.org_code as orgCode, o.location_province as locationProvince,
 			o.location_city as locationCity, o.location_area as locationArea, o.listed, o.listed_date as listedDate, 
 			o.listed_type as listedType, o.stock_code as stockCode, h.firm_total as firmTotal, h.tech_total as techTotal,

+ 5 - 5
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -269,7 +269,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  <select id="findCognizanceBoByPage" parameterType="String"  resultType="com.goafanti.techservice.cognizance.bo.CognizanceBo">
+  <select id="findCognizanceBoByPage" parameterType="String"  resultType="com.goafanti.cognizance.bo.CognizanceBo">
   	select x.uid, x.cid, x.serial_number as serialNumber, x.location_province as locationProvince, 
   	x.unit_name as unitName, x.contacts, x.create_time as createTime, x.comment, x.state, x.certificate_number as certificateNumber,
 	x.issuing_date as issuingDate, a.name as consultant, x.year, x.firstContacts, x.secondContacts, x.thirdContacts from 
@@ -313,7 +313,7 @@
 	</select>
 	
 	
-	<select id="selectCognizanceOrgInfoBoByUidAndCid"  resultType="com.goafanti.techservice.cognizance.bo.CognizanceOrgInfoBo">
+	<select id="selectCognizanceOrgInfoBoByUidAndCid"  resultType="com.goafanti.cognizance.bo.CognizanceOrgInfoBo">
 		select u.id as uid, c.id as cid, o.unit_name as unitName, o.org_code as orgCode, o.postal_address as postalAddress, 
 			c.contacts, c.technical_field1 as technicalField1, c.technical_field2 as technicalField2, c.technical_field3 as technicalField3,
 			c.basic_research_cost as basicResearchCost, c.accident
@@ -322,7 +322,7 @@
 			INNER JOIN org_cognizance c on c.uid = u.id  and c.deleted_sign = 0 and c.id = #{1}
 	</select>
 	
-	<select id="selectCognizanceResearchCostBoByUidAndYear"  resultType="com.goafanti.techservice.cognizance.bo.CognizanceResearchCostBo">
+	<select id="selectCognizanceResearchCostBoByUidAndYear"  resultType="com.goafanti.cognizance.bo.CognizanceResearchCostBo">
 		select m.uid, sum(m.cost1) as researchCost, sum(m.territory) as territory from(
 			select uid, (internal_labor_cost + internal_direct_cost + internal_depreciation_cost + internal_amortization_cost 
 			+ internal_design_cost + internal_equipment_cost + internal_other_cost +external_total_cost) as cost1, 
@@ -337,7 +337,7 @@
 
 	</select>
 	
-	<select id="selectCognizanceManageCostBoByUidAndYear"  resultType="com.goafanti.techservice.cognizance.bo.CognizanceManageCostBo">
+	<select id="selectCognizanceManageCostBoByUidAndYear"  resultType="com.goafanti.cognizance.bo.CognizanceManageCostBo">
 		select u.id as uid, a.netAsset1, a.salesRevenue1, a.grossProfit1, b.netAsset2, b.salesRevenue2, b.grossProfit2, 
 			  c.netAsset3, c.salesRevenue3, c.grossProfit3 from 
       (select id from user where id = #{1}) u
@@ -358,7 +358,7 @@
 			) c on c.uid = u.id
 	</select>
 	
-	<select id="selectCognizanceCatagoryBoByUidAndYear"  resultType="com.goafanti.techservice.cognizance.bo.CognizanceCatagoryBo">
+	<select id="selectCognizanceCatagoryBoByUidAndYear"  resultType="com.goafanti.cognizance.bo.CognizanceCatagoryBo">
 		 select u.id as uid, a.firstCatagory, b.secondCatagory, c.firmTotal, c.techTotal, d.totalRevenue FROM
 				(select id from user where id = #{1}) u 
 			LEFT JOIN

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml

@@ -151,7 +151,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  <select id="findApplicationFeeListByPage" parameterType="String" resultType="com.goafanti.techservice.patent.bo.PatentApplicationFeeBo">
+  <select id="findApplicationFeeListByPage" parameterType="String" resultType="com.goafanti.patent.bo.PatentApplicationFeeBo">
   	select m.uid as uid , m.pid as pid , m.oid ,
        		m.serialNumber ,m.patentNumber ,
      	    m.locationProvince , m.unitName , 

+ 5 - 5
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -79,8 +79,8 @@
       #{thirdInventorName,jdbcType=VARCHAR}, #{thirdInventorNationality,jdbcType=VARCHAR}, 
       #{thirdInventorIsPublish,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR}, 
       #{authorizedDate,jdbcType=TIMESTAMP},
-      #{office,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{recordTime,jdbcType=TIMESTAMP},
-      #{confirmState,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER})
+      #{office,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{confirmState,jdbcType=INTEGER}, #{recordTime,jdbcType=TIMESTAMP},
+       #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentInfo" >
     insert into patent_info
@@ -471,7 +471,7 @@
     </if>
   </select>
   
-  <select id="findManagePatentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentCompositeBo"  parameterType="String">
+  <select id="findManagePatentListByPage" resultType="com.goafanti.patent.bo.PatentCompositeBo"  parameterType="String">
   select    a.name as author,x.uid  , 
 	          x.oid  ,x.pid ,
 			  x.serialNumber,x.patentNumber,
@@ -618,7 +618,7 @@
 		
   </select>
   
-  <select id="findManagePendingPaymentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentPendingBo" parameterType="String">
+  <select id="findManagePendingPaymentListByPage" resultType="com.goafanti.patent.bo.PatentPendingBo" parameterType="String">
   	  select n.*,c.id as cid ,c.annual_fee_state as annualFeeState 
   	   from patent_cost c INNER JOIN
        (select u.id as uid , p.id as pid ,o.id as oid , p.serial_number as serialNumber ,p.patent_number as patentNumber ,
@@ -653,7 +653,7 @@
 		on n.pid= c.pid where c.annual_fee_state=0
   </select>
   
-  <select id="findNoticeOfCorrectionListByPage" parameterType="String"  resultType="com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo">
+  <select id="findNoticeOfCorrectionListByPage" parameterType="String"  resultType="com.goafanti.patent.bo.PatentNoticeOfCorrectionBo">
 	select u.id as uid ,p.id as pid , o.id as oid , p.serial_number as serialNumber , p.patent_number as patentNumber ,
 		 p.patent_name as patentName , p.office ,
 		 o.location_province as locationProvince ,o.unit_name as unitName , p.patent_catagory as patentCatagory ,

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml

@@ -203,7 +203,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  <select id="findRecieveSendList" resultType="com.goafanti.techservice.patent.bo.PatentRecieveSendBo">
+  <select id="findRecieveSendList" resultType="com.goafanti.patent.bo.PatentRecieveSendBo">
    select r.id as rid, r.acceptance_receive_time as acceptanceReceiveTime , r.acceptance_issue_time as acceptanceIssueTime, 
   	   r.acceptance_tracking_number as acceptanceTrackingNumber , r.acceptance_express_company as acceptanceExpressCompany,
        r.authorization_receive_time as authorizationReceiveTime , r.authorization_issue_time as authorizationIssueTime, 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -47,7 +47,7 @@
       aft_username, province, city, 
       area, contact_mobile, bank_name, 
       bank_account, bank_card_number, amount_money, 
-      audit_status, process, payment_date)
+      audit_status, process, wrong_count, payment_date)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 

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

@@ -95,4 +95,9 @@ public class Admin extends BaseModel implements AftUser{
     public void setNumber(Integer number) {
         this.number = number;
     }
+
+	@Override
+	public String getAid() {
+		return null;
+	}
 }

+ 2 - 0
src/main/java/com/goafanti/common/model/AftUser.java

@@ -8,4 +8,6 @@ public interface AftUser {
 	 String getPassword();
 	 
 	 Date getCreateTime();
+	 
+	 String getAid();
 }

+ 2 - 1
src/main/java/com/goafanti/common/model/User.java

@@ -140,7 +140,8 @@ public class User extends BaseModel implements AftUser{
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 	}
-
+    
+	@Override
 	public String getAid() {
 		return aid;
 	}

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

@@ -18,7 +18,7 @@ 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.techservice.patent.service.AdminService;
+import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.service.UserService;
 
 public class UserRealm extends AuthorizingRealm {

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentApplicationFeeBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.bo;
+package com.goafanti.patent.bo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentCompositeBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.bo;
+package com.goafanti.patent.bo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.bo;
+package com.goafanti.patent.bo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentPendingBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.bo;
+package com.goafanti.patent.bo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentRecieveSendBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.bo;
+package com.goafanti.patent.bo;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/bo/PatentRegistrationBo.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.bo;
+package com.goafanti.patent.bo;
 
 
 public class PatentRegistrationBo {

+ 28 - 111
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.controller;
+package com.goafanti.patent.controller;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -8,7 +8,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
+import java.util.TreeMap;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -26,11 +26,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.OrgIntellectualProperty;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.PatentCost;
 import com.goafanti.common.model.PatentInfo;
@@ -42,18 +42,17 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.techservice.cognizance.service.OrgIntellectualPropertyService;
-import com.goafanti.techservice.patent.bo.PatentApplicationFeeBo;
-import com.goafanti.techservice.patent.bo.PatentCompositeBo;
-import com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo;
-import com.goafanti.techservice.patent.bo.PatentPendingBo;
-import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
-import com.goafanti.techservice.patent.bo.PatentRegistrationBo;
-import com.goafanti.techservice.patent.service.AdminService;
-import com.goafanti.techservice.patent.service.PatentCostService;
-import com.goafanti.techservice.patent.service.PatentInfoService;
-import com.goafanti.techservice.patent.service.PatentLogService;
-import com.goafanti.techservice.patent.service.PatentRegistrationService;
+import com.goafanti.patent.bo.PatentApplicationFeeBo;
+import com.goafanti.patent.bo.PatentCompositeBo;
+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;
+import com.goafanti.patent.service.PatentRegistrationService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserService;
 
@@ -89,7 +88,7 @@ public class PatentApiController extends BaseApiController {
 		Result res = new Result();
 		res = checkCertify(res, TokenManager.getUserId());
 		if (res.getError().isEmpty()) {
-			res.setData(patentInfoService.savePatentInfo(patentInfo, TokenManager.getUserId())); 
+			res.setData(patentInfoService.savePatentInfo(patentInfo, TokenManager.getUserId(), TokenManager.getToken().getAid())); 
 		}
 		return res;
 	}
@@ -188,7 +187,7 @@ public class PatentApiController extends BaseApiController {
 	public Result getUnitNames() {
 		Result res = new Result();
 		List<OrganizationIdentity> list = organizationIdentityServivce.selectAllOrgIndentity();
-		Map<String, String> map = new LinkedHashMap<String, String>();
+		Map<String, String> map = new TreeMap<String, String>();
 		for (OrganizationIdentity o : list) {
 			map.put(o.getUid(), o.getUnitName());
 		}
@@ -219,18 +218,20 @@ public class PatentApiController extends BaseApiController {
 		Result res = new Result();
 		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
-			res.setData(patentInfoService.savePatentInfo(patentInfo, uid));
+			String aid = userService.selectByPrimaryKey(uid).getAid();
+			res.setData(patentInfoService.savePatentInfo(patentInfo, uid, 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) {
+			String xid, PatentLog patentLog, String recordTimeFormattedDate) throws ParseException {
 		Result res = new Result();
 		PatentInfo patentInfo = new PatentInfo();
 		patentInfo.setId(xid);
@@ -241,77 +242,12 @@ public class PatentApiController extends BaseApiController {
 		patentInfo.setPatentWritingUrl(patentWritingUrl);
 		patentInfo.setAuthorizationNoticeUrl(authorizationNoticeUrl);
 		patentInfo.setPatentCertificateUrl(patentCertificateUrl);
-		Date d;
+		Date recordTime = null;
 		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
-			try {
-				d = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
-			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_PATTERN_ERROR, "参数格式不正确", "yyyy-MM-dd"));
-				return res;
-			}
-		} else {
-			d = null;
-		}
-
-		if (!StringUtils.isBlank(patentLog.getPrincipal())) {
-			switch (patentLog.getState()) {
-			case 2:
-				patentInfo.setCreateTime(d);
-				break;
-			case 3:
-				patentInfo.setPatentApplicationDate(d);
-				break;
-			case 8:
-				patentInfo.setAuthorizedDate(d);
-				break;
-			}
-			patentInfo.setPatentState(patentLog.getState());
-			patentInfo.setPrincipal(patentLog.getPrincipal());
-			patentLog.setPid(xid);
-			patentLog.setId(UUID.randomUUID().toString());
-			patentLog.setRecordTime(d);
-			patentLog.setOperator(TokenManager.getAdminId());
-			patentLogService.insert(patentLog);
-		}
-		patentInfo.setId(xid);
-		patentInfoService.updateByPrimaryKeySelective(patentInfo);
-		if (8 == patentInfo.getPatentState()) {
-			OrgIntellectualProperty o = new OrgIntellectualProperty();
-			o.setId(UUID.randomUUID().toString());
-			o.setUid(patentInfo.getUid());
-			o.setPid(patentInfo.getId());
-			o.setDeletedSign(0);
-			o.setIntellectualPropertyNumber(patentInfo.getPatentNumber());
-			o.setIntellectualPropertyName(patentInfo.getPatentName());
-			o.setCatagory(1);
-			o.setObtainWay(1);
-			o.setAuthorizationNumber(patentInfo.getPatentNumber());
-			o.setAuthorizationDate(patentInfo.getAuthorizedDate());
-			o.setEvaluationCategory((3 == patentInfo.getPatentCatagory()) ? 0 : 1);
-			orgIntellectualPropertyService.insert(o);
-		}
-
-		if (10 == patentInfo.getPatentState()) {
-			OrgIntellectualProperty o = orgIntellectualPropertyService
-					.selectOrgIntellectualPropertyByPid(patentInfo.getId());
-			Integer i = 0;
-			switch (patentInfo.getPatentCatagory()) {
-			case 0:
-				i = 0;
-				break;
-			case 1:
-				i = 2;
-				break;
-			case 2:
-				i = 3;
-				break;
-			case 3:
-				i = 11;
-				break;
-			}
-			o.setCatagory(i);
-			orgIntellectualPropertyService.updateByPrimaryKeySelective(o);
+			 recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
 		}
+		patentInfoService.updatePatentInfo(patentInfo, patentLog, recordTime);
+
 		return res;
 	}
 
@@ -339,8 +275,8 @@ public class PatentApiController extends BaseApiController {
 	@RequestMapping(value = "/confirmPayment", method = RequestMethod.POST)
 	public Result confirmPayment(String cid) {
 		Result res = new Result();
-		if (null == cid) {
-			res.getError().add(buildError("确认缴费失败!"));
+		if (StringUtils.isBlank(cid)) {
+			res.getError().add(buildError("", "确认缴费失败!"));
 			return res;
 		}
 		PatentCost patentCost = new PatentCost();
@@ -377,28 +313,9 @@ public class PatentApiController extends BaseApiController {
 	@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
 	public Result replyConfirm(String pid, Integer patentState) {
 		Result res = new Result();
-		PatentInfo patentInfo = new PatentInfo();
-		patentInfo.setId(pid);
-		if (patentState == 4) {
-			patentInfo.setPatentState(5);
-		} else if (patentState == 6) {
-			patentInfo.setPatentState(7);
-		} else {
-			res.getError().add(buildError("通知答复确认失败!"));
-			return res;
+		if (StringUtils.isBlank(patentInfoService.updateNoticeOfCorrection(res, pid, patentState))){
+			res.getError().add(buildError("", "确认失败!"));
 		}
-		patentInfoService.updateByPrimaryKeySelective(patentInfo);
-		PatentLog patentLog = new PatentLog();
-		PatentInfo p = patentInfoService.selectByPrimaryKey(pid);
-		patentLog.setId(UUID.randomUUID().toString());
-		patentLog.setPid(pid);
-		patentLog.setState(p.getPatentState());
-		patentLog.setOperator(TokenManager.getAdminId());
-		patentLog.setPrincipal(p.getPrincipal());
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		patentLog.setRecordTime(now.getTime());
-		patentLogService.insert(patentLog);
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/service/AdminService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service;
+package com.goafanti.patent.service;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/com/goafanti/techservice/patent/service/PatentCostService.java

@@ -1,10 +1,10 @@
-package com.goafanti.techservice.patent.service;
+package com.goafanti.patent.service;
 
 import java.text.ParseException;
 
 import com.goafanti.common.model.PatentCost;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentApplicationFeeBo;
+import com.goafanti.patent.bo.PatentApplicationFeeBo;
 
 public interface PatentCostService {
 

+ 11 - 5
src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java

@@ -1,14 +1,16 @@
-package com.goafanti.techservice.patent.service;
+package com.goafanti.patent.service;
 
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.PatentInfo;
+import com.goafanti.common.model.PatentLog;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentCompositeBo;
-import com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo;
-import com.goafanti.techservice.patent.bo.PatentPendingBo;
+import com.goafanti.patent.bo.PatentCompositeBo;
+import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
+import com.goafanti.patent.bo.PatentPendingBo;
 
 public interface PatentInfoService {
 
@@ -36,7 +38,11 @@ public interface PatentInfoService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	PatentInfo savePatentInfo(PatentInfo patentInfo, String uid);
+	PatentInfo savePatentInfo(PatentInfo patentInfo, String uid, String aid);
+
+	void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime);
+
+	String updateNoticeOfCorrection(Result res, String pid, Integer patentState);
 
 
 }

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/service/PatentLogService.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service;
+package com.goafanti.patent.service;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/com/goafanti/techservice/patent/service/PatentRegistrationService.java

@@ -1,8 +1,8 @@
-package com.goafanti.techservice.patent.service;
+package com.goafanti.patent.service;
 
 import com.goafanti.common.model.PatentRegistration;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
+import com.goafanti.patent.bo.PatentRecieveSendBo;
 
 public interface PatentRegistrationService {
 

+ 2 - 2
src/main/java/com/goafanti/techservice/patent/service/impl/AdminServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service.impl;
+package com.goafanti.patent.service.impl;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.model.Admin;
-import com.goafanti.techservice.patent.service.AdminService;
+import com.goafanti.patent.service.AdminService;
 
 @Service
 public class AdminServiceImpl implements AdminService {

+ 3 - 3
src/main/java/com/goafanti/techservice/patent/service/impl/PatentCostServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service.impl;
+package com.goafanti.patent.service.impl;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -13,8 +13,8 @@ import com.goafanti.common.model.PatentCost;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentApplicationFeeBo;
-import com.goafanti.techservice.patent.service.PatentCostService;
+import com.goafanti.patent.bo.PatentApplicationFeeBo;
+import com.goafanti.patent.service.PatentCostService;
 @Service
 public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> implements PatentCostService {
 	@Autowired

+ 186 - 112
src/main/java/com/goafanti/techservice/patent/service/impl/PatentInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service.impl;
+package com.goafanti.patent.service.impl;
 
 import java.text.ParseException;
 import java.util.Calendar;
@@ -11,92 +11,92 @@ import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.dao.PatentCostMapper;
 import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.PatentLogMapper;
 import com.goafanti.common.dao.PatentRegistrationMapper;
 import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.model.OrgIntellectualProperty;
 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.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentCompositeBo;
-import com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo;
-import com.goafanti.techservice.patent.bo.PatentPendingBo;
-import com.goafanti.techservice.patent.service.PatentInfoService;
-
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.patent.bo.PatentCompositeBo;
+import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
+import com.goafanti.patent.bo.PatentPendingBo;
+import com.goafanti.patent.service.PatentInfoService;
 
 @Service
 public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> implements PatentInfoService {
 	@Autowired
-	PatentInfoMapper patentInfoMapper;
+	PatentInfoMapper				patentInfoMapper;
+	@Autowired
+	UserMapper						userMapper;
 	@Autowired
-	UserMapper      userMapper;
+	PatentRegistrationMapper		patentRegistrationMapper;
 	@Autowired
-	PatentRegistrationMapper patentRegistrationMapper;
+	PatentCostMapper				patentCostMapper;
 	@Autowired
-	PatentCostMapper patentCostMapper;
+	PatentLogMapper					patentLogMapper;
 	@Autowired
-	PatentLogMapper  patentLogMapper;
-	
-	
+	OrgIntellectualPropertyMapper	orgIntellectualPropertyMapper;
+
 	@Override
 	public PatentInfo selectPatentInfoByUserId(String uid) {
 		return patentInfoMapper.selectPatentInfoByUserId(uid);
 	}
 
-
 	@Override
 	public PatentInfo insert(PatentInfo patentInfo) {
 		patentInfoMapper.insert(patentInfo);
 		return patentInfo;
 	}
 
-
 	@Override
 	public int updateByPrimaryKeySelective(PatentInfo patentInfo) {
 		return patentInfoMapper.updateByPrimaryKeySelective(patentInfo);
 	}
 
-
 	@Override
 	public PatentInfo selectByPrimaryKey(String id) {
 		return patentInfoMapper.selectByPrimaryKey(id);
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<PatentInfo> getClientApplyList(String uid, String patentNumber, String patentName,
 			Integer patentCatagory, Integer patentState, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		
-		if (uid == null){
+
+		if (uid == null) {
 			return null;
-		}else{		
+		} else {
 			params.put("uid", uid);
 		}
-		
-		if (patentNumber != null && patentNumber != ""){
+
+		if (patentNumber != null && patentNumber != "") {
 			params.put("patentNumber", patentNumber);
 		}
-		
-		if (patentName != null && patentName != ""){
+
+		if (patentName != null && patentName != "") {
 			params.put("patentName", patentName);
 		}
-		
-		if (patentCatagory != null ){
+
+		if (patentCatagory != null) {
 			params.put("patentCatagory", patentCatagory);
 		}
-		
-		if(patentState != null){
+
+		if (patentState != null) {
 			params.put("patentState", patentState);
 		}
-			
+
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}
@@ -108,89 +108,82 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 				pageSize);
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
-			String[] cDate, String[] pDate , String author, Integer pageNo,
-			Integer pageSize) throws ParseException {
+			String[] cDate, String[] pDate, String author, Integer pageNo, Integer pageSize) throws ParseException {
 		Map<String, Object> params = new HashMap<>();
 		Date cStart = null;
 		Date cEnd = null;
 		Date pStart = null;
 		Date pEnd = null;
-		
-		
-		if(cDate != null && cDate.length>0){
-			 cStart = DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
-			 if(cDate.length == 2){
-				 cEnd = DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
-			 }
-		}
-		if(pDate != null && pDate.length>0){
+
+		if (cDate != null && cDate.length > 0) {
+			cStart = DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
+			if (cDate.length == 2) {
+				cEnd = DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
+			}
+		}
+		if (pDate != null && pDate.length > 0) {
 			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			if(pDate.length == 2){
+			if (pDate.length == 2) {
 				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
 			}
 		}
-		
-		
-		if(cStart != null){
+
+		if (cStart != null) {
 			params.put("cStart", cStart);
 		}
-		
-		if(cEnd != null){
+
+		if (cEnd != null) {
 			params.put("cEnd", cEnd);
 		}
-		
-		if(pStart != null){
+
+		if (pStart != null) {
 			params.put("pStart", pStart);
 		}
-		
-		if(pEnd != null){
+
+		if (pEnd != null) {
 			params.put("pEnd", pEnd);
 		}
-		
-		if(serialNumber != null ){
+
+		if (serialNumber != null) {
 			params.put("serialNumber", serialNumber);
 		}
-		
-		if(patentNumber != null && patentNumber != ""){
+
+		if (patentNumber != null && patentNumber != "") {
 			params.put("patentNumber", patentNumber);
 		}
-		
-		if(office != null && office != ""){
+
+		if (office != null && office != "") {
 			params.put("office", office);
 		}
-		
-		if(locationProvince != null && locationProvince != ""){
+
+		if (locationProvince != null && locationProvince != "") {
 			params.put("locationProvince", locationProvince);
 		}
-		
-		if(unitName != null && unitName != ""){
+
+		if (unitName != null && unitName != "") {
 			params.put("unitName", unitName);
 		}
-		
-		if(patentCatagory != null){
+
+		if (patentCatagory != null) {
 			params.put("patentCatagory", patentCatagory);
 		}
-		
-		if(patentName != null && patentName != ""){
+
+		if (patentName != null && patentName != "") {
 			params.put("patentName", patentName);
 		}
-		
-		if(patentState != null){
+
+		if (patentState != null) {
 			params.put("patentState", patentState);
 		}
-		
-		
-		
-		if(author != null && author != ""){
+
+		if (author != null && author != "") {
 			params.put("author", author);
 		}
-		
-		
+
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}
@@ -198,20 +191,20 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		if (pageSize == null || pageSize < 0) {
 			pageSize = 15;
 		}
-		return (Pagination<PatentCompositeBo>) findPage("findManagePatentListByPage","findManagePatentCount", params, pageNo, pageSize);
+		return (Pagination<PatentCompositeBo>) findPage("findManagePatentListByPage", "findManagePatentCount", params,
+				pageNo, pageSize);
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		
-		if(locationProvince != null && locationProvince != ""){
+
+		if (locationProvince != null && locationProvince != "") {
 			params.put("locationProvince", locationProvince);
 		}
-		
+
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}
@@ -219,58 +212,57 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		if (pageSize == null || pageSize < 0) {
 			pageSize = 15;
 		}
-		return (Pagination<PatentPendingBo>) findPage("findManagePendingPaymentListByPage","findManagePendingPaymentCount", params, pageNo, pageSize);
+		return (Pagination<PatentPendingBo>) findPage("findManagePendingPaymentListByPage",
+				"findManagePendingPaymentCount", params, pageNo, pageSize);
 	}
 
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, Integer serialNumber,
 			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		
-		if(authorizedDate != null ){
+
+		if (authorizedDate != null) {
 			params.put("authorizedDate", authorizedDate);
 		}
-		
-		if(serialNumber != null){
+
+		if (serialNumber != null) {
 			params.put("serialNumber", serialNumber);
 		}
-		
-		if(patentNumber != null && patentNumber != ""){
+
+		if (patentNumber != null && patentNumber != "") {
 			params.put(patentNumber, patentNumber);
 		}
-		
-		if(office != null && office != ""){
+
+		if (office != null && office != "") {
 			params.put("office", office);
 		}
-		
-		if(locationProvince != null && locationProvince != ""){
+
+		if (locationProvince != null && locationProvince != "") {
 			params.put("locationProvince", locationProvince);
 		}
-		
-		if(unitName != null && unitName != ""){
+
+		if (unitName != null && unitName != "") {
 			params.put("unitName", unitName);
 		}
-		
-		if(patentCatagory != null){
+
+		if (patentCatagory != null) {
 			params.put("patentCatagory", patentCatagory);
 		}
-		
-		if(patentName != null && patentName != ""){
+
+		if (patentName != null && patentName != "") {
 			params.put("patentName", patentName);
 		}
-		
-		if(patentState != null){
+
+		if (patentState != null) {
 			params.put("patentState", patentState);
 		}
-		
-		if(author != null && author != ""){
+
+		if (author != null && author != "") {
 			params.put("author", patentState);
 		}
-		
-		
+
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}
@@ -278,18 +270,17 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		if (pageSize == null || pageSize < 0) {
 			pageSize = 15;
 		}
-		return (Pagination<PatentNoticeOfCorrectionBo>) findPage("findNoticeOfCorrectionListByPage","findNoticeOfCorrectionCount", params, pageNo, pageSize);
+		return (Pagination<PatentNoticeOfCorrectionBo>) findPage("findNoticeOfCorrectionListByPage",
+				"findNoticeOfCorrectionCount", params, pageNo, pageSize);
 	}
 
-
 	@Override
 	public int batchDeleteByPrimaryKey(List<String> id) {
 		return patentInfoMapper.batchDeleteByPrimaryKey(id);
 	}
 
-
 	@Override
-	public PatentInfo savePatentInfo(PatentInfo patentInfo, String uid) {
+	public PatentInfo savePatentInfo(PatentInfo patentInfo, String uid, String aid) {
 		patentInfo.setId(UUID.randomUUID().toString());
 		patentInfo.setUid(uid);
 		Calendar now = Calendar.getInstance();
@@ -298,9 +289,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		patentInfo.setDeletedSign(0);
 		patentInfo.setConfirmState(0);
 		patentInfo.setPatentState(1);
-		User u = userMapper.selectByPrimaryKey(uid);
-		String p = (null == u ? "" : u.getAid());
-		patentInfo.setPrincipal(p);
+		patentInfo.setPrincipal(aid);
 		patentInfoMapper.insert(patentInfo);
 
 		PatentRegistration patentRegistration = new PatentRegistration();
@@ -320,12 +309,97 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		log.setPid(patentInfo.getId());
 		log.setRecordTime(patentInfo.getCreateTime());
 		log.setState(1);
-		log.setPrincipal(p);
+		log.setPrincipal(aid);
 		patentLogMapper.insert(log);
 		return patentInfo;
 	}
 
+	@Override
+	public void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime) {
+		if (!StringUtils.isBlank(patentLog.getPrincipal())) {
+			switch (patentLog.getState()) {
+			case 2:
+				patentInfo.setCreateTime(recordTime);
+				break;
+			case 3:
+				patentInfo.setPatentApplicationDate(recordTime);
+				break;
+			case 8:
+				patentInfo.setAuthorizedDate(recordTime);
+				break;
+			}
+			patentInfo.setPatentState(patentLog.getState());
+			patentInfo.setPrincipal(patentLog.getPrincipal());
+			patentLog.setPid(patentInfo.getId());
+			patentLog.setId(UUID.randomUUID().toString());
+			patentLog.setRecordTime(recordTime);
+			patentLog.setOperator(TokenManager.getAdminId());
+			patentLogMapper.insert(patentLog);
+		}
+		patentInfoMapper.updateByPrimaryKeySelective(patentInfo);
+		if (8 == patentInfo.getPatentState()) {
+			OrgIntellectualProperty o = new OrgIntellectualProperty();
+			o.setId(UUID.randomUUID().toString());
+			o.setUid(patentInfo.getUid());
+			o.setPid(patentInfo.getId());
+			o.setDeletedSign(0);
+			o.setIntellectualPropertyNumber(patentInfo.getPatentNumber());
+			o.setIntellectualPropertyName(patentInfo.getPatentName());
+			o.setCatagory(1);
+			o.setObtainWay(1);
+			o.setAuthorizationNumber(patentInfo.getPatentNumber());
+			o.setAuthorizationDate(patentInfo.getAuthorizedDate());
+			o.setEvaluationCategory((3 == patentInfo.getPatentCatagory()) ? 0 : 1);
+			orgIntellectualPropertyMapper.insert(o);
+		}
+
+		if (10 == patentInfo.getPatentState()) {
+			OrgIntellectualProperty o = orgIntellectualPropertyMapper
+					.selectOrgIntellectualPropertyByPid(patentInfo.getId());
+			Integer i = 0;
+			switch (patentInfo.getPatentCatagory()) {
+			case 0:
+				i = 0;
+				break;
+			case 1:
+				i = 2;
+				break;
+			case 2:
+				i = 3;
+				break;
+			case 3:
+				i = 11;
+				break;
+			}
+			o.setCatagory(i);
+			orgIntellectualPropertyMapper.updateByPrimaryKeySelective(o);
+		}
+	}
 
-	
+	@Override
+	public  String updateNoticeOfCorrection(Result res, String pid, Integer patentState) {
+		PatentInfo patentInfo = new PatentInfo();
+		patentInfo.setId(pid);
+		if (patentState == 4) {
+			patentInfo.setPatentState(5);
+		} else if (patentState == 6) {
+			patentInfo.setPatentState(7);
+		} else {
+			return "";
+		}
+		patentInfoMapper.updateByPrimaryKeySelective(patentInfo);
+		PatentLog patentLog = new PatentLog();
+		PatentInfo p = patentInfoMapper.selectByPrimaryKey(pid);
+		patentLog.setId(UUID.randomUUID().toString());
+		patentLog.setPid(pid);
+		patentLog.setState(p.getPatentState());
+		patentLog.setOperator(TokenManager.getAdminId());
+		patentLog.setPrincipal(p.getPrincipal());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		patentLog.setRecordTime(now.getTime());
+		patentLogMapper.insert(patentLog);
+		return "success";
+	}
 
 }

+ 2 - 2
src/main/java/com/goafanti/techservice/patent/service/impl/PatentLogServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service.impl;
+package com.goafanti.patent.service.impl;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.PatentLogMapper;
 import com.goafanti.common.model.PatentLog;
-import com.goafanti.techservice.patent.service.PatentLogService;
+import com.goafanti.patent.service.PatentLogService;
 @Service
 public class PatentLogServiceImpl implements PatentLogService {
 	@Autowired

+ 3 - 3
src/main/java/com/goafanti/techservice/patent/service/impl/PatentRegistrationServiceImpl.java

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.patent.service.impl;
+package com.goafanti.patent.service.impl;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,8 +10,8 @@ import com.goafanti.common.dao.PatentRegistrationMapper;
 import com.goafanti.common.model.PatentRegistration;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
-import com.goafanti.techservice.patent.service.PatentRegistrationService;
+import com.goafanti.patent.bo.PatentRecieveSendBo;
+import com.goafanti.patent.service.PatentRegistrationService;
 @Service
 public class PatentRegistrationServiceImpl extends BaseMybatisDao<PatentRegistrationMapper> implements PatentRegistrationService {
 	@Autowired

+ 0 - 144
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -1,144 +0,0 @@
-package com.goafanti.techservice.cognizance.service.impl;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.common.dao.OrgAnnualReportMapper;
-import com.goafanti.common.model.OrgAnnualReport;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.bo.AnnualReportBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
-import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
-import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
-@Service
-public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMapper> implements OrgAnnualReportService {
-	@Autowired
-	private OrgAnnualReportMapper   orgAnnualReportMapper;
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<OrgAnnualReport> listOrgAnnualReport(Integer year, Integer state, Integer pageNo, Integer pageSize,
-			String uid) {
-		Map<String, Object> params = new HashMap<>();
-		
-		if (year != null){
-			params.put("year", year);
-		}
-		
-		if (state != null){
-			params.put("state", state);
-		}
-		
-		if (!StringUtils.isBlank(uid)){
-			params.put("uid", uid);
-		}
-
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 1;
-		}
-
-		if (pageSize == null || pageSize < 0) {
-			pageSize = 10;
-		}
-		return  (Pagination<OrgAnnualReport>)findPage("findOrgAnnualReportListByPage",
-				"findOrgAnnualReportCount", params, pageNo, pageSize);
-	}
-
-	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
-		return orgAnnualReportMapper.batchDeleteByPrimaryKey(id);
-	}
-
-	@Override
-	public OrgAnnualReport insert(OrgAnnualReport orgAnnualReport) {
-		orgAnnualReportMapper.insert(orgAnnualReport);
-		return orgAnnualReport;
-	}
-
-	@Override
-	public int updateByPrimaryKeySelective(OrgAnnualReport orgAnnualReport) {
-		return orgAnnualReportMapper.updateByPrimaryKeySelective(orgAnnualReport);
-	}
-    
-	
-	
-	@Override
-	public AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(Integer year, String uid) {
-		return orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
-	}
-
-	@Override
-	public BigDecimal selectAnnualReportTerritoryByYearAndUid(Integer year, String uid) {
-		return orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
-	}
-
-	@Override
-	public AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(Integer year, String uid) {
-		return orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
-	}
-
-	@Override
-	public OrgAnnualReport selectAnnualReportByYearAndUid(Integer year, String uid) {
-		return orgAnnualReportMapper.selectAnnualReportByYearAndUid(year, uid);
-	}
-
-	@Override
-	public AnnualReportBo selectAnnualReportBo(String uid, Integer year) {
-		AnnualReportBo report = new AnnualReportBo();
-
-		AnnualReportPropertyRightBo p = orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
-		report.setInventionPatent(null == p.getInventionPatent() ? 0 : p.getInventionPatent());
-		report.setDefensePatent(null == p.getDefensePatent() ? 0 : p.getDefensePatent());
-		report.setNationalCrop(null == p.getNationalCrop() ? 0 : p.getNationalCrop());
-		report.setNewPlantCariety(null == p.getNewPlantCariety() ? 0 : p.getNewPlantCariety());
-		report.setNationalDrug(null == p.getNationalDrug() ? 0 : p.getNationalDrug());
-		report.setChineseMedicine(null == p.getChineseMedicine() ? 0 : p.getChineseMedicine());
-		report.setUtilityPatent(null == p.getUtilityPatent() ? 0 : p.getUtilityPatent());
-		report.setCircuitDesign(null == p.getCircuitDesign() ? 0 : p.getCircuitDesign());
-		report.setExteriorPatent(null == p.getExteriorPatent() ? 0 : p.getExteriorPatent());
-		report.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
-
-		BigDecimal t = orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
-		report.setTerritory(null == t ? new BigDecimal(0) : t);
-
-		AnnualReportMainBo m = orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
-		report.setUid(m.getUid());
-		report.setUnitName(m.getUnitName());
-		report.setOrgCode(m.getOrgCode());
-		report.setLocationProvince(m.getLocationProvince());
-		report.setLocationCity(m.getLocationCity());
-		report.setLocationArea(m.getLocationArea());
-		report.setListed(m.getListed().toString());
-		if (null != m.getListedDate()) {
-			report.setListedDate(DateFormatUtils.format(m.getListedDate(), "yyyy-MM-dd"));
-		}
-		report.setListedType(m.getListedType().toString());
-		report.setStockCode(m.getStockCode());
-		report.setFirmTotal(null == m.getFirmTotal() ? 0 : m.getFirmTotal());
-		report.setTechTotal(null == m.getTechTotal() ? 0 : m.getTechTotal());
-		report.setNewEmployment(null == m.getNewEmployment() ? 0 : m.getNewEmployment());
-		report.setGraduateNumber(null == m.getGraduateNumber() ? 0 : m.getGraduateNumber());
-		report.setSalesRevenue(null == m.getSalesRevenue() ? new BigDecimal(0) : m.getSalesRevenue());
-		report.setGrossProfit(null == m.getGrossProfit() ? new BigDecimal(0) : m.getGrossProfit());
-		report.setNetAsset(null == m.getNetAsset() ? new BigDecimal(0) : m.getNetAsset());
-		report.setCertificateNumber(m.getCertificateNumber());
-		if (null != m.getIssuingDate()) {
-			report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), "yyyy-MM-dd"));
-		}
-		report.setContacts(m.getContacts());
-		report.setResearchCost(null == m.getResearchCost() ? new BigDecimal(0) : m.getResearchCost());
-		report.setTotalRevenue(null == m.getTotalRevenue() ? new BigDecimal(0) : m.getTotalRevenue());
-		report.setLastYearRevenue(null == m.getLastYearRevenue() ? new BigDecimal(0) : m.getLastYearRevenue());
-
-		return report;
-	}
-
-}

+ 0 - 146
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -1,146 +0,0 @@
-package com.goafanti.techservice.cognizance.service.impl;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.common.dao.OrgCognizanceMapper;
-import com.goafanti.common.model.OrgCognizance;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.techservice.cognizance.bo.CognizanceBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceCatagoryBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceDetailBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceManageCostBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceOrgInfoBo;
-import com.goafanti.techservice.cognizance.bo.CognizanceResearchCostBo;
-import com.goafanti.techservice.cognizance.service.OrgCognizanceService;
-@Service
-public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper> implements OrgCognizanceService {
-	@Autowired
-	private OrgCognizanceMapper orgCognizanceMapper;
-
-	@Override
-	public OrgCognizance insert(OrgCognizance c) {
-		orgCognizanceMapper.insert(c);
-		return c;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<CognizanceBo> listCognizance(String uid, String locationProvince,  Integer pageNo,
-			Integer pageSize) {
-		Map<String, Object> params = new HashMap<>();
-		
-		if (!StringUtils.isBlank(uid)){
-			params.put("uid", uid);
-		}
-		
-		if (!StringUtils.isBlank(locationProvince)){
-			params.put("locationProvince", locationProvince);
-		}
-		
-		
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 1;
-		}
-
-		if (pageSize == null || pageSize < 0) {
-			pageSize = 10;
-		}
-		return (Pagination<CognizanceBo>) findPage("findCognizanceBoByPage","findCognizanceBoCount", params, pageNo,
-				pageSize);
-	}
-	
-	@Override
-	public CognizanceDetailBo selectCognizanceDetailBo(String uid, String cid, Integer year){
-		CognizanceDetailBo cog = new CognizanceDetailBo();
-		CognizanceOrgInfoBo orgInfo = orgCognizanceMapper.selectCognizanceOrgInfoBoByUidAndCid(uid, cid);
-		
-		cog.setUid(null == orgInfo.getUid() ? "" : orgInfo.getUid());
-		cog.setCid(null == orgInfo.getCid() ? "" : orgInfo.getCid());
-		cog.setUnitName(null == orgInfo.getUnitName() ? "" : orgInfo.getUnitName());
-		cog.setOrgCode(null == orgInfo.getOrgCode() ? "" : orgInfo.getOrgCode());
-		cog.setPostalAddress(null == orgInfo.getPostalAddress() ? "" : orgInfo.getPostalAddress());
-		//联系人
-		cog.setContacts(null == orgInfo.getContacts() ? "" : orgInfo.getContacts().toString());
-		
-		cog.setTechnicalField1(null == orgInfo.getTechnicalField1() ? 0 : orgInfo.getTechnicalField1());
-		cog.setTechnicalField2(null == orgInfo.getTechnicalField2() ? 0 : orgInfo.getTechnicalField2());
-		cog.setTechnicalField3(null == orgInfo.getTechnicalField3() ? 0 : orgInfo.getTechnicalField3());
-		cog.setBasicResearchCost(
-				null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
-		cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
-		CognizanceResearchCostBo researchCost = orgCognizanceMapper.selectCognizanceResearchCostBoByUidAndYear(year,
-				uid);
-		cog.setResearchCost(
-				null == researchCost.getResearchCost() ? new BigDecimal(0) : researchCost.getResearchCost());
-		cog.setTerritory(null == researchCost.getTerritory() ? new BigDecimal(0) : researchCost.getTerritory());
-		CognizanceManageCostBo manageCost = orgCognizanceMapper.selectCognizanceManageCostBoByUidAndYear(year, uid);
-		
-		cog.setNetAsset1(null == manageCost.getNetAsset1() ? new BigDecimal(0) : manageCost.getNetAsset1());
-		cog.setNetAsset2(null == manageCost.getNetAsset2() ? new BigDecimal(0) : manageCost.getNetAsset2());
-		cog.setNetAsset3(null == manageCost.getNetAsset3() ? new BigDecimal(0) : manageCost.getNetAsset3());
-		cog.setSalesRevenue1(null == manageCost.getSalesRevenue1() ? new BigDecimal(0) : manageCost.getSalesRevenue1());
-		cog.setSalesRevenue2(null == manageCost.getSalesRevenue2() ? new BigDecimal(0) : manageCost.getSalesRevenue2());
-		cog.setSalesRevenue3(null == manageCost.getSalesRevenue3() ? new BigDecimal(0) : manageCost.getSalesRevenue3());
-		cog.setGrossProfit1(null == manageCost.getGrossProfit1() ? new BigDecimal(0) : manageCost.getGrossProfit1());
-		cog.setGrossProfit2(null == manageCost.getGrossProfit2() ? new BigDecimal(0) : manageCost.getGrossProfit2());
-		cog.setGrossProfit3(null == manageCost.getGrossProfit3() ? new BigDecimal(0) : manageCost.getGrossProfit3());
-
-		CognizanceCatagoryBo catagory = orgCognizanceMapper.selectCognizanceCatagoryBoByUidAndYear(year, uid);
-		cog.setFirstCatagory(null == catagory.getFirstCatagory() ? 0 : catagory.getFirstCatagory());
-		cog.setSecondCatagory(null == catagory.getSecondCatagory() ? 0 : catagory.getSecondCatagory());
-		cog.setFirmTotal(null == catagory.getFirmTotal() ? 0 : catagory.getFirmTotal());
-		cog.setTechTotal(null == catagory.getTechTotal() ? 0 : catagory.getTechTotal());
-		cog.setTotalRevenue(null == catagory.getTotalRevenue() ? new BigDecimal(0) : catagory.getTotalRevenue());
-		BigDecimal revenue = orgCognizanceMapper.selectLastYearRevenueByUidAndYear(year, uid);
-		cog.setLastYearRevenue(null == revenue ? new BigDecimal(0) : revenue);
-		return cog;
-	}
-
-	@Override
-	public CognizanceOrgInfoBo selectCognizanceOrgInfoBoByUidAndCid(String uid, String cid) {
-		return orgCognizanceMapper.selectCognizanceOrgInfoBoByUidAndCid(uid, cid);
-	}
-
-	@Override
-	public CognizanceResearchCostBo selectCognizanceResearchCostBoByUidAndYear(Integer year, String uid) {
-		return orgCognizanceMapper.selectCognizanceResearchCostBoByUidAndYear(year, uid);
-	}
-
-	@Override
-	public CognizanceManageCostBo selectCognizanceManageCostBoByUidAndYear(Integer year, String uid) {
-		return orgCognizanceMapper.selectCognizanceManageCostBoByUidAndYear(year, uid);
-	}
-
-	@Override
-	public CognizanceCatagoryBo selectCognizanceCatagoryBoByUidAndYear(Integer year, String uid) {
-		return orgCognizanceMapper.selectCognizanceCatagoryBoByUidAndYear(year, uid);
-	}
-
-	@Override
-	public BigDecimal selectLastYearRevenueByUidAndYear(Integer year, String uid) {
-		return orgCognizanceMapper.selectLastYearRevenueByUidAndYear(year, uid);
-	}
-
-	@Override
-	public int updateByPrimaryKeySelective(OrgCognizance cog) {
-		return orgCognizanceMapper.updateByPrimaryKeySelective(cog);
-	}
-
-	@Override
-	public OrgCognizance selectCognizanceByUidAndYear(Integer year, String uid) {
-		return orgCognizanceMapper.selectCognizanceByUidAndYear(year, uid);
-	}
-
-	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
-		return orgCognizanceMapper.batchDeleteByPrimaryKey(id);
-	}
-}

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

@@ -24,7 +24,7 @@ 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.techservice.patent.service.AdminService;
+import com.goafanti.patent.service.AdminService;
 import com.goafanti.user.service.UserService;
 
 @Controller

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.6
+static.host=//afts.hnzhiming.com/1.0.7
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.6
+static.host=//afts.hnzhiming.com/1.0.7
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.6
+static.host=//afts.hnzhiming.com/1.0.7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.6
+static.host=//aftts.hnzhiming.com/1.0.7
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload