Browse Source

Accept Merge Request #137 merge : (master -> test)

Merge Request: merge
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/137
Antiloveg 9 years ago
parent
commit
8a6bafacce
40 changed files with 509 additions and 205 deletions
  1. 4 0
      schema/permission.sql
  2. 6 4
      schema/role_init.sql
  3. 52 14
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  4. 6 5
      src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java
  5. 8 1
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  6. 7 1
      src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java
  7. 7 19
      src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java
  8. 5 2
      src/main/java/com/goafanti/admin/service/AdminService.java
  9. 19 4
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  10. 13 0
      src/main/java/com/goafanti/cognizance/bo/InputApplyCognizance.java
  11. 0 1
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  12. 3 1
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java
  13. 51 22
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  14. 2 0
      src/main/java/com/goafanti/common/dao/AdminMapper.java
  15. 51 0
      src/main/java/com/goafanti/common/enums/CertifySubmitType.java
  16. 1 0
      src/main/java/com/goafanti/common/enums/CognizanceApplyFields.java
  17. 1 0
      src/main/java/com/goafanti/common/enums/CopyrightFields.java
  18. 10 0
      src/main/java/com/goafanti/common/enums/PatentInfoFields.java
  19. 1 0
      src/main/java/com/goafanti/common/enums/TechProjectFields.java
  20. 6 0
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml
  21. 1 1
      src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml
  22. 1 1
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  23. 1 1
      src/main/java/com/goafanti/common/mapper/OrgIntellectualPropertyMapper.xml
  24. 12 0
      src/main/java/com/goafanti/copyright/bo/InputCopyright.java
  25. 0 6
      src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java
  26. 2 0
      src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java
  27. 34 12
      src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java
  28. 13 0
      src/main/java/com/goafanti/patent/bo/InputPatentInfo.java
  29. 1 1
      src/main/java/com/goafanti/patent/controller/PatentApiController.java
  30. 3 1
      src/main/java/com/goafanti/patent/service/PatentInfoService.java
  31. 70 45
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  32. 11 0
      src/main/java/com/goafanti/techproject/bo/InputTechProject.java
  33. 1 1
      src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java
  34. 3 1
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  35. 64 30
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  36. 1 0
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  37. 2 2
      src/main/java/com/goafanti/user/service/OrganizationIdentityService.java
  38. 2 2
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  39. 27 23
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  40. 7 4
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

+ 4 - 0
schema/permission.sql

@@ -394,6 +394,10 @@ values
 (UUID(), 'api/admin/userCertify/accountManager', '用户认证--获取客户经理下拉(审核员)'),
 (UUID(), 'api/admin/userCertify/technician', '用户认证--获取业务员(技术员)下拉(审核员)');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/salesman', '获取营销员及营销经理下拉');
+
 
 
 

+ 6 - 4
schema/role_init.sql

@@ -1,5 +1,7 @@
 INSERT INTO `role` (`id`, `role_name`, `role_type`) 
-VALUES ('1', '超级管理员', '999999'),
-VALUES ('2', '地区管理员', '99999'),
-VALUES ('3', '审核员', '9999'),
-VALUES ('4', '客户经理', '9');
+VALUES ('1', '超级管理员', 999999),
+VALUES ('2', '地区管理员', 99999),
+VALUES ('3', '审核员', 9999),
+VALUES ('4', '客户经理', 1),
+VALUES ('5', '营销经理', 1),
+VALUES ('6', '营销员', 1);

+ 52 - 14
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -68,6 +68,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AdminFields;
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.CognizanceApplyFields;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.FinanceRatepayFields;
@@ -191,6 +192,16 @@ public class AdminApiController extends CertifyApiController {
 	private OrgCognizanceProportionService	orgCognizanceProportionService;
 
 	/**
+	 * 获取营销员及营销经理下拉
+	 */
+	@RequestMapping(value = "/salesman", method = RequestMethod.GET)
+	public Result getSalesMan() {
+		Result res = new Result();
+		res.setData(adminService.selectSalesman());
+		return res;
+	}
+
+	/**
 	 * 统计专利、软著及科技项目申报业务情况
 	 */
 	@RequestMapping(value = "/getBusinessCount", method = RequestMethod.GET)
@@ -661,7 +672,7 @@ public class AdminApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateUserDetail", method = RequestMethod.POST)
 	public Result updateUserDetail(@Valid InputUserIdentity userIdentity, BindingResult bindingResult,
-			String paymentDateFormattedDate) {
+			String paymentDateFormattedDate, String saveSign) {
 		Result res = new Result();
 
 		if (bindingResult.hasErrors()) {
@@ -675,6 +686,16 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(saveSign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
+			return res;
+		}
+
+		if (!saveSign.equals(CertifySubmitType.SAVE.getCode()) && !saveSign.equals(CertifySubmitType.SUBMIT.getCode())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
+			return res;
+		}
+
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
 				userIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
@@ -690,9 +711,9 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(ui.getId())) {
 			ui.setId(UUID.randomUUID().toString());
-			res.setData(userIdentityService.insertByAdmin(ui, null, null));
+			res.setData(userIdentityService.insertByAdmin(ui, null, null, saveSign));
 		} else {
-			res.setData(userIdentityService.updateUserDetail(ui, null, null));
+			res.setData(userIdentityService.updateUserDetail(ui, null, null, saveSign));
 		}
 		return res;
 	}
@@ -743,7 +764,8 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(organizationIdentityService.selectOrgIdentityDetailByUserId(uid));
 		return res;
 	}
-
+	
+    
 	/**
 	 * 修改团体用户信息
 	 * 
@@ -753,7 +775,7 @@ public class AdminApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
 	public Result updateOrgDetail(@Valid InputOrganizationIdentity orgIdentity, BindingResult bindingResult,
-			String paymentDateFormattedDate) {
+			String paymentDateFormattedDate, String saveSign) {
 		Result res = new Result();
 
 		if (bindingResult.hasErrors()) {
@@ -766,6 +788,17 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+
+		if (StringUtils.isBlank(saveSign)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到保存提交方式", "保存提交方式"));
+			return res;
+		}
+
+		if (!saveSign.equals(CertifySubmitType.SAVE.getCode()) && !saveSign.equals(CertifySubmitType.SUBMIT.getCode())){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "保存提交方式"));
+			return res;
+		}
+
 		if (!StringUtils.isBlank(paymentDateFormattedDate)) {
 			try {
 				orgIdentity.setPaymentDate(DateUtils.parseDate(paymentDateFormattedDate, AFTConstants.YYYYMMDD));
@@ -778,9 +811,9 @@ public class AdminApiController extends CertifyApiController {
 
 		if (StringUtils.isBlank(oi.getId())) {
 			oi.setId(UUID.randomUUID().toString());
-			res.setData(organizationIdentityService.insertByAdmin(oi, null, null));
+			res.setData(organizationIdentityService.insertByAdmin(oi, null, null, saveSign));
 		} else {
-			res.setData(organizationIdentityService.updateOrgDetail(oi, null, null));
+			res.setData(organizationIdentityService.updateOrgDetail(oi, null, null, saveSign));
 		}
 		return res;
 	}
@@ -1758,7 +1791,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgActivityCost.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(signDateFormattedDate)) {
+		if (!StringUtils.isBlank(signDateFormattedDate)) {
 			try {
 				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
@@ -2958,6 +2991,11 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(cog.getSalesman())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
+			return res;
+		}
+
 		if (null == cog.getYear()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "年份"));
 			return res;
@@ -2970,34 +3008,34 @@ public class AdminApiController extends CertifyApiController {
 		LatelyCogRecord lcr = orgCognizanceService.selectLatelyRecord(cog.getUid());
 
 		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.FOSTER.getCode() == lcr.getState()) {
-			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企培育中!无法提交新申请!"));
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企培育中!无法提交新申请!", "高企培育中!无法提交新申请!"));
 			return res;
 		}
 
 		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() != lcr.getState()
 				&& OrgCognizanceStatus.CALLBACK.getCode() != lcr.getState()) {
-			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企申请中!无法提交新申请!", "高企申请中!无法提交新申请!"));
 			return res;
 		}
 
 		if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() == lcr.getState()) {
 			if (null == lcr.getIssuingDate()) {
-				res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期!无法提交新申请!"));
+				res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企认定未过期!无法提交新申请!", "高企认定未过期!无法提交新申请!"));
 				return res;
 			}
 			try {
 				if (Boolean.FALSE == TimeUtils.checkCogExpire(lcr.getIssuingDate())) {
-					res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期,无法提交新申请!"));
+					res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "高企认定未过期,无法提交新申请!", "高企认定未过期,无法提交新申请!"));
 					return res;
 				}
 			} catch (ParseException e) {
 			}
 
 		}
-
+		String salesman = cog.getSalesman();
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);
-		orgCognizanceService.insertCognizance(oc, TokenManager.getAdminId());
+		orgCognizanceService.saveCognizance(oc, salesman);
 
 		return res;
 	}

+ 6 - 5
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -104,18 +104,19 @@ public class AdminCopyrightApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		if (StringUtils.isBlank(inputInfo.getSalesman())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
+			return res;
+		}
 		User curUser = userService.selectByPrimaryKey(inputInfo.getUid());
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
+		String salesman = inputInfo.getSalesman();
 		CopyrightInfo ci = new CopyrightInfo();
 		BeanUtils.copyProperties(inputInfo, ci);
 		ci.setUid(curUser.getId());
-		ci.setStatus(CopyrightStatus.CREATE.getCode());
-		if (TokenManager.getToken() instanceof Admin) {
-			ci.setPrincipal(TokenManager.getAdminId());
-		}
-		copyrightInfoService.insert(ci, curUser.getAid());
+		copyrightInfoService.saveCopyright(ci, salesman);
 		res.setData(ci);
 		return res;
 	}

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

@@ -191,6 +191,13 @@ public class AdminPatentApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(patentInfo.getSalesman())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
+			return res;
+		}
+		
+		String salesman = patentInfo.getSalesman();
 
 		User curUser = userService.selectByPrimaryKey(patentInfo.getUid());
 		if (!checkCertify(res, curUser)) {
@@ -198,7 +205,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		}
 		PatentInfo pi = new PatentInfo();
 		BeanUtils.copyProperties(patentInfo, pi);
-		res.setData(patentInfoService.savePatentInfo(pi, curUser.getAid()));
+		res.setData(patentInfoService.savePatentInfo(pi, salesman));
 		return res;
 	}
 

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

@@ -172,13 +172,19 @@ public class AdminTechProjectApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(techProject.getSalesman())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到营销员", "营销员"));
+			return res;
+		}
+		String salesman = techProject.getSalesman();
 		User curUser = userService.selectByPrimaryKey(techProject.getUid());
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
 		TechProject tp = new TechProject();
 		BeanUtils.copyProperties(techProject, tp);
-		techProjectService.saveTechProject(tp, curUser.getAid());
+		techProjectService.saveTechProject(tp, salesman);
 		return res;
 
 	}

+ 7 - 19
src/main/java/com/goafanti/admin/controller/AdminUserCertifyApiController.java

@@ -2,9 +2,6 @@ package com.goafanti.admin.controller;
 
 import java.text.ParseException;
 import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import java.util.UUID;
 
 import javax.annotation.Resource;
@@ -28,7 +25,6 @@ import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.IdentityProcess;
 import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.UserIdentityFields;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.utils.DateUtils;
@@ -53,8 +49,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 	@RequestMapping(value = "/accountManager", method = RequestMethod.GET)
 	public Result getAccountManager(){
 		Result res = new Result();
-		List<Admin> list = adminService.selectAccoutManager();
-		res.setData(disposeAdminList(list));
+		res.setData(adminService.selectAccoutManager());
 		return res;
 	}
 	
@@ -65,8 +60,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 	@RequestMapping(value = "/technician", method = RequestMethod.GET)
 	public Result getTechnician(){
 		Result res = new Result();
-		List<Admin> list = adminService.selectTechnician();
-		res.setData(disposeAdminList(list));
+		res.setData(adminService.selectTechnician());
 		return res;
 	}
 
@@ -161,7 +155,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 					|| IdentityAuditStatus.PASSED.getCode() == ui.getAuditStatus()) {
 				ui.setProcess(IdentityProcess.RESULTS.getCode());
 			}
-			res.setData(userIdentityService.insertByAdmin(ui, aid, mid));
+			res.setData(userIdentityService.insertByAdmin(ui, aid, mid, null));
 		} else {
 			ui.setAuditStatus(null == ui.getAuditStatus() ? 0 : ui.getAuditStatus());
 			if (IdentityAuditStatus.UNCOMMITTED.getCode() == ui.getAuditStatus()) {
@@ -175,7 +169,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 					|| IdentityAuditStatus.PASSED.getCode() == ui.getAuditStatus()) {
 				ui.setProcess(IdentityProcess.RESULTS.getCode());
 			}
-			res.setData(userIdentityService.updateUserDetail(ui, aid, mid));
+			res.setData(userIdentityService.updateUserDetail(ui, aid, mid, null));
 		}
 		return res;
 	}
@@ -247,7 +241,7 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 			}
 			oi.setListed(null == oi.getListed() ? 0 : oi.getListed());
 			oi.setListedType(null == oi.getListedType() ? 0 : oi.getListedType());
-			res.setData(organizationIdentityService.insertByAdmin(oi, aid, mid));
+			res.setData(organizationIdentityService.insertByAdmin(oi, aid, mid, null));
 		} else {
 			oi.setAuditStatus(null == oi.getAuditStatus() ? 0 : oi.getAuditStatus());
 			if (IdentityAuditStatus.UNCOMMITTED.getCode() == oi.getAuditStatus()) {
@@ -261,16 +255,10 @@ public class AdminUserCertifyApiController extends CertifyApiController {
 					|| IdentityAuditStatus.PASSED.getCode() == oi.getAuditStatus()) {
 				oi.setProcess(IdentityProcess.RESULTS.getCode());
 			}
-			res.setData(organizationIdentityService.updateOrgDetail(oi, aid, mid));
+			res.setData(organizationIdentityService.updateOrgDetail(oi, aid, mid, null));
 		}
 		return res;
 	}
 	
-	private Map<String, String> disposeAdminList(List<Admin> list){
-		Map<String, String> map = new TreeMap<String, String>();
-		for (Admin o : list) {
-			map.put(o.getId(), o.getName()+ " " + (null == o.getPosition() ? "" : o.getPosition()));
-		}
-		return map;
-	}
+	
 }

+ 5 - 2
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -1,6 +1,7 @@
 package com.goafanti.admin.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.common.model.Admin;
@@ -45,8 +46,10 @@ public interface AdminService {
 
 	List<String> listAuditor();
 
-	List<Admin> selectAccoutManager();
+	Map<String, String> selectAccoutManager();
 
-	List<Admin> selectTechnician();
+	Map<String, String> selectTechnician();
+
+	Map<String, String> selectSalesman();
 
 }

+ 19 - 4
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -3,6 +3,7 @@ package com.goafanti.admin.service.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -165,13 +166,27 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	}
 
 	@Override
-	public List<Admin> selectAccoutManager() {
-		return adminMapper.selectAccoutManager();
+	public Map<String, String> selectAccoutManager() {
+		return disposeAdminList(adminMapper.selectAccoutManager());
 	}
 
 	@Override
-	public List<Admin> selectTechnician() {
-		return adminMapper.selectTechnician();
+	public Map<String, String> selectTechnician() {
+		return disposeAdminList(adminMapper.selectTechnician());
+	}
+
+	@Override
+	public Map<String, String> selectSalesman() {
+		return disposeAdminList(adminMapper.selectSalesman());
+	}
+	
+	
+	private Map<String, String> disposeAdminList(List<Admin> list){
+		Map<String, String> map = new TreeMap<String, String>();
+		for (Admin o : list) {
+			map.put(o.getId(), o.getName()+ " " + (null == o.getPosition() ? "" : o.getPosition()));
+		}
+		return map;
 	}
 
 }

+ 13 - 0
src/main/java/com/goafanti/cognizance/bo/InputApplyCognizance.java

@@ -32,6 +32,19 @@ public class InputApplyCognizance {
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer largeOrder;
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String salesman;
+	
+	
+
+	public String getSalesman() {
+		return salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		this.salesman = salesman;
+	}
 
 	public Integer getContacts() {
 		return contacts;

+ 0 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -2322,7 +2322,6 @@ public class CognizanceApiController extends CertifyApiController {
 
 		}
 
-		
 		OrgCognizance oc = new OrgCognizance();
 		BeanUtils.copyProperties(cog, oc);
 		oc.setUid(TokenManager.getUserId());

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

@@ -43,7 +43,7 @@ public interface OrgCognizanceService {
 
 	void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid);
 
-	void insertCognizance(OrgCognizance cog, String aid);
+	OrgCognizance insertCognizance(OrgCognizance cog, String aid);
 
 	Pagination<CultivationListBo> listCultivation(String uid, String province, String unitName, Integer pNo, Integer pSize);
 
@@ -53,5 +53,7 @@ public interface OrgCognizanceService {
 
 	BusinessCountBo countBusiness(String uid);
 
+	OrgCognizance saveCognizance(OrgCognizance oc, String salesman);
+
 
 }

+ 51 - 22
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -32,12 +32,11 @@ import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.TechProjectMapper;
 import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.CopyrightStatus;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrgCognizanceStatus;
 import com.goafanti.common.enums.ProportionStatus;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.common.model.OrgCognizanceLog;
@@ -244,32 +243,18 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	}
 
 	@Override
-	public void insertCognizance(OrgCognizance c, String aid) {
-		c.setId(UUID.randomUUID().toString());
-		c.setState(CopyrightStatus.CREATE.getCode());
-		c.setDeletedSign(0);
-		if (TokenManager.getToken() instanceof Admin) {
-			c.setFounder(TokenManager.getAdminId());
-		}
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		c.setRecordTime(now.getTime());
-		orgCognizanceMapper.insert(c);
+	public OrgCognizance saveCognizance(OrgCognizance c, String salesman) {
+		c.setState(OrgCognizanceStatus.DELIVERD.getCode());
+		c.setFounder(salesman);
+		c = disposeCognizanceSave(c);
 
 		OrgCognizanceLog log = new OrgCognizanceLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setCid(c.getId());
-
 		log.setRecordTime(c.getRecordTime());
 		log.setState(c.getState());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setPrincipal(TokenManager.getAdminId());
-		} else {
-			log.setPrincipal(aid);
-		}
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setOperator(TokenManager.getAdminId());
-		}
+		log.setPrincipal(salesman);
+		log.setOperator(salesman);
 		log.setComment(c.getComment());
 		orgCognizanceLogMapper.insert(log);
 
@@ -285,6 +270,29 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			orgCognizanceProportionMapper.updateByPrimaryKeySelective(disposeProportion(ocp));
 		}
 
+		OrgCognizanceLog l = new OrgCognizanceLog();
+		l.setId(UUID.randomUUID().toString());
+		l.setCid(c.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		l.setRecordTime(now.getTime());
+		l.setState(c.getState());
+		l.setPrincipal(TokenManager.getAdminId());
+		l.setOperator(salesman);
+		orgCognizanceLogMapper.insert(l);
+
+		createNotice(c, l);
+		return c;
+	}
+
+	private OrgCognizance disposeCognizanceSave(OrgCognizance c) {
+		c.setId(UUID.randomUUID().toString());
+		c.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		c.setRecordTime(now.getTime());
+		orgCognizanceMapper.insert(c);
+		return c;
 	}
 
 	@SuppressWarnings("unchecked")
@@ -381,4 +389,25 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public OrgCognizance insertCognizance(OrgCognizance c, String aid) {
+		c.setState(OrgCognizanceStatus.CREATE.getCode());
+		c = disposeCognizanceSave(c);
+		
+		OrgCognizanceLog log = new OrgCognizanceLog();
+		log.setId(UUID.randomUUID().toString());
+		log.setCid(c.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		log.setRecordTime(now.getTime());
+		log.setState(OrgCognizanceStatus.CREATE.getCode());
+		log.setPrincipal(aid);
+		log.setComment(c.getComment());
+		orgCognizanceLogMapper.insert(log);
+
+		createNotice(c, log);
+		return c;
+
+	}
+
 }

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

@@ -45,4 +45,6 @@ public interface AdminMapper {
 	List<Admin> selectAccoutManager();
 
 	List<Admin> selectTechnician();
+
+	List<Admin> selectSalesman();
 }

+ 51 - 0
src/main/java/com/goafanti/common/enums/CertifySubmitType.java

@@ -0,0 +1,51 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum CertifySubmitType {
+	
+	SAVE("save", "保存"), 
+	SUBMIT("submit", "保存并提交"),
+	DEFAULT("other", "其他");
+
+	private CertifySubmitType(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<String, CertifySubmitType> status = new HashMap<String, CertifySubmitType>();
+
+	static {
+		for (CertifySubmitType value : CertifySubmitType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static CertifySubmitType getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return DEFAULT;
+	}
+
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+
+	private String	code;
+	private String	desc;
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 1 - 0
src/main/java/com/goafanti/common/enums/CognizanceApplyFields.java

@@ -11,6 +11,7 @@ public enum CognizanceApplyFields {
 	CONSULTANT("consultant", "咨询师"),
 	YEAR("year", "年份"),
 	STATE("state", "状态"),
+	SALESMAN("salesman", "营销员"),
 	
 	OTHER("", "未知参数");
 	

+ 1 - 0
src/main/java/com/goafanti/common/enums/CopyrightFields.java

@@ -18,6 +18,7 @@ public enum CopyrightFields {
 	INURGENT("inUrgent", "加急天数"),
 	AUTHORIZEDDATE("authorizedDate", "下证日期"),
 	RECORDTIME("recordTime", "状态流转时间"),
+	SALESMAN("salesman", "营销员"),
 	OTHER("", "未知参数");
 
 	private CopyrightFields(String code, String desc) {

+ 10 - 0
src/main/java/com/goafanti/common/enums/PatentInfoFields.java

@@ -22,6 +22,16 @@ public enum PatentInfoFields {
 	THIRDINVENTORNAME("thirdInventorName", "第三发明人姓名"),
 	THIRDINVENTORNATIONALITY("thirdInventorNationality", "第三发明人国籍"),
 	THIRDINVENTORISPUBLISH("thirdInventorIsPublish", "第三发明人是否公布"),
+	PATENTPRORYSTATEMENTURL("patentProryStatementUrl", "专利代理委托书URL"),
+	PATENTWRITINGURL("patentWritingUrl", "专利稿件URL"),
+	AUTHORIZATIONNOTICEURL("authorizationNoticeUrl", "授权通知书URL"),
+	PATENTCERTIFICATEURL("patentCertificateUrl", "专利证书URL"),
+	STATE("state", "专利状态"),
+	PRINCIPAL("principal", "负责人"),
+	COMMENT("comment", "备注"),
+	OFFICE("office", "事务所"),
+	AUTHOR("author", "资料撰写人"),
+	SALESMAN("salesman", "营销员"),
 	OTHER("", "未知参数");
 	
 	

+ 1 - 0
src/main/java/com/goafanti/common/enums/TechProjectFields.java

@@ -21,6 +21,7 @@ public enum TechProjectFields {
 	STATE("state", "科技项目状态"),
 	PRINCIPAL("principal", "负责人"),
 	COMMENT("comment", "备注"),
+	SALESMAN("salesman", "营销员"),
 	OTHER("", "未知参数");
 	
 	private String	code;

+ 6 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -271,5 +271,11 @@
 	where ur.rid not in('1','2','3','4')
 	group by a.id
    </select>
+   
+   <select id="selectSalesman" resultMap="BaseResultMap">
+   select a.id, a.name, a.position from admin a 
+		INNER JOIN user_role  ur on a.id = ur.uid
+	where ur.rid in ('5', '6') 
+   </select>
   
 </mapper>

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

@@ -384,7 +384,7 @@
 		 >= (select  str_to_date(CONCAT(#{0}-2,'-01-01'), '%Y-%m-%d %H'))
 				and  end_date   <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
 	)
-	and deleted_sign = 0
+	and deleted_sign = 0 order by start_date 
   </select>
  <!--  <select id="selectDetailById" parameterType="java.lang.String" resultMap="BaseResultMap">
   	

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

@@ -505,6 +505,6 @@
   <select id="selectLatelyRecord" resultType="com.goafanti.cognizance.bo.LatelyCogRecord" parameterType="java.lang.String" >
     select c.id, c.issuing_date as issuingDate, l.state, MAX(l.record_time) as recordTime
 		   from org_cognizance c LEFT JOIN org_cognizance_log l on 
-		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR}
+		   c.id = l.cid  where c.uid = #{uid,jdbcType=VARCHAR} and c.deleted_sign = 0
   </select>
 </mapper>

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

@@ -278,6 +278,6 @@
     where uid = #{1} and authorization_date 
 		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H'))
 				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
-	and deleted_sign = 0
+	and deleted_sign = 0 order by authorization_date
   </select>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/copyright/bo/InputCopyright.java

@@ -46,6 +46,18 @@ public class InputCopyright {
 
 	@Past(message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Date	recordTime;
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String salesman;
+	
+	
+
+	public String getSalesman() {
+		return salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		this.salesman = salesman;
+	}
 
 	public String getPrincipal() {
 		return principal;

+ 0 - 6
src/main/java/com/goafanti/copyright/controller/CopyrightApiController.java

@@ -56,12 +56,6 @@ public class CopyrightApiController extends CertifyApiController {
 		BeanUtils.copyProperties(inputInfo, ci);
 		ci.setUid(curUser.getId());
 		ci.setPrincipal(curUser.getAid());
-		/*if (StringUtils.isBlank(ci.getPrincipal())) {
-			ci.setStatus(CopyrightStatus.CREATE.getCode());
-			ci.setPrincipal(curUser.getAid());
-		} else {
-			ci.setStatus(CopyrightStatus.DELIVERD.getCode());
-		}*/
 		copyrightInfoService.insert(ci, curUser.getAid());
 		res.setData(ci);
 		return res;

+ 2 - 0
src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java

@@ -36,4 +36,6 @@ public interface CopyrightInfoService {
 
 	int batchCirculation(String[] ids, String recordTimeFormattedDate, CopyrightLog cl);
 
+	CopyrightInfo saveCopyright(CopyrightInfo ci, String salesman);
+
 }

+ 34 - 12
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -26,7 +26,6 @@ import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.CopyrightInfo;
 import com.goafanti.common.model.CopyrightLog;
 import com.goafanti.common.model.Notice;
@@ -58,21 +57,12 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		copyrightInfo.setCreateTime(now.getTime());
-		if (TokenManager.getToken() instanceof Admin) {
-			copyrightInfo.setFounder(TokenManager.getAdminId());
-		}
+		copyrightInfo.setStatus(CopyrightStatus.CREATE.getCode());
 		CopyrightLog log = new CopyrightLog();
 		log.setCid(copyrightInfo.getId());
 		log.setRecordTime(copyrightInfo.getCreateTime());
 		log.setComment(copyrightInfo.getComment());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setOperator(TokenManager.getAdminId());
-		}
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setPrincipal(TokenManager.getAdminId());
-		} else {
-			log.setPrincipal(aid);
-		}
+		log.setPrincipal(aid);
 		log.setStatus(copyrightInfo.getStatus());
 		copyrightInfoMapper.insertSelective(copyrightInfo);
 		copyrightLogMapper.insertSelective(log);
@@ -277,4 +267,36 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		noticeMapper.insert(n);
 	}
 
+	@Override
+	public CopyrightInfo saveCopyright(CopyrightInfo copyrightInfo, String salesman) {
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		copyrightInfo.setCreateTime(now.getTime());
+		copyrightInfo.setFounder(salesman);
+		copyrightInfo.setStatus(CopyrightStatus.DELIVERD.getCode());
+		copyrightInfo.setPrincipal(TokenManager.getAdminId());
+
+		CopyrightLog log = new CopyrightLog();
+		log.setCid(copyrightInfo.getId());
+		log.setRecordTime(copyrightInfo.getCreateTime());
+		log.setComment(copyrightInfo.getComment());
+		log.setOperator(salesman);
+		log.setPrincipal(salesman);
+		log.setStatus(CopyrightStatus.CREATE.getCode());
+
+		copyrightInfoMapper.insertSelective(copyrightInfo);
+		copyrightLogMapper.insertSelective(log);
+		createNotice(copyrightInfo, log);
+
+		CopyrightLog l = new CopyrightLog();
+		l.setCid(copyrightInfo.getId());
+		l.setRecordTime(now.getTime());
+		l.setOperator(salesman);
+		l.setPrincipal(TokenManager.getAdminId());
+		l.setStatus(CopyrightStatus.DELIVERD.getCode());
+		copyrightLogMapper.insertSelective(l);
+		createNotice(copyrightInfo, l);
+		return copyrightInfo;
+	}
+
 }

+ 13 - 0
src/main/java/com/goafanti/patent/bo/InputPatentInfo.java

@@ -7,6 +7,8 @@ import javax.validation.constraints.Size;
 import com.goafanti.common.constant.ErrorConstants;
 
 public class InputPatentInfo {
+	
+	
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	id;
 
@@ -95,6 +97,17 @@ public class InputPatentInfo {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String author;
 	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String salesman;
+	
+	public String getSalesman() {
+		return salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		this.salesman = salesman;
+	}
+
 	public String getAuthor() {
 		return author;
 	}

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

@@ -197,7 +197,7 @@ public class PatentApiController extends CertifyApiController {
 		PatentInfo pi = new PatentInfo();
 		BeanUtils.copyProperties(patentInfo, pi);
 		pi.setUid(TokenManager.getUserId());
-		res.setData(patentInfoService.savePatentInfo(pi, aid));
+		res.setData(patentInfoService.insertPatentInfo(pi, aid));
 		return res;
 	}
 

+ 3 - 1
src/main/java/com/goafanti/patent/service/PatentInfoService.java

@@ -35,7 +35,7 @@ public interface PatentInfoService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	PatentInfo savePatentInfo(PatentInfo patentInfo, String aid);
+	PatentInfo savePatentInfo(PatentInfo patentInfo, String salesman);
 
 	void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime);
 
@@ -47,4 +47,6 @@ public interface PatentInfoService {
 
 	List<PatentExpireBO> selectExpireRecord();
 
+	PatentInfo insertPatentInfo(PatentInfo pi, String aid);
+
 }

+ 70 - 45
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -23,6 +23,7 @@ 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.enums.DeleteStatus;
 import com.goafanti.common.enums.IntellectualPropertyType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
@@ -315,49 +316,19 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	}
 
 	@Override
-	public PatentInfo savePatentInfo(PatentInfo patentInfo, String aid) {
-		patentInfo.setId(UUID.randomUUID().toString());
-		patentInfo.setDeletedSign(0);
-		patentInfo.setConfirmState(0);
-		patentInfo.setPatentState(PatentInfoStatus.CREATE.getCode());
-		if (TokenManager.getToken() instanceof Admin) {
-			patentInfo.setFounder(TokenManager.getAdminId());
-		}
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		patentInfo.setRecordTime(now.getTime());
-		if (TokenManager.getToken() instanceof Admin) {
-			patentInfo.setPrincipal(TokenManager.getAdminId());
-		} else {
-			patentInfo.setPrincipal(aid);
-		}
-		patentInfoMapper.insert(patentInfo);
-
-		PatentRegistration patentRegistration = new PatentRegistration();
-		patentRegistration.setId(UUID.randomUUID().toString());
-		patentRegistration.setPid(patentInfo.getId());
-		patentRegistrationMapper.insert(patentRegistration);
-
-		PatentCost patentCost = new PatentCost();
-		patentCost.setId(UUID.randomUUID().toString());
-		patentCost.setPid(patentInfo.getId());
-		patentCost.setAnnualFeeState(0);
-		patentCost.setPaymentState(0);
-		patentCostMapper.insert(patentCost);
+	public PatentInfo savePatentInfo(PatentInfo patentInfo, String salesman) {
+		patentInfo.setFounder(salesman);
+		patentInfo.setPatentState(PatentInfoStatus.DELIVERD.getCode());
+		patentInfo.setPrincipal(TokenManager.getAdminId());
+		patentInfo = disposePatentInfoSave(patentInfo);
 
 		PatentLog log = new PatentLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setPid(patentInfo.getId());
 		log.setRecordTime(patentInfo.getRecordTime());
 		log.setState(PatentInfoStatus.CREATE.getCode());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setPrincipal(TokenManager.getAdminId());
-		} else {
-			log.setPrincipal(aid);
-		}
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setOperator(TokenManager.getAdminId());
-		}
+		log.setPrincipal(salesman);
+		log.setOperator(salesman);
 		log.setComment(patentInfo.getPatentDes());
 		patentLogMapper.insert(log);
 
@@ -367,6 +338,18 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
 		}
 		createNotice(patentInfo, log);
+
+		PatentLog l = new PatentLog();
+		l.setId(UUID.randomUUID().toString());
+		l.setPid(patentInfo.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		l.setRecordTime(now.getTime());
+		l.setState(PatentInfoStatus.DELIVERD.getCode());
+		l.setPrincipal(TokenManager.getAdminId());
+		l.setOperator(salesman);
+		patentLogMapper.insert(l);
+		createNotice(patentInfo, l);
 		return patentInfo;
 	}
 
@@ -501,6 +484,56 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		return 0;
 	}
 
+	// 专利年费到期
+	@Override
+	public List<PatentExpireBO> selectExpireRecord() {
+		return patentInfoMapper.selectExpireRecord();
+	}
+
+	@Override
+	public PatentInfo insertPatentInfo(PatentInfo patentInfo, String aid) {
+		patentInfo.setPatentState(PatentInfoStatus.CREATE.getCode());
+		patentInfo.setPrincipal(aid);
+		PatentInfo p = disposePatentInfoSave(patentInfo);
+
+		PatentLog log = new PatentLog();
+		log.setId(UUID.randomUUID().toString());
+		log.setPid(patentInfo.getId());
+		log.setRecordTime(patentInfo.getRecordTime());
+		log.setState(PatentInfoStatus.CREATE.getCode());
+		log.setPrincipal(aid);
+		log.setComment(patentInfo.getPatentDes());
+		patentLogMapper.insert(log);
+		
+		createNotice(patentInfo, log);
+		return p;
+	}
+
+	private PatentInfo disposePatentInfoSave(PatentInfo patentInfo) {
+		patentInfo.setId(UUID.randomUUID().toString());
+		patentInfo.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+		patentInfo.setConfirmState(0);
+
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		patentInfo.setRecordTime(now.getTime());
+
+		patentInfoMapper.insert(patentInfo);
+
+		PatentRegistration patentRegistration = new PatentRegistration();
+		patentRegistration.setId(UUID.randomUUID().toString());
+		patentRegistration.setPid(patentInfo.getId());
+		patentRegistrationMapper.insert(patentRegistration);
+
+		PatentCost patentCost = new PatentCost();
+		patentCost.setId(UUID.randomUUID().toString());
+		patentCost.setPid(patentInfo.getId());
+		patentCost.setAnnualFeeState(0);
+		patentCost.setPaymentState(0);
+		patentCostMapper.insert(patentCost);
+		return patentInfo;
+	}
+
 	private void createNotice(PatentInfo p, PatentLog l) {
 		PatentInfo info = patentInfoMapper.selectByPrimaryKey(p.getId());
 
@@ -525,12 +558,4 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		noticeMapper.insert(n);
 	}
 
-	
-	
-	//专利年费到期
-	@Override
-	public List<PatentExpireBO> selectExpireRecord() {
-		return patentInfoMapper.selectExpireRecord();
-	}
-
 }

+ 11 - 0
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -64,6 +64,17 @@ public class InputTechProject {
 	
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		comment;
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String salesman;
+	
+	public String getSalesman() {
+		return salesman;
+	}
+
+	public void setSalesman(String salesman) {
+		this.salesman = salesman;
+	}
 
 	public Integer getState() {
 		return state;

+ 1 - 1
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -101,7 +101,7 @@ public class TechProjectApiController extends CertifyApiController {
 		TechProject tp = new TechProject();
 		BeanUtils.copyProperties(techProject, tp);
 		tp.setUid(TokenManager.getUserId());
-		techProjectService.saveTechProject(tp, curUser.getAid());
+		techProjectService.insertTechProject(tp, curUser.getAid());
 		return res;
 	}
 

+ 3 - 1
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -17,7 +17,7 @@ public interface TechProjectService {
 
 	int updateTechProject(TechProject t, TechProjectLog l, Date recordTime);
 
-	void saveTechProject(TechProject techProject, String aid);
+	TechProject saveTechProject(TechProject techProject, String salesman);
 
 	Pagination<TechProjectManageListBo> listManageTechProject(String province, String unitName, Integer pNo, Integer pSize);
 
@@ -29,4 +29,6 @@ public interface TechProjectService {
 
 	List<OrgUnitNames> selectWebsiteUnitNames();
 
+	TechProject insertTechProject(TechProject tp, String aid);
+
 }

+ 64 - 30
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -15,6 +15,8 @@ import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.TechProjectLogMapper;
 import com.goafanti.common.dao.TechProjectMapper;
 import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.enums.DeleteStatus;
+import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.Admin;
@@ -89,37 +91,57 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	@Override
-	public void saveTechProject(TechProject techProject, String aid) {
-		techProject.setId(UUID.randomUUID().toString());
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		techProject.setRecordTime(now.getTime());
-		techProject.setState(TechProjectStatus.CREATE.getCode());
-		techProject.setDeletedSign(0);
-
-		if (TokenManager.getToken() instanceof Admin) {
-			techProject.setFounder(TokenManager.getAdminId());
-		}
-
-		techProjectMapper.insert(techProject);
+	public TechProject saveTechProject(TechProject techProject, String salesman) {
+		techProject.setState(TechProjectStatus.DELIVERD.getCode());
+		techProject.setFounder(salesman);
+		
+		techProject = disposeTechProjectSave(techProject);
 
 		TechProjectLog log = new TechProjectLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setPid(techProject.getId());
 		log.setRecordTime(techProject.getRecordTime());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setPrincipal(TokenManager.getAdminId());
-		} else {
-			log.setPrincipal(aid);
-		}
+		log.setPrincipal(salesman);
 		log.setState(TechProjectStatus.CREATE.getCode());
-		if (TokenManager.getToken() instanceof Admin) {
-			log.setOperator(TokenManager.getAdminId());
-		}
+		log.setOperator(salesman);
 		log.setComment(techProject.getDispatchInfo());
 		techProjectLogMapper.insert(log);
 
 		createNotice(techProject, log);
+		
+		TechProjectLog l = new TechProjectLog();
+		l.setId(UUID.randomUUID().toString());
+		l.setPid(techProject.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		l.setRecordTime(now.getTime());
+		l.setPrincipal(TokenManager.getAdminId());
+		l.setState(TechProjectStatus.DELIVERD.getCode());
+		l.setOperator(salesman);
+		techProjectLogMapper.insert(l);
+		
+		createNotice(techProject, l);
+		return techProject;
+	}
+	
+	@Override
+	public TechProject insertTechProject(TechProject tp, String aid) {
+		tp.setState(TechProjectStatus.CREATE.getCode());
+		tp = disposeTechProjectSave(tp);
+		
+		TechProjectLog l = new TechProjectLog();
+		l.setId(UUID.randomUUID().toString());
+		l.setPid(tp.getId());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		l.setRecordTime(now.getTime());
+		l.setPrincipal(aid);
+		l.setState(TechProjectStatus.CREATE.getCode());
+		l.setComment(tp.getDispatchInfo());
+		techProjectLogMapper.insert(l);
+		
+		createNotice(tp, l);
+		return tp;
 	}
 
 	@SuppressWarnings("unchecked")
@@ -164,6 +186,15 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return techProjectMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public List<OrgUnitNames> selectWebsiteUnitNames() {
+		String principal = null;
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+			principal = TokenManager.getAdminId();
+		}
+		return techProjectMapper.selectWebsiteUnitNames(principal);
+	}
+	
 	private void createNotice(TechProject t, TechProjectLog l) {
 		TechProject info = techProjectMapper.selectByPrimaryKey(t.getId());
 
@@ -172,7 +203,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		now.set(Calendar.MILLISECOND, 0);
 		n.setId(UUID.randomUUID().toString());
 		n.setCreateTime(now.getTime());
-		n.setReaded(0);
+		n.setReaded(NoticeReadStatus.UNREAD.getCode());
 
 		User u = userMapper.selectByPrimaryKey(t.getUid());
 		if (null != u) {
@@ -187,14 +218,17 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		n.setNoticeType(NoticeStatus.TECHPROJECT.getCode());
 		noticeMapper.insert(n);
 	}
-
-	@Override
-	public List<OrgUnitNames> selectWebsiteUnitNames() {
-		String principal = null;
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			principal = TokenManager.getAdminId();
-		}
-		return techProjectMapper.selectWebsiteUnitNames(principal);
+	
+	private TechProject disposeTechProjectSave(TechProject techProject){
+		techProject.setId(UUID.randomUUID().toString());
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		techProject.setRecordTime(now.getTime());
+		techProject.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+		techProjectMapper.insert(techProject);
+		return techProject;
 	}
 
+	
+
 }

+ 1 - 0
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -159,6 +159,7 @@ public class InputOrganizationIdentity {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		consultant;
+	
 
 	public String getId() {
 		return id;

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

@@ -32,7 +32,7 @@ public interface OrganizationIdentityService {
 
 	int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid);
 
-	int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid);
+	int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid, String saveSign);
 
 	OrgBasicInfoBo selectBasicInfo(String uid, int year);
 
@@ -42,7 +42,7 @@ public interface OrganizationIdentityService {
 
 	AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(String uid);
 
-	OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid);
+	OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid, String saveSign);
 
 
 

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

@@ -19,9 +19,9 @@ public interface UserIdentityService {
 
 	int  saveUserIdentityProcess(Result res, UserIdentity u, String uid);
 
-	int updateUserDetail(UserIdentity userIdentity, String aid, String mid);
+	int updateUserDetail(UserIdentity userIdentity, String aid, String mid, String saveSign);
 
-	UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid);
+	UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid, String saveSign);
 
 	AuditorUserIdentityDetailBo selectAuditorUserIdentityByUserId(String uid);
 

+ 27 - 23
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -18,6 +18,7 @@ import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
+import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
@@ -139,40 +140,41 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	}
 
 	@Override
-	public int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid) {
+	public int updateOrgDetail(OrganizationIdentity orgIdentity, String aid, String mid, String saveSign) {
 		if (null != orgIdentity.getAuditStatus() && 5 == orgIdentity.getAuditStatus()
 				&& !StringUtils.isBlank(orgIdentity.getUid())) {
 			User u = new User();
 			u.setId(orgIdentity.getUid());
 			u.setLvl(UserLevel.CERTIFIED.getCode());
 			userMapper.updateByPrimaryKeySelective(u);
-
-			Calendar cal = Calendar.getInstance();
-			if (null != orgIdentity.getLastYearTaxReportUrl()) {
-				OrgRatepay rate = orgRatepayMapper.selectRatepayByUidAndYear(orgIdentity.getUid(), Calendar.YEAR - 1);
-				if (null == rate) {
-					OrgRatepay r = new OrgRatepay();
-					r.setId(UUID.randomUUID().toString());
-					r.setUid(orgIdentity.getUid());
-					r.setYear(cal.get(Calendar.YEAR) - 1);
-					r.setDeletedSign(0);
-					r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-					orgRatepayMapper.insert(r);
-				} else {
-					rate.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-					orgRatepayMapper.updateByPrimaryKeySelective(rate);
-				}
+		}
+		Calendar cal = Calendar.getInstance();
+		if (null != orgIdentity.getLastYearTaxReportUrl()) {
+			OrgRatepay rate = orgRatepayMapper.selectRatepayByUidAndYear(orgIdentity.getUid(), Calendar.YEAR - 1);
+			if (null == rate) {
+				OrgRatepay r = new OrgRatepay();
+				r.setId(UUID.randomUUID().toString());
+				r.setUid(orgIdentity.getUid());
+				r.setYear(cal.get(Calendar.YEAR) - 1);
+				r.setDeletedSign(0);
+				r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
+				orgRatepayMapper.insert(r);
+			} else {
+				rate.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
+				orgRatepayMapper.updateByPrimaryKeySelective(rate);
 			}
 		}
+
 		User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)){
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			user.setAid(TokenManager.getAdminId());
 			createAuditorNotice(user);
 		} else {
-			if (!StringUtils.isBlank(aid)){
+			if (!StringUtils.isBlank(aid)) {
 				user.setAid(aid);
 			}
-			if (!StringUtils.isBlank(mid)){
+			if (!StringUtils.isBlank(mid)) {
 				user.setMid(mid);
 			}
 			createNotice(user, orgIdentity.getAuditStatus());
@@ -219,10 +221,11 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	}
 
 	@Override
-	public OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid) {
+	public OrganizationIdentity insertByAdmin(OrganizationIdentity oi, String aid, String mid, String saveSign) {
 		organizationIdentityMapper.insert(oi);
 		User u = userMapper.selectByPrimaryKey(oi.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			u.setAid(TokenManager.getAdminId());
 			userMapper.updateByPrimaryKeySelective(u);
 			createAuditorNotice(u);
@@ -278,7 +281,8 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 				}
 				n.setUid(u.getId());
 				n.setAid(s);
-				n.setContent(NoticeStatus.ORGANIZATIONCERTIFY.getDesc() + " " + IdentityAuditStatus.COMMITTED.getDesc());
+				n.setContent(
+						NoticeStatus.ORGANIZATIONCERTIFY.getDesc() + " " + IdentityAuditStatus.COMMITTED.getDesc());
 				n.setNoticeType(NoticeStatus.ORGANIZATIONCERTIFY.getCode());
 				noticeMapper.insert(n);
 			}

+ 7 - 4
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -14,6 +14,7 @@ import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
+import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
@@ -85,7 +86,7 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 	}
 
 	@Override
-	public int updateUserDetail(UserIdentity u, String aid, String mid) {
+	public int updateUserDetail(UserIdentity u, String aid, String mid, String saveSign) {
 		if (null != u.getAuditStatus() && 5 == u.getAuditStatus() && !StringUtils.isBlank(u.getUid())) {
 			User user = new User();
 			user.setId(u.getUid());
@@ -93,7 +94,8 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 			userMapper.updateByPrimaryKeySelective(user);
 		}
 		User user = userMapper.selectByPrimaryKey(u.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			user.setAid(TokenManager.getAdminId());
 			createAuditorNotice(user);
 		} else {
@@ -110,10 +112,11 @@ public class UserIdentityServiceImpl implements UserIdentityService {
 	}
 
 	@Override
-	public UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid) {
+	public UserIdentity insertByAdmin(UserIdentity ui, String aid, String mid, String saveSign) {
 		userIdentityMapper.insert(ui);
 		User u = userMapper.selectByPrimaryKey(ui.getUid());
-		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		if (!TokenManager.hasRole(AFTConstants.AUDITORADMIN) && !TokenManager.hasRole(AFTConstants.SUPERADMIN)
+				&& CertifySubmitType.SUBMIT.getCode().equals(saveSign)) {
 			u.setAid(TokenManager.getAdminId());
 			userMapper.updateByPrimaryKeySelective(u);
 			createAuditorNotice(u);