Antiloveg 8 years ago
parent
commit
3c82dc5512
23 changed files with 1390 additions and 111 deletions
  1. 8 0
      schema/2017-03-24.sql
  2. 4 2
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  3. 420 0
      src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java
  4. 13 2
      src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java
  5. 5 0
      src/main/java/com/goafanti/common/controller/WebpageController.java
  6. 66 0
      src/main/java/com/goafanti/common/enums/PatentInfoFields.java
  7. 70 0
      src/main/java/com/goafanti/common/enums/PatentInfoStatus.java
  8. 67 0
      src/main/java/com/goafanti/common/enums/PatentRegistrationFields.java
  9. 17 6
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  10. 15 0
      src/main/java/com/goafanti/common/model/PatentInfo.java
  11. 295 0
      src/main/java/com/goafanti/patent/bo/InputPatentInfo.java
  12. 143 0
      src/main/java/com/goafanti/patent/bo/InputPatentRegistration.java
  13. 138 0
      src/main/java/com/goafanti/patent/bo/PatentManageListBo.java
  14. 1 1
      src/main/java/com/goafanti/patent/bo/PatentRegistrationBo.java
  15. 6 6
      src/main/java/com/goafanti/patent/controller/PatentApiController.java
  16. 2 0
      src/main/java/com/goafanti/patent/service/PatentCostService.java
  17. 5 10
      src/main/java/com/goafanti/patent/service/PatentInfoService.java
  18. 5 0
      src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java
  19. 81 71
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  20. 11 0
      src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java
  21. 3 0
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  22. 4 13
      src/main/java/com/goafanti/user/controller/UserApiController.java
  23. 11 0
      src/main/webapp/WEB-INF/views/admin/set.jsp

+ 8 - 0
schema/2017-03-24.sql

@@ -0,0 +1,8 @@
+ALTER TABLE `patent_info` 
+ADD COLUMN `contacts` INT(1) NULL COMMENT '联系人及联系方式';
+
+ALTER TABLE `patent_info` 
+MODIFY COLUMN patent_number VARCHAR(20) COMMENT '申请号/专利号',
+MODIFY COLUMN patent_des VARCHAR(255) COMMENT '专利简介';
+
+

+ 4 - 2
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -116,7 +116,9 @@ public class AdminApiController extends BaseApiController {
 	private PasswordUtil					passwordUtil;
 	@Resource
 	private AdminService					adminService;
-
+    
+	
+	
 	/**
 	 * 新增用户
 	 * 
@@ -900,7 +902,7 @@ public class AdminApiController extends BaseApiController {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/getContacts", method = RequestMethod.POST)
+	@RequestMapping(value = "/getContacts", method = RequestMethod.GET)
 	public Result getContacts(String uid) {
 		Result res = new Result();
 		res.setData(organizationIdentityService.selectContactsByUserId(uid));

+ 420 - 0
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -0,0 +1,420 @@
+package com.goafanti.admin.controller;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Date;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.cognizance.service.OrgIntellectualPropertyService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.PatentInfoFields;
+import com.goafanti.common.enums.PatentInfoStatus;
+import com.goafanti.common.enums.PatentRegistrationFields;
+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.StringUtils;
+import com.goafanti.patent.bo.InputPatentInfo;
+import com.goafanti.patent.bo.InputPatentRegistration;
+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;
+
+@RestController
+@RequestMapping(value = "/api/admin/patent")
+public class AdminPatentApiController extends CertifyApiController {
+	@Resource
+	private PatentInfoService				patentInfoService;
+	@Resource
+	private PatentLogService				patentLogService;
+	@Resource
+	private OrganizationIdentityService		organizationIdentityServivce;
+	@Resource
+	private PatentCostService				patentCostService;
+	@Resource
+	private PatentRegistrationService		patentRegistrationService;
+	@Resource
+	private AdminService					adminService;
+	@Resource
+	private OrgIntellectualPropertyService	orgIntellectualPropertyService;
+	@Resource
+	private UserService						userService;
+
+	/**
+	 * 删除专利
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	@RequestMapping(value = "/delete", method = RequestMethod.GET)
+	public Result deletePatent(@RequestParam(name = "ids[]", required = false) String[] ids) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			res.setData(patentInfoService.batchDeleteByPrimaryKey(Arrays.asList(ids)));
+		}
+		return res;
+	}
+
+	/**
+	 * 管理端logs
+	 */
+	@RequestMapping(value = "/logs", method = RequestMethod.GET)
+	public Result patentProcess(String pid) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isBlank(pid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "专利ID"));
+		} else {
+			res.setData(patentLogService.selectProcessByPid(pid));
+		}
+		return res;
+	}
+
+	/**
+	 * 新增专利申请
+	 */
+	@RequestMapping(value = "/apply", method = RequestMethod.POST)
+	public Result manageApplyPatent(@Valid InputPatentInfo patentInfo, BindingResult bindingResult) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(patentInfo.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
+			return res;
+		}
+
+		User curUser = userService.selectByPrimaryKey(patentInfo.getUid());
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+
+		String aid = curUser.getAid();
+		PatentInfo pi = new PatentInfo();
+		BeanUtils.copyProperties(patentInfo, pi);
+		res.setData(patentInfoService.savePatentInfo(pi, aid));
+		return res;
+	}
+
+	/**
+	 * 专利详情修改保存
+	 * 
+	 * @throws ParseException
+	 */
+	@RequestMapping(value = "/update", method = RequestMethod.POST)
+	public Result managePatentInfo(@Valid InputPatentInfo patentInfo, BindingResult bindingResult,
+			String recordTimeFormattedDate) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(patentInfo.getId())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		PatentInfo p = patentInfoService.selectByPrimaryKey(patentInfo.getId());
+		if (null == p) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		Date recordTime = null;
+		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
+			try {
+				recordTime = DateUtils.parseDate(recordTimeFormattedDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+		PatentInfo pi = new PatentInfo();
+		PatentLog pl = new PatentLog();
+		pi.setId(patentInfo.getId());
+		BeanUtils.copyProperties(patentInfo, pi);
+		BeanUtils.copyProperties(patentInfo, pl);
+		patentInfoService.updatePatentInfo(pi, pl, recordTime);
+		res.setData(1);
+		return res;
+	}
+
+	/**
+	 * 专利列表
+	 * 
+	 * @throws ParseException
+	 */
+	@RequestMapping(value = "/patentList", method = RequestMethod.GET)
+	public Result patentList(Integer serialNumber, String patentNumber, String office, String locationProvince,
+			String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			@RequestParam(name = "createTime[]", required = false) String[] createTime,
+			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
+			String author, String pageNo, String pageSize) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(patentInfoService.getManagePatentList(serialNumber, patentNumber, office, locationProvince,
+				unitName, patentCatagory, patentName, patentState, createTime, patentApplicationDate, author, pNo,
+				pSize));
+		return res;
+	}
+
+	/**
+	 * 待缴费专利管理列表
+	 */
+	@RequestMapping(value = "/pendingPaymentList", method = RequestMethod.GET)
+	public Result managePendingPaymentList(String locationProvince, String pageNo, String pageSize) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(patentInfoService.getManagePendingPaymentList(locationProvince, pNo, pSize));
+		return res;
+	}
+
+	/**
+	 * 年费确认缴费
+	 */
+	@RequestMapping(value = "/confirmPayment", method = RequestMethod.POST)
+	public Result confirmPayment(String cid, String uid) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isBlank(cid) || StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+		PatentCost cost = patentCostService.selectByPrimaryKey(cid);
+		if (null == cost) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		if (null == cost.getPid()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		PatentInfo info = patentInfoService.selectByPrimaryKey(cost.getPid());
+		if (!uid.equals(info.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		PatentCost patentCost = new PatentCost();
+		patentCost.setId(cid);
+		patentCost.setAnnualFeeState(1);
+		patentCostService.updateByPrimaryKeySelective(patentCost);
+		return res;
+	}
+
+	/**
+	 * 补正审查通知列表
+	 */
+	@RequestMapping(value = "/noticeOfCorrectionList", method = RequestMethod.POST)
+	public Result noticeOfCorrectionList(Date authorizedDate, Integer serialNumber, String patentNumber, String office,
+			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			String author, String pageNo, String pageSize) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(patentInfoService.getNoticeOfCorrectionList(authorizedDate, serialNumber, patentNumber, office,
+				locationProvince, unitName, patentCatagory, patentName, patentState, author, pNo, pSize));
+		return res;
+	}
+
+	/**
+	 * 补正审查通知答复确认
+	 */
+	@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
+	public Result replyConfirm(String pid, String uid, Integer patentState) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isBlank(pid) || StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+
+		if (null == patentState || patentState != PatentInfoStatus.REVIEWNOTICE.getCode()
+				|| patentState != PatentInfoStatus.CORRECTIONNOTICE.getCode()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利状态", "专利状态"));
+			return res;
+		}
+
+		PatentInfo info = patentInfoService.selectByPrimaryKey(pid);
+		if (!uid.equals(info.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利申请", "专利记录ID"));
+			return res;
+		}
+		patentInfoService.updateNoticeOfCorrection(pid, patentState);
+		return res;
+	}
+
+	/**
+	 * 收发详情入口/收发纸件登记
+	 */
+	@RequestMapping(value = "/getRecieveSendList", method = RequestMethod.GET)
+	public Result RecieveSendList(String pageNo, String pageSize) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		Integer pNo = 1;
+		Integer pSize = 10;
+
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(patentRegistrationService.getRecieveSendList(pNo, pSize));
+		return res;
+	}
+
+	/**
+	 * 收发登记详情编辑保存
+	 * 
+	 * @throws ParseException
+	 */
+	@RequestMapping(value = "/saveRecieveSend", method = RequestMethod.POST)
+	public Result recieveSendDetail(BindingResult bindingResult, String rid, String pid,
+			@Valid InputPatentRegistration patentRegistrationBo)  {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					PatentRegistrationFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+
+		if (StringUtils.isBlank(pid) || StringUtils.isBlank(rid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "专利记录ID", "专利记录ID"));
+			return res;
+		}
+		patentRegistrationService.updateByPrimaryKey(regBo2Reg(rid, pid, patentRegistrationBo));
+		return res;
+	}
+
+	private PatentRegistration regBo2Reg(String rid, String pid, InputPatentRegistration patentRegistrationBo) {
+		PatentRegistration patentRegistration = new PatentRegistration();
+		patentRegistration.setId(rid);
+		patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
+		try {
+			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
+				patentRegistration.setAcceptanceIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), "yyyy-MM-dd"));
+			} else {
+				patentRegistration.setAcceptanceIssueTime(null);
+			}
+			if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
+				patentRegistration.setAcceptanceReceiveTime(
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), "yyyy-MM-dd"));
+			} else {
+				patentRegistration.setAcceptanceReceiveTime(null);
+			}
+			patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
+			patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
+			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
+				patentRegistration.setAuthorizationIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), "yyyy-MM-dd"));
+			} else {
+				patentRegistration.setAuthorizationIssueTime(null);
+			}
+			if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
+				patentRegistration.setAuthorizationReceiveTime(
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), "yyyy-MM-dd"));
+			} else {
+				patentRegistration.setAuthorizationReceiveTime(null);
+			}
+			patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
+			patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
+			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
+				patentRegistration.setCertificateIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), "yyyy-MM-dd"));
+			} else {
+				patentRegistration.setCertificateIssueTime(null);
+			}
+			if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
+				patentRegistration.setCertificateRecieveTime(
+						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), "yyyy-MM-dd"));
+			} else {
+				patentRegistration.setCertificateRecieveTime(null);
+			}
+		} catch (ParseException e) {
+		}
+		patentRegistration.setCertificateTrackingNumber(patentRegistrationBo.getCertificateTrackingNumber());
+		patentRegistration.setPid(pid);
+		return patentRegistration;
+	}
+
+}

+ 13 - 2
src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java

@@ -43,7 +43,7 @@ import com.goafanti.user.service.UserService;
 
 @Controller
 @RequestMapping(value = "/api/admintechproject")
-public class AdminTechProjectController extends CertifyApiController {
+public class AdminTechProjectApiController extends CertifyApiController {
 	@Value(value = "${aesSecretKey}")
 	private String					aesSecretKey	= null;
 	@Resource
@@ -54,6 +54,17 @@ public class AdminTechProjectController extends CertifyApiController {
 	private TechProjectLogService	techProjectLogService;
 	@Resource
 	private UserService				userService;
+	
+	/**
+	 * 获取科技部门
+	 * @return
+	 */
+	@RequestMapping(value = "/getDepartment", method = RequestMethod.GET)
+	public Result getDepartment(String uid){
+		Result res = new Result();
+		 res.setData(techWebsiteService.getDepartment(uid));
+		 return res;
+	}
 
 	/**
 	 * 科技项目申报列表
@@ -407,7 +418,7 @@ public class AdminTechProjectController extends CertifyApiController {
 	@RequestMapping(value = "/download", method = RequestMethod.GET)
 	public Result download(HttpServletResponse response, String id) {
 		Result res = new Result();
-		if (!checkUserLogin(res)) {
+		if (!checkAdminLogin(res)) {
 			return res;
 		}
 

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

@@ -80,6 +80,11 @@ public class WebpageController extends BaseController {
 		return "/admin/login";
 	}
 	
+	@RequestMapping(value = "/admin/set", method = RequestMethod.GET)
+	public String adminSet(HttpServletRequest request, ModelAndView modelview) {
+		return "/admin/set";
+	}
+	
 	/*@RequestMapping(value = "/admin/userManage", method = RequestMethod.GET)
 	public String adminUserManage(HttpServletRequest request, ModelAndView modelview) {
 		return "/admin/userManage";

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

@@ -0,0 +1,66 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum PatentInfoFields {
+	
+	UID("uid", "用户id"),
+	CONTACTS("contacts", "联系人"),
+	PATENTNAME("patentName", "专利名称"),
+	PATENTCATAGORY("patentCatagory", "专利类别"),
+	PATENTNUMBER("patentNumber", "专利号/申请号"),
+	PATENTFIELD("patentField", "专利领域"),
+	PATENTDES("patentDes", "专利简介"),
+	FIRSTINVENTORNAME("firstInventorName", "第一发明人姓名"),
+	FIRSTINVENTORNATIONALITY("firstInventorNationality", "第一发明人国籍"),
+	FIRSTINVENTORIDNUMBER("firstInventorIdNumber", "第一发明人身份证号"),
+	FIRSTINVENTORISPUBLISH("firstInventorIsPublish", "第一发明人是否公布"),
+	SECONDINVENTORNAME("secondInventorName", "第二发明人姓名"),
+	SECONDINVENTORNATIONALITY("secondInventorNationality", "第二发明人国籍"),
+	SECONDINVENTORISPUBLISH("secondInventorIsPublish", "第二发明人是否公布"),
+	THIRDINVENTORNAME("thirdInventorName", "第三发明人姓名"),
+	THIRDINVENTORNATIONALITY("thirdInventorNationality", "第三发明人国籍"),
+	THIRDINVENTORISPUBLISH("thirdInventorIsPublish", "第三发明人是否公布"),
+	OTHER("", "未知参数");
+	
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, PatentInfoFields> status = new HashMap<String, PatentInfoFields>();
+	
+	private PatentInfoFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (PatentInfoFields value : PatentInfoFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static PatentInfoFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+}

+ 70 - 0
src/main/java/com/goafanti/common/enums/PatentInfoStatus.java

@@ -0,0 +1,70 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum PatentInfoStatus {
+	CREATE(0, "申请"),
+	SIGN(1,"签单"),
+	DELIVERD(2, "派单"),
+	CIRCULATION(3,"流转"),
+	COMPOSE(4, "撰写"),
+	ACCEPT(5, "受理"),
+	REVIEWNOTICE(6, "审查意见通知"),
+	REVIEWREPLY(7, "审查意见答复"),
+	CORRECTIONNOTICE(8, "补正通知"),
+	CORRECTIONREPLY(9, "补正已答复"),
+	AUTHORIZE(10, "授权"),
+	REJECT(11, "驳回"),
+	LICENSE(12, "发证"),
+	SETTLEMENT(13, "已结款"),
+	CALLBACK(14, "撤销"),
+	OTHER(15, "其他");
+	
+	
+	private Integer	code;
+	private String	desc;
+	
+	private PatentInfoStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, PatentInfoStatus> status = new HashMap<Integer, PatentInfoStatus>();
+
+	static {
+		for (PatentInfoStatus value : PatentInfoStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static PatentInfoStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static PatentInfoStatus getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+}

+ 67 - 0
src/main/java/com/goafanti/common/enums/PatentRegistrationFields.java

@@ -0,0 +1,67 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum PatentRegistrationFields {
+	
+	ACCEPTANCERECEIVETIME("acceptanceReceiveTime", "用户id"),
+	ACCEPTANCEISSUETIME("acceptanceIssueTime", "联系人"),
+	ACCEPTANCETRACKINGNUMBER("acceptanceTrackingNumber", "专利名称"),
+	ACCEPTANCEEXPRESSCOMPANY("acceptanceExpressCompany", "专利类别"),
+	
+	AUTHORIZATIONRECEIVETIME("authorizationReceiveTime", "专利号/申请号"),
+	AUTHORIZATIONISSUETIME("authorizationIssueTime", "专利领域"),
+	AUTHORIZATIONTRACKINGNUMBER("authorizationTrackingNumber", "专利简介"),
+	AUTHORIZATIONEXPRESSCOMPANY("authorizationExpressCompany", "第一发明人姓名"),
+	
+	CERTIFICATERECIEVETIME("certificateRecieveTime", "第一发明人国籍"),
+	CERTIFICATEISSUETIME("certificateIssueTime", "第一发明人身份证号"),
+	CERTIFICATETRACKINGNUMBER("certificateTrackingNumber", "第一发明人是否公布"),
+	CERTIFICATEEXPRESSCOMPANY("certificateExpressCompany", "第二发明人姓名"),
+	
+	OTHER("", "未知参数");
+	
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, PatentRegistrationFields> status = new HashMap<String, PatentRegistrationFields>();
+	
+	private PatentRegistrationFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (PatentRegistrationFields value : PatentRegistrationFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static PatentRegistrationFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+	
+	
+
+}

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

@@ -34,6 +34,7 @@
     <result column="confirm_state" property="confirmState" jdbcType="INTEGER" />
     <result column="record_time" property="recordTime" jdbcType="TIMESTAMP" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
+    <result column="contacts" property="contacts" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, serial_number, patent_number, patent_name, patent_catagory, patent_state, 
@@ -41,7 +42,7 @@
     patent_certificate_url, patent_application_date, first_inventor_name, first_inventor_nationality, 
     first_inventor_id_number, first_inventor_is_publish, second_inventor_name, second_inventor_nationality, 
     second_inventor_is_publish, third_inventor_name, third_inventor_nationality, third_inventor_is_publish, 
-    create_time, author, authorized_date,office, principal ,confirm_state, record_time, deleted_sign
+    create_time, author, authorized_date,office, principal ,confirm_state, record_time, deleted_sign, contacts
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -65,7 +66,7 @@
       second_inventor_nationality, second_inventor_is_publish, 
       third_inventor_name, third_inventor_nationality, 
       third_inventor_is_publish, create_time, author, authorized_date, 
-      office, principal, confirm_state, record_time, deleted_sign)
+      office, principal, confirm_state, record_time, deleted_sign, contacts)
      
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
       #{patentNumber,jdbcType=VARCHAR}, #{patentName,jdbcType=VARCHAR}, #{patentCatagory,jdbcType=INTEGER}, 
@@ -80,7 +81,7 @@
       #{thirdInventorIsPublish,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR}, 
       #{authorizedDate,jdbcType=TIMESTAMP},
       #{office,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{confirmState,jdbcType=INTEGER}, #{recordTime,jdbcType=TIMESTAMP},
-       #{deletedSign,jdbcType=INTEGER})
+      #{deletedSign,jdbcType=INTEGER}, #{contacts,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentInfo" >
     insert into patent_info
@@ -181,6 +182,9 @@
       <if test="deletedSign != null">
         deleted_sign,
       </if>
+      <if test="contacts != null">
+        contacts,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -279,6 +283,9 @@
       <if test="deletedSign != null">
         #{deletedSign,jdbcType=INTEGER},
       </if>
+      <if test="contacts != null">
+        #{contacts,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PatentInfo" >
@@ -374,9 +381,12 @@
        <if test="recordTime != null" >
         record_time = #{recordTime,jdbcType=TIMESTAMP},
       </if>
-       <if test="deletedSign != null">
+      <if test="deletedSign != null">
         deleted_sign = #{deletedSign,jdbcType=INTEGER},
       </if>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -412,7 +422,8 @@
       principal = #{principal,jdbcType=VARCHAR},
       confirm_state = #{confirmState,jdbcType=INTEGER},
       record_time = #{recordTime,jdbcType=TIMESTAMP},
-      deleted_sign = #{deletedSign,jdbcType=INTEGER}
+      deleted_sign = #{deletedSign,jdbcType=INTEGER},
+      contacts = #{contacts,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -655,7 +666,7 @@
 		 FROM user u 
 		 LEFT JOIN organization_identity o ON u.id = o.uid
 		 INNER JOIN patent_info p on u.id = p.uid 
-   where p.patent_state in (4,6) and p.deleted_sign = 0
+   where p.patent_state in (6,8) and p.deleted_sign = 0
 	<if test="serialNumber != null">
 	    and p.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>

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

@@ -161,6 +161,11 @@ public class PatentInfo {
      * 删除标记
      */
     private Integer deletedSign;
+    
+    /**
+     * 联系人及联系方式
+     */
+    private Integer contacts;
 
     public String getId() {
         return id;
@@ -421,6 +426,16 @@ public class PatentInfo {
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
 	}
+	
+	
+
+	public Integer getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(Integer contacts) {
+		this.contacts = contacts;
+	}
 
 	//授权日/发文日
 	public String getAuthorizedFormattedDate() {

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

@@ -0,0 +1,295 @@
+package com.goafanti.patent.bo;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+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;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	uid;
+
+	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	contacts;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	patentName;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	patentCatagory;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	patentNumber;
+
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	patentField;
+
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	patentDes;
+    
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	firstInventorName;
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	firstInventorNationality;
+	
+	@Size(min = 0, max = 18, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	firstInventorIdNumber;
+    
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	firstInventorIsPublish;
+	
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	secondInventorName;
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	secondInventorNationality;
+	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	secondInventorIsPublish;
+	
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	thirdInventorName;
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	thirdInventorNationality;
+	
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer	thirdInventorIsPublish;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String patentProryStatementUrl;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String patentWritingUrl;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String authorizationNoticeUrl;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String patentCertificateUrl;
+	
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		state;
+
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		principal;
+	
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		comment;
+	
+	
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public String getPrincipal() {
+		return principal;
+	}
+
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public Integer getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(Integer contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getPatentName() {
+		return patentName;
+	}
+
+	public void setPatentName(String patentName) {
+		this.patentName = patentName;
+	}
+
+	public Integer getPatentCatagory() {
+		return patentCatagory;
+	}
+
+	public void setPatentCatagory(Integer patentCatagory) {
+		this.patentCatagory = patentCatagory;
+	}
+
+	public String getPatentNumber() {
+		return patentNumber;
+	}
+
+	public void setPatentNumber(String patentNumber) {
+		this.patentNumber = patentNumber;
+	}
+
+	public Integer getPatentField() {
+		return patentField;
+	}
+
+	public void setPatentField(Integer patentField) {
+		this.patentField = patentField;
+	}
+
+	public String getPatentDes() {
+		return patentDes;
+	}
+
+	public void setPatentDes(String patentDes) {
+		this.patentDes = patentDes;
+	}
+
+	public String getFirstInventorName() {
+		return firstInventorName;
+	}
+
+	public void setFirstInventorName(String firstInventorName) {
+		this.firstInventorName = firstInventorName;
+	}
+
+	public String getFirstInventorNationality() {
+		return firstInventorNationality;
+	}
+
+	public void setFirstInventorNationality(String firstInventorNationality) {
+		this.firstInventorNationality = firstInventorNationality;
+	}
+
+	public String getFirstInventorIdNumber() {
+		return firstInventorIdNumber;
+	}
+
+	public void setFirstInventorIdNumber(String firstInventorIdNumber) {
+		this.firstInventorIdNumber = firstInventorIdNumber;
+	}
+
+	public Integer getFirstInventorIsPublish() {
+		return firstInventorIsPublish;
+	}
+
+	public void setFirstInventorIsPublish(Integer firstInventorIsPublish) {
+		this.firstInventorIsPublish = firstInventorIsPublish;
+	}
+
+	public String getSecondInventorName() {
+		return secondInventorName;
+	}
+
+	public void setSecondInventorName(String secondInventorName) {
+		this.secondInventorName = secondInventorName;
+	}
+
+	public String getSecondInventorNationality() {
+		return secondInventorNationality;
+	}
+
+	public void setSecondInventorNationality(String secondInventorNationality) {
+		this.secondInventorNationality = secondInventorNationality;
+	}
+
+	public Integer getSecondInventorIsPublish() {
+		return secondInventorIsPublish;
+	}
+
+	public void setSecondInventorIsPublish(Integer secondInventorIsPublish) {
+		this.secondInventorIsPublish = secondInventorIsPublish;
+	}
+
+	public String getThirdInventorName() {
+		return thirdInventorName;
+	}
+
+	public void setThirdInventorName(String thirdInventorName) {
+		this.thirdInventorName = thirdInventorName;
+	}
+
+	public String getThirdInventorNationality() {
+		return thirdInventorNationality;
+	}
+
+	public void setThirdInventorNationality(String thirdInventorNationality) {
+		this.thirdInventorNationality = thirdInventorNationality;
+	}
+
+	public Integer getThirdInventorIsPublish() {
+		return thirdInventorIsPublish;
+	}
+
+	public void setThirdInventorIsPublish(Integer thirdInventorIsPublish) {
+		this.thirdInventorIsPublish = thirdInventorIsPublish;
+	}
+
+	public String getPatentProryStatementUrl() {
+		return patentProryStatementUrl;
+	}
+
+	public void setPatentProryStatementUrl(String patentProryStatementUrl) {
+		this.patentProryStatementUrl = patentProryStatementUrl;
+	}
+
+	public String getPatentWritingUrl() {
+		return patentWritingUrl;
+	}
+
+	public void setPatentWritingUrl(String patentWritingUrl) {
+		this.patentWritingUrl = patentWritingUrl;
+	}
+
+	public String getAuthorizationNoticeUrl() {
+		return authorizationNoticeUrl;
+	}
+
+	public void setAuthorizationNoticeUrl(String authorizationNoticeUrl) {
+		this.authorizationNoticeUrl = authorizationNoticeUrl;
+	}
+
+	public String getPatentCertificateUrl() {
+		return patentCertificateUrl;
+	}
+
+	public void setPatentCertificateUrl(String patentCertificateUrl) {
+		this.patentCertificateUrl = patentCertificateUrl;
+	}
+	
+	
+}

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

@@ -0,0 +1,143 @@
+package com.goafanti.patent.bo;
+
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputPatentRegistration {
+	
+	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	acceptanceReceiveTime;
+
+	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	acceptanceIssueTime;
+	
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	acceptanceTrackingNumber;
+
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	acceptanceExpressCompany;
+	
+	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	authorizationReceiveTime;
+
+	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	authorizationIssueTime;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	authorizationTrackingNumber;
+
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	authorizationExpressCompany;
+
+	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	certificateRecieveTime;
+
+	@Size(min = 0, max = 10, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	certificateIssueTime;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	certificateTrackingNumber;
+
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	certificateExpressCompany;
+
+	public String getAcceptanceReceiveTime() {
+		return acceptanceReceiveTime;
+	}
+
+	public void setAcceptanceReceiveTime(String acceptanceReceiveTime) {
+		this.acceptanceReceiveTime = acceptanceReceiveTime;
+	}
+
+	public String getAcceptanceIssueTime() {
+		return acceptanceIssueTime;
+	}
+
+	public void setAcceptanceIssueTime(String acceptanceIssueTime) {
+		this.acceptanceIssueTime = acceptanceIssueTime;
+	}
+
+	public String getAcceptanceTrackingNumber() {
+		return acceptanceTrackingNumber;
+	}
+
+	public void setAcceptanceTrackingNumber(String acceptanceTrackingNumber) {
+		this.acceptanceTrackingNumber = acceptanceTrackingNumber;
+	}
+
+	public String getAcceptanceExpressCompany() {
+		return acceptanceExpressCompany;
+	}
+
+	public void setAcceptanceExpressCompany(String acceptanceExpressCompany) {
+		this.acceptanceExpressCompany = acceptanceExpressCompany;
+	}
+
+	public String getAuthorizationReceiveTime() {
+		return authorizationReceiveTime;
+	}
+
+	public void setAuthorizationReceiveTime(String authorizationReceiveTime) {
+		this.authorizationReceiveTime = authorizationReceiveTime;
+	}
+
+	public String getAuthorizationIssueTime() {
+		return authorizationIssueTime;
+	}
+
+	public void setAuthorizationIssueTime(String authorizationIssueTime) {
+		this.authorizationIssueTime = authorizationIssueTime;
+	}
+
+	public String getAuthorizationTrackingNumber() {
+		return authorizationTrackingNumber;
+	}
+
+	public void setAuthorizationTrackingNumber(String authorizationTrackingNumber) {
+		this.authorizationTrackingNumber = authorizationTrackingNumber;
+	}
+
+	public String getAuthorizationExpressCompany() {
+		return authorizationExpressCompany;
+	}
+
+	public void setAuthorizationExpressCompany(String authorizationExpressCompany) {
+		this.authorizationExpressCompany = authorizationExpressCompany;
+	}
+
+	public String getCertificateRecieveTime() {
+		return certificateRecieveTime;
+	}
+
+	public void setCertificateRecieveTime(String certificateRecieveTime) {
+		this.certificateRecieveTime = certificateRecieveTime;
+	}
+
+	public String getCertificateIssueTime() {
+		return certificateIssueTime;
+	}
+
+	public void setCertificateIssueTime(String certificateIssueTime) {
+		this.certificateIssueTime = certificateIssueTime;
+	}
+
+	public String getCertificateTrackingNumber() {
+		return certificateTrackingNumber;
+	}
+
+	public void setCertificateTrackingNumber(String certificateTrackingNumber) {
+		this.certificateTrackingNumber = certificateTrackingNumber;
+	}
+
+	public String getCertificateExpressCompany() {
+		return certificateExpressCompany;
+	}
+
+	public void setCertificateExpressCompany(String certificateExpressCompany) {
+		this.certificateExpressCompany = certificateExpressCompany;
+	}
+	
+	
+	
+}

+ 138 - 0
src/main/java/com/goafanti/patent/bo/PatentManageListBo.java

@@ -0,0 +1,138 @@
+package com.goafanti.patent.bo;
+
+import java.util.Date;
+
+public class PatentManageListBo {
+	private String	id;
+
+	private String	uid;
+
+	private Integer	serialNumber;
+
+	private String	patentNumber;
+
+	private String	office;
+
+	private String	unitName;
+
+    private String locationProvince;
+    
+	private String	patentName;
+
+	private Integer	patentState;
+
+	private Date	createTime;
+
+	private Date	patentApplicationDate;
+
+	private Date	authorizedDate;
+
+	private String	author;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getPatentNumber() {
+		return patentNumber;
+	}
+
+	public void setPatentNumber(String patentNumber) {
+		this.patentNumber = patentNumber;
+	}
+
+	public String getOffice() {
+		return office;
+	}
+
+	public void setOffice(String office) {
+		this.office = office;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getLocationProvince() {
+		return locationProvince;
+	}
+
+	public void setLocationProvince(String locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	public String getPatentName() {
+		return patentName;
+	}
+
+	public void setPatentName(String patentName) {
+		this.patentName = patentName;
+	}
+
+	public Integer getPatentState() {
+		return patentState;
+	}
+
+	public void setPatentState(Integer patentState) {
+		this.patentState = patentState;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getPatentApplicationDate() {
+		return patentApplicationDate;
+	}
+
+	public void setPatentApplicationDate(Date patentApplicationDate) {
+		this.patentApplicationDate = patentApplicationDate;
+	}
+
+	public Date getAuthorizedDate() {
+		return authorizedDate;
+	}
+
+	public void setAuthorizedDate(Date authorizedDate) {
+		this.authorizedDate = authorizedDate;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+	
+	
+
+}

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

@@ -2,7 +2,7 @@ package com.goafanti.patent.bo;
 
 
 public class PatentRegistrationBo {
-	 /**
+	 	/**
 	    * 受理通知书收到时间
 	    */
 	    private String acceptanceReceiveTime;

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

@@ -44,6 +44,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.patent.bo.PatentApplicationFeeBo;
 import com.goafanti.patent.bo.PatentCompositeBo;
+import com.goafanti.patent.bo.PatentManageListBo;
 import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
 import com.goafanti.patent.bo.PatentPendingBo;
 import com.goafanti.patent.bo.PatentRecieveSendBo;
@@ -88,7 +89,8 @@ public class PatentApiController extends BaseApiController {
 		Result res = new Result();
 		res = checkCertify(res, TokenManager.getUserId());
 		if (res.getError().isEmpty()) {
-			res.setData(patentInfoService.savePatentInfo(patentInfo, TokenManager.getUserId(), TokenManager.getToken().getAid())); 
+			patentInfo.setUid(TokenManager.getUserId());
+			res.setData(patentInfoService.savePatentInfo(patentInfo, TokenManager.getToken().getAid())); 
 		}
 		return res;
 	}
@@ -219,7 +221,7 @@ public class PatentApiController extends BaseApiController {
 		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			String aid = userService.selectByPrimaryKey(uid).getAid();
-			res.setData(patentInfoService.savePatentInfo(patentInfo, uid, aid));
+			res.setData(patentInfoService.savePatentInfo(patentInfo, aid));
 		}
 		return res;
 	}
@@ -315,9 +317,7 @@ public class PatentApiController extends BaseApiController {
 	@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
 	public Result replyConfirm(String pid, Integer patentState) {
 		Result res = new Result();
-		if (StringUtils.isBlank(patentInfoService.updateNoticeOfCorrection(res, pid, patentState))){
-			res.getError().add(buildError("", "确认失败!"));
-		}
+		patentInfoService.updateNoticeOfCorrection(pid, patentState);
 		return res;
 	}
 
@@ -714,7 +714,7 @@ public class PatentApiController extends BaseApiController {
 	}
 
 	// 管理端申请专利列表(专利综合管理)
-	private Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
+	private Pagination<PatentManageListBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
 			String[] createTime, String[] patentApplicationDate, String author, Integer pNo, Integer pSize)
 			throws ParseException {

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

@@ -15,5 +15,7 @@ public interface PatentCostService {
 
 	PatentCost insert(PatentCost patentCost);
 
+	PatentCost selectByPrimaryKey(String cid);
+
 
 }

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

@@ -1,20 +1,17 @@
 package com.goafanti.patent.service;
 
-import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 
-import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.patent.bo.PatentCompositeBo;
+import com.goafanti.patent.bo.PatentManageListBo;
 import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
 import com.goafanti.patent.bo.PatentPendingBo;
 
 public interface PatentInfoService {
 
-
 	PatentInfo insert(PatentInfo patentInfo);
 
 	int updateByPrimaryKeySelective(PatentInfo patentInfo);
@@ -24,10 +21,9 @@ public interface PatentInfoService {
 	Pagination<PatentInfo> getClientApplyList(String userId, String patentNumber, String patentName,
 			Integer parentCatagory, Integer patentState, Integer pNo, Integer pSize);
 
-	Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
+	Pagination<PatentManageListBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
 			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
-			String[] createTime, String[] patentApplicationDate,  String author, Integer pNo,
-			Integer pSize)  throws ParseException;
+			String[] createTime, String[] patentApplicationDate, String author, Integer pNo, Integer pSize);
 
 	Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo, Integer pSize);
 
@@ -37,11 +33,10 @@ public interface PatentInfoService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	PatentInfo savePatentInfo(PatentInfo patentInfo, String uid, String aid);
+	PatentInfo savePatentInfo(PatentInfo patentInfo, String aid);
 
 	void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime);
 
-	String updateNoticeOfCorrection(Result res, String pid, Integer patentState);
-
+	void updateNoticeOfCorrection(String pid, Integer patentState);
 
 }

+ 5 - 0
src/main/java/com/goafanti/patent/service/impl/PatentCostServiceImpl.java

@@ -68,4 +68,9 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 		return patentCost;
 	}
 
+	@Override
+	public PatentCost selectByPrimaryKey(String id) {
+		return patentCostMapper.selectByPrimaryKey(id);
+	}
+
 }

+ 81 - 71
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -11,13 +11,14 @@ import java.util.UUID;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.goafanti.common.bo.Result;
 import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.dao.PatentCostMapper;
 import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.PatentLogMapper;
 import com.goafanti.common.dao.PatentRegistrationMapper;
 import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.enums.PatentInfoStatus;
+import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.OrgIntellectualProperty;
 import com.goafanti.common.model.PatentCost;
@@ -29,7 +30,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.patent.bo.PatentCompositeBo;
+import com.goafanti.patent.bo.PatentManageListBo;
 import com.goafanti.patent.bo.PatentNoticeOfCorrectionBo;
 import com.goafanti.patent.bo.PatentPendingBo;
 import com.goafanti.patent.service.PatentInfoService;
@@ -49,7 +50,6 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	@Autowired
 	OrgIntellectualPropertyMapper	orgIntellectualPropertyMapper;
 
-
 	@Override
 	public PatentInfo insert(PatentInfo patentInfo) {
 		patentInfoMapper.insert(patentInfo);
@@ -107,9 +107,9 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentCompositeBo> getManagePatentList(Integer serialNumber, String patentNumber, String office,
+	public Pagination<PatentManageListBo> 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) {
 		Map<String, Object> params = new HashMap<>();
 		Date cStart = null;
 		Date cEnd = null;
@@ -117,12 +117,21 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		Date pEnd = null;
 
 		if (cDate != null && cDate.length > 0) {
-			cStart = StringUtils.isBlank(cDate[0]) ? null : DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
-		    cEnd = StringUtils.isBlank(cDate[1]) ? null : DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
+			try {
+				cStart = StringUtils.isBlank(cDate[0]) ? null : DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
+				cEnd = StringUtils.isBlank(cDate[1]) ? null
+						: DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
+			} catch (ParseException e) {
+			}
 		}
 		if (pDate != null && pDate.length > 0) {
-			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			pEnd = StringUtils.isBlank(pDate[1]) ? null :  DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			try {
+				pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+				pEnd = StringUtils.isBlank(pDate[1]) ? null
+						: DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			} catch (ParseException e) {
+			}
+			
 		}
 
 		if (cStart != null) {
@@ -184,7 +193,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		if (pageSize == null || pageSize < 0) {
 			pageSize = 10;
 		}
-		return (Pagination<PatentCompositeBo>) findPage("findManagePatentListByPage", "findManagePatentCount", params,
+		return (Pagination<PatentManageListBo>) findPage("findManagePatentListByPage", "findManagePatentCount", params,
 				pageNo, pageSize);
 	}
 
@@ -273,15 +282,14 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	}
 
 	@Override
-	public PatentInfo savePatentInfo(PatentInfo patentInfo, String uid, String aid) {
+	public PatentInfo savePatentInfo(PatentInfo patentInfo, String aid) {
 		patentInfo.setId(UUID.randomUUID().toString());
-		patentInfo.setUid(uid);
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		patentInfo.setRecordTime(now.getTime());
 		patentInfo.setDeletedSign(0);
 		patentInfo.setConfirmState(0);
-		patentInfo.setPatentState(1);
+		patentInfo.setPatentState(PatentInfoStatus.CREATE.getCode());
 		patentInfo.setPrincipal(aid);
 		patentInfoMapper.insert(patentInfo);
 
@@ -301,9 +309,9 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		log.setId(UUID.randomUUID().toString());
 		log.setPid(patentInfo.getId());
 		log.setRecordTime(patentInfo.getCreateTime());
-		log.setState(1);
+		log.setState(PatentInfoStatus.CREATE.getCode());
 		log.setPrincipal(aid);
-		if (TokenManager.getToken() instanceof  Admin) {
+		if (TokenManager.getToken() instanceof Admin) {
 			log.setOperator(TokenManager.getAdminId());
 		}
 		patentLogMapper.insert(log);
@@ -311,79 +319,80 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	}
 
 	@Override
-	public void updatePatentInfo(PatentInfo patentInfo, PatentLog patentLog, Date recordTime) {
-		if (null != patentLog.getState() && recordTime != null) {
-			switch (patentLog.getState()) {
-			case 2:
-				patentInfo.setCreateTime(recordTime);
-				break;
-			case 3:
-				patentInfo.setPatentApplicationDate(recordTime);
-				break;
-			case 8:
-				patentInfo.setAuthorizedDate(recordTime);
-				break;
+	public void updatePatentInfo(PatentInfo p, PatentLog log, Date recordTime) {
+		if (null != log.getState() && recordTime != null && null != log.getPrincipal()) {
+			log.setId(UUID.randomUUID().toString());
+			log.setPid(p.getId());
+			log.setRecordTime(recordTime);
+			if (TokenManager.getToken() instanceof Admin) {
+				log.setOperator(TokenManager.getAdminId());
 			}
-			patentInfo.setPatentState(patentLog.getState());
-			patentInfo.setPrincipal(null == patentLog.getPrincipal() ? "" : patentLog.getPrincipal());
-			patentLog.setPid(patentInfo.getId());
-			patentLog.setId(UUID.randomUUID().toString());
-			patentLog.setRecordTime(recordTime);
-			patentLog.setOperator(TokenManager.getAdminId());
-			patentLogMapper.insert(patentLog);
+			if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.DELIVERD) {
+				p.setCreateTime(recordTime);
+			} else if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.ACCEPT) {
+				p.setPatentApplicationDate(recordTime);
+			} else if (PatentInfoStatus.getStatus(log.getState()) == PatentInfoStatus.AUTHORIZE) {
+				p.setAuthorizedDate(recordTime);
+			}
+
+			if (TechProjectStatus.getStatus(log.getState()) != TechProjectStatus.CIRCULATION) {
+				p.setPatentState(log.getState());
+			}
+			p.setPrincipal(log.getPrincipal());
+			patentLogMapper.insert(log);
 		}
-		patentInfoMapper.updateByPrimaryKeySelective(patentInfo);
-		if (8 == patentInfo.getPatentState()) {
+		patentInfoMapper.updateByPrimaryKeySelective(p);
+		if (PatentInfoStatus.getStatus(p.getPatentState()) == PatentInfoStatus.AUTHORIZE) {
 			OrgIntellectualProperty o = new OrgIntellectualProperty();
 			o.setId(UUID.randomUUID().toString());
-			o.setUid(patentInfo.getUid());
-			o.setPid(patentInfo.getId());
+			o.setUid(p.getUid());
+			o.setPid(p.getId());
 			o.setDeletedSign(0);
-			o.setIntellectualPropertyNumber(patentInfo.getPatentNumber());
-			o.setIntellectualPropertyName(patentInfo.getPatentName());
+			o.setIntellectualPropertyNumber(p.getPatentNumber());
+			o.setIntellectualPropertyName(p.getPatentName());
 			o.setCatagory(1);
 			o.setObtainWay(1);
-			o.setAuthorizationNumber(patentInfo.getPatentNumber());
-			o.setAuthorizationDate(patentInfo.getAuthorizedDate());
-			o.setEvaluationCategory((3 == patentInfo.getPatentCatagory()) ? 0 : 1);
+			o.setAuthorizationNumber(p.getPatentNumber());
+			o.setAuthorizationDate(p.getAuthorizedDate());
+			o.setEvaluationCategory((3 == p.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;
+		if (PatentInfoStatus.getStatus(p.getPatentState()) == PatentInfoStatus.LICENSE) {
+			OrgIntellectualProperty o = orgIntellectualPropertyMapper.selectOrgIntellectualPropertyByPid(p.getId());
+			if (null != o) {
+				Integer i = 0;
+				switch (p.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);
 			}
-			o.setCatagory(i);
-			orgIntellectualPropertyMapper.updateByPrimaryKeySelective(o);
 		}
 	}
 
 	@Override
-	public  String updateNoticeOfCorrection(Result res, String pid, Integer patentState) {
+	public void updateNoticeOfCorrection(String pid, Integer patentState) {
 		PatentInfo patentInfo = new PatentInfo();
 		patentInfo.setId(pid);
-		if (patentState == 4) {
-			patentInfo.setPatentState(5);
-		} else if (patentState == 6) {
-			patentInfo.setPatentState(7);
-		} else {
-			return "";
-		}
+		if (patentState == PatentInfoStatus.REVIEWNOTICE.getCode()) {
+			patentInfo.setPatentState(PatentInfoStatus.REVIEWREPLY.getCode());
+		} else if (patentState == PatentInfoStatus.CORRECTIONNOTICE.getCode()) {
+			patentInfo.setPatentState(PatentInfoStatus.CORRECTIONREPLY.getCode());
+		} 
 		patentInfoMapper.updateByPrimaryKeySelective(patentInfo);
+		
 		PatentLog patentLog = new PatentLog();
 		PatentInfo p = patentInfoMapper.selectByPrimaryKey(pid);
 		patentLog.setId(UUID.randomUUID().toString());
@@ -391,11 +400,12 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		patentLog.setState(p.getPatentState());
 		patentLog.setOperator(TokenManager.getAdminId());
 		patentLog.setPrincipal(p.getPrincipal());
+		
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		patentLog.setRecordTime(now.getTime());
+		
 		patentLogMapper.insert(patentLog);
-		return "success";
 	}
 
 }

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

@@ -39,6 +39,17 @@ public class TechProjectApiController extends CertifyApiController {
 	private TechWebsiteService		techWebsiteService;
 	@Resource
 	private TechProjectLogService	techProjectLogService;
+	
+	/**
+	 * 获取科技部门
+	 * @return
+	 */
+	@RequestMapping(value = "/getDepartment", method = RequestMethod.GET)
+	public Result getDepartment(String uid){
+		Result res = new Result();
+		 res.setData(techWebsiteService.getDepartment(TokenManager.getUserId()));
+		 return res;
+	}
 
 	/**
 	 * 科技项目申报列表

+ 3 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -56,6 +56,9 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			log.setId(UUID.randomUUID().toString());
 			log.setPid(t.getId());
 			log.setRecordTime(recordTime);
+			if (TokenManager.getToken() instanceof Admin) {
+				log.setOperator(TokenManager.getAdminId());
+			}
 			if (TechProjectStatus.getStatus(log.getState()) == TechProjectStatus.DELIVERD) {
 				t.setCreateTime(recordTime);
 			} else if (TechProjectStatus.getStatus(log.getState()) == TechProjectStatus.ACCEPT) {

+ 4 - 13
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -843,26 +843,17 @@ public class UserApiController extends BaseApiController {
 	}
 	
 	
-	/**
-	 * 获取科技部门
-	 * @return
-	 */
-	@RequestMapping(value = "/getDepartment", method = RequestMethod.POST)
-	public Result getDepartment(String uid){
-		Result res = new Result();
-		 res.setData(techWebsiteService.getDepartment(null == uid ? TokenManager.getUserId() : uid));
-		 return res;
-	}
+	
 	
 	/**
 	 * 获取公司联系人
 	 * @param uid
 	 * @return
 	 */
-	@RequestMapping(value = "/getContacts", method = RequestMethod.POST)
-	public Result getContacts(String uid){
+	@RequestMapping(value = "/getContacts", method = RequestMethod.GET)
+	public Result getContacts(){
 		Result res = new Result();
-		res.setData(organizationIdentityService.selectContactsByUserId(StringUtils.isBlank(uid) ? TokenManager.getUserId() :uid ));
+		res.setData(organizationIdentityService.selectContactsByUserId(TokenManager.getUserId()));
 		return res;
 	}
 	

+ 11 - 0
src/main/webapp/WEB-INF/views/admin/set.jsp

@@ -0,0 +1,11 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt"%>
+<%@ include file="../header.jsp"%>
+<title>设置页面</title>
+<link href="${staticHost}/admin/set.css" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	<script type="text/javascript" src="${staticHost}/admin/set.js"></script>
+</body>
+</html>