Antiloveg лет назад: 8
Родитель
Сommit
5d59df9a66
73 измененных файлов с 404 добавлено и 382 удалено
  1. 4 0
      schema/2017-03-14.sql
  2. 48 49
      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. 18 18
      src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java
  14. 1 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. 7 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. 2 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. 5 5
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  31. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceLogServiceImpl.java
  32. 8 8
      src/main/java/com/goafanti/techservice/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. 1 1
      src/main/java/com/goafanti/common/dao/OrgActivityMapper.java
  44. 2 2
      src/main/java/com/goafanti/common/dao/OrgAnnualReportMapper.java
  45. 4 4
      src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java
  46. 1 1
      src/main/java/com/goafanti/common/dao/PatentInfoMapper.java
  47. 1 1
      src/main/java/com/goafanti/common/dao/PatentRegistrationMapper.java
  48. 1 1
      src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml
  49. 2 2
      src/main/java/com/goafanti/common/mapper/OrgAnnualReportMapper.xml
  50. 5 5
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  51. 1 1
      src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml
  52. 3 3
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  53. 1 1
      src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml
  54. 1 1
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  55. 1 1
      src/main/java/com/goafanti/core/shiro/token/UserRealm.java
  56. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentApplicationFeeBo.java
  57. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentCompositeBo.java
  58. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentNoticeOfCorrectionBo.java
  59. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentPendingBo.java
  60. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentRecieveSendBo.java
  61. 1 1
      src/main/java/com/goafanti/techservice/patent/bo/PatentRegistrationBo.java
  62. 19 84
      src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java
  63. 1 1
      src/main/java/com/goafanti/techservice/patent/service/AdminService.java
  64. 2 2
      src/main/java/com/goafanti/techservice/patent/service/PatentCostService.java
  65. 7 4
      src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java
  66. 1 1
      src/main/java/com/goafanti/techservice/patent/service/PatentLogService.java
  67. 2 2
      src/main/java/com/goafanti/techservice/patent/service/PatentRegistrationService.java
  68. 2 2
      src/main/java/com/goafanti/techservice/patent/service/impl/AdminServiceImpl.java
  69. 3 3
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentCostServiceImpl.java
  70. 157 107
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentInfoServiceImpl.java
  71. 2 2
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentLogServiceImpl.java
  72. 3 3
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentRegistrationServiceImpl.java
  73. 1 1
      src/main/java/com/goafanti/user/controller/UserRegisterController.java

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

@@ -0,0 +1,4 @@
+alter table admin MODIFY COLUMN `id` VARCHAR(36) NOT NULL ;
+
+
+

+ 48 - 49
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -17,6 +17,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 +61,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 +203,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 +272,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 +321,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 +400,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 +520,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 +565,7 @@ public class AdminApiController extends BaseApiController {
 			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
 		}
 
-		if (null == orgActivityCost.getId()) {
+		if (StringUtils.isBlank(orgActivityCost.getId())) {
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
 			orgActivityCost.setStartDate(ac.getStartDate());
 			orgActivityCost.setEndDate(ac.getEndDate());
@@ -589,7 +588,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 +632,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 +679,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 +743,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 +789,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 +828,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);

+ 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;
 

+ 18 - 18
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;
 

+ 1 - 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;

+ 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;
 

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

@@ -1,16 +1,16 @@
-package com.goafanti.techservice.cognizance.service;
+package com.goafanti.cognizance.service;
 
 import java.math.BigDecimal;
 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.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 {
 

+ 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;
 

+ 2 - 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

+ 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);
+		}
+		
+	}
 }

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

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -10,14 +10,14 @@ 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;
-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

+ 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

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

@@ -1,4 +1,4 @@
-package com.goafanti.techservice.cognizance.service.impl;
+package com.goafanti.cognizance.service.impl;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -9,17 +9,17 @@ 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.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

+ 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;
 
 

+ 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);

+ 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 , 

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

@@ -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}, 

+ 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 {

+ 19 - 84
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;
@@ -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;
 
@@ -226,11 +225,12 @@ public class PatentApiController extends BaseApiController {
 
 	/**
 	 * 管理端专利详情修改保存
+	 * @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 +241,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;
 	}
 

+ 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 {
 

+ 7 - 4
src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java

@@ -1,14 +1,15 @@
-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.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 {
 
@@ -38,5 +39,7 @@ public interface PatentInfoService {
 
 	PatentInfo savePatentInfo(PatentInfo patentInfo, String uid);
 
+	void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime);
+
 
 }

+ 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

+ 157 - 107
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.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,16 +270,15 @@ 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) {
 		patentInfo.setId(UUID.randomUUID().toString());
@@ -325,7 +316,66 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		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);
+		}
+	}
 
 }

+ 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

+ 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