Browse Source

高企认定详情接口

Antiloveg 9 years ago
parent
commit
3fd8f16309
27 changed files with 606 additions and 118 deletions
  1. 94 66
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 4 0
      src/main/java/com/goafanti/common/dao/OrgCognizanceLogMapper.java
  3. 8 0
      src/main/java/com/goafanti/common/mapper/OrgCognizanceLogMapper.xml
  4. 14 3
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  5. 9 8
      src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml
  6. 14 0
      src/main/java/com/goafanti/common/model/OrgCognizance.java
  7. 14 0
      src/main/java/com/goafanti/common/model/OrgCognizanceLog.java
  8. 6 6
      src/main/java/com/goafanti/common/model/OrgHumanResource.java
  9. 7 5
      src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java
  10. 373 0
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceDetailBo.java
  11. 1 0
      src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java
  12. 11 0
      src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceLogService.java
  13. 20 0
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceLogServiceImpl.java
  14. 2 2
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceServiceImpl.java
  15. 2 0
      src/main/java/com/goafanti/user/controller/UserApiController.java
  16. 0 1
      src/main/resources/spring/spring-shiro.xml
  17. 1 1
      src/main/webapp/WEB-INF/views/admin/index.jsp
  18. 1 1
      src/main/webapp/WEB-INF/views/admin/login.jsp
  19. 1 1
      src/main/webapp/WEB-INF/views/admin/servicesManage/copyright.jsp
  20. 1 1
      src/main/webapp/WEB-INF/views/admin/servicesManage/highTech.jsp
  21. 1 1
      src/main/webapp/WEB-INF/views/admin/servicesManage/patent.jsp
  22. 1 1
      src/main/webapp/WEB-INF/views/admin/userManage.jsp
  23. 17 17
      src/main/webapp/WEB-INF/views/error.jsp
  24. 1 1
      src/main/webapp/WEB-INF/views/user/account/index.jsp
  25. 1 1
      src/main/webapp/WEB-INF/views/user/account/services.jsp
  26. 1 1
      src/main/webapp/WEB-INF/views/user/account/set.jsp
  27. 1 1
      src/main/webapp/WEB-INF/views/user/login.jsp

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

@@ -20,6 +20,7 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
 import com.goafanti.common.model.OrgCognizance;
+import com.goafanti.common.model.OrgCognizanceLog;
 import com.goafanti.common.model.OrgFinance;
 import com.goafanti.common.model.OrgHonorDatum;
 import com.goafanti.common.model.OrgHumanResource;
@@ -38,6 +39,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
 import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
 import com.goafanti.techservice.cognizance.service.OrgActivityService;
+import com.goafanti.techservice.cognizance.service.OrgCognizanceLogService;
 import com.goafanti.techservice.cognizance.service.OrgCognizanceService;
 import com.goafanti.techservice.cognizance.service.OrgFinanceService;
 import com.goafanti.techservice.cognizance.service.OrgHonorDatumService;
@@ -78,15 +80,17 @@ public class AdminApiController extends BaseApiController {
 	@Resource
 	private OrgActivityService				orgActivityService;
 	@Resource
-	private OrgActivityCostService          orgActivityCostService;
+	private OrgActivityCostService			orgActivityCostService;
 	@Resource
-	private OrgTechAchievementService       orgTechAchievementService;
+	private OrgTechAchievementService		orgTechAchievementService;
 	@Resource
-	private OrgHonorDatumService            orgHonorDatumService;
+	private OrgHonorDatumService			orgHonorDatumService;
 	@Resource
 	private OrgTechCenterService			orgTechCenterService;
 	@Resource
-	private OrgCognizanceService            orgCognizanceService;
+	private OrgCognizanceService			orgCognizanceService;
+	@Resource
+	private OrgCognizanceLogService			orgCognizanceLogService;
 
 	/**
 	 * 个人用户列表
@@ -209,7 +213,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
 	public Result orgHumanResource(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -296,7 +300,7 @@ public class AdminApiController extends BaseApiController {
 	 * 管理端录入+修改知识产权信息
 	 * 
 	 * @return
-	 * @throws ParseException 
+	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/intellectual", method = RequestMethod.POST)
 	public Result intellectual(OrgIntellectualProperty orgIntellectualProperty, String authorizationDateFormattedDate,
@@ -304,16 +308,15 @@ public class AdminApiController extends BaseApiController {
 		Result res = new Result();
 		if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
 			orgIntellectualProperty
-			.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
+					.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
 		}
 		if (null == orgIntellectualProperty.getId()) {
-			
-				orgIntellectualProperty.setId(UUID.randomUUID().toString());
-				orgIntellectualProperty.setUid(uid);
-				orgIntellectualProperty.setEvaluationCategory(
-						(orgIntellectualProperty.getCatagory() >= 2 && orgIntellectualProperty.getCatagory() <= 4) ? 1
-								: 0);
-				orgIntellectualProperty.setDeletedSign(0);
+
+			orgIntellectualProperty.setId(UUID.randomUUID().toString());
+			orgIntellectualProperty.setUid(uid);
+			orgIntellectualProperty.setEvaluationCategory(
+					(orgIntellectualProperty.getCatagory() >= 2 && orgIntellectualProperty.getCatagory() <= 4) ? 1 : 0);
+			orgIntellectualProperty.setDeletedSign(0);
 			res.setData(orgIntellectualPropertyService.insert(orgIntellectualProperty));
 		} else {
 			orgIntellectualProperty.setEvaluationCategory(orgIntellectualProperty.getCatagory() <= 2 ? 1 : 0);
@@ -357,7 +360,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/techProductList", method = RequestMethod.POST)
 	public Result techProductList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -371,7 +374,7 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业研究开发活动情况表入口
 	 * 
@@ -388,7 +391,7 @@ public class AdminApiController extends BaseApiController {
 	public Result activityList(String activityNumber, String activityName, String startDateFormattedDate,
 			String endDateFormattedDate, String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -403,7 +406,7 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业研究开发活动情况新增、修改
 	 * 
@@ -416,11 +419,11 @@ public class AdminApiController extends BaseApiController {
 			throws ParseException {
 		Result res = new Result();
 		orgActivity.setDeletedSign(0);
-		if (!StringUtils.isBlank(startDateFormattedDate)){
+		if (!StringUtils.isBlank(startDateFormattedDate)) {
 			orgActivity.setStartDate(DateUtils.parseDate(startDateFormattedDate, "yyyy-MM-dd"));
 		}
-		
-		if(StringUtils.isBlank(endDateFormattedDate)){
+
+		if (StringUtils.isBlank(endDateFormattedDate)) {
 			orgActivity.setEndDate(DateUtils.parseDate(endDateFormattedDate, "yyyy-MM-dd"));
 		}
 		if (StringUtils.isBlank(orgActivity.getId())) {
@@ -452,7 +455,7 @@ public class AdminApiController extends BaseApiController {
 		res.setData(orgActivity);
 		return res;
 	}
-	
+
 	/**
 	 * 企业年度研究开发费用结构明细表列表入口
 	 * 
@@ -463,7 +466,7 @@ public class AdminApiController extends BaseApiController {
 	public Result activityCostList(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
 			String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -483,15 +486,15 @@ public class AdminApiController extends BaseApiController {
 	 * 企业年度研究开发费用结构明细表(新增+修改)
 	 * 
 	 * @return
-	 * @throws ParseException 
+	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/activityCost", method = RequestMethod.POST)
 	public Result activityCost(OrgActivityCost orgActivityCost, String signDateFormattedDate) throws ParseException {
 		Result res = new Result();
-		if (StringUtils.isBlank(signDateFormattedDate)){
+		if (StringUtils.isBlank(signDateFormattedDate)) {
 			orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
 		}
-		
+
 		if (null == orgActivityCost.getId()) {
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
 			orgActivityCost.setStartDate(ac.getStartDate());
@@ -506,7 +509,6 @@ public class AdminApiController extends BaseApiController {
 		return res;
 	}
 
-
 	/**
 	 * 上年度高新技术产品(服务)情况(新增+修改)
 	 * 
@@ -535,7 +537,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/ratepay", method = RequestMethod.POST)
 	public Result ratepay(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -574,7 +576,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/finance", method = RequestMethod.POST)
 	public Result finance(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -617,22 +619,22 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/activityNumber", method = RequestMethod.POST)
 	public Result listActivityNumber(String uid) {
 		Result res = new Result();
-		List<ActivityNumberBo> activityNumberBo = orgActivityService
-				.selectOrgActivityNumberBoByUid(uid);
+		List<ActivityNumberBo> activityNumberBo = orgActivityService.selectOrgActivityNumberBoByUid(uid);
 		res.setData(activityNumberBo);
 		return res;
 	}
-	
+
 	/**
 	 * 科技成果转化情况列表入口
+	 * 
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
 	 */
 	@RequestMapping(value = "/achievementList", method = RequestMethod.POST)
-	public Result achievementList(String pageNo, String pageSize, String uid){
+	public Result achievementList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -646,17 +648,18 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 科技成果转化情况新增+修改
+	 * 
 	 * @param achievement
 	 * @return
-	 * @throws ParseException 
+	 * @throws ParseException
 	 */
-	@RequestMapping(value= "/disposeAchievement", method = RequestMethod.POST)
-	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException{
+	@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
+	public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
 		Result res = new Result();
-		if (null == achievement.getId()){
+		if (null == achievement.getId()) {
 			achievement.setId(UUID.randomUUID().toString());
 			achievement.setDeletedSign(0);
 			orgTechAchievementService.inset(achievement);
@@ -665,7 +668,7 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 企业荣誉及其他证明材料列表入口
 	 * 
@@ -674,7 +677,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/honorList", method = RequestMethod.POST)
 	public Result honorList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -694,12 +697,12 @@ public class AdminApiController extends BaseApiController {
 	 * 
 	 * @param achievement
 	 * @return
-	 * @throws ParseException 
+	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeHonor", method = RequestMethod.POST)
 	public Result disposeHonor(OrgHonorDatum honor, String issuingTimeFormattedDate, String uid) throws ParseException {
 		Result res = new Result();
-		if (!StringUtils.isBlank(issuingTimeFormattedDate)){
+		if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
 			honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
 		}
 		if (null == honor.getId()) {
@@ -712,7 +715,7 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 技术中心入口
 	 * 
@@ -721,7 +724,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/center", method = RequestMethod.POST)
 	public Result center(String uid) {
 		Result res = new Result();
-		res = checkCertify(res);
+		res = checkCertify(res,uid);
 		if (res.getError().isEmpty()) {
 			res.setData(orgTechCenterService.selectOrgTechCenterByUid(uid));
 		}
@@ -735,7 +738,8 @@ public class AdminApiController extends BaseApiController {
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeCenter", method = RequestMethod.POST)
-	public Result disposeCenter(OrgTechCenter orgTechCenter, String foundingTimeFormattedDate, String uid) throws ParseException {
+	public Result disposeCenter(OrgTechCenter orgTechCenter, String foundingTimeFormattedDate, String uid)
+			throws ParseException {
 		Result res = new Result();
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
@@ -750,38 +754,40 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 获取公司联系人
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/getContacts", method = RequestMethod.POST)
-	public Result getContacts(String uid){
+	public Result getContacts(String uid) {
 		Result res = new Result();
 		OrganizationIdentity i = organizationIdentityService.selectOrgIdentityByUserId(uid);
 		Map<String, String> map = new LinkedHashMap<String, String>();
-		if (!StringUtils.isBlank(i.getFirstContacts()) && !StringUtils.isBlank(i.getFirstMobile())){
+		if (!StringUtils.isBlank(i.getFirstContacts()) && !StringUtils.isBlank(i.getFirstMobile())) {
 			map.put(i.getFirstContacts(), i.getFirstMobile());
 		}
-		
-		if (!StringUtils.isBlank(i.getSecondContacts()) && !StringUtils.isBlank(i.getSecondMobile())){
+
+		if (!StringUtils.isBlank(i.getSecondContacts()) && !StringUtils.isBlank(i.getSecondMobile())) {
 			map.put(i.getSecondContacts(), i.getSecondMobile());
 		}
-		
-		if (!StringUtils.isBlank(i.getThirdContacts()) && !StringUtils.isBlank(i.getThirdMobile())){
+
+		if (!StringUtils.isBlank(i.getThirdContacts()) && !StringUtils.isBlank(i.getThirdMobile())) {
 			map.put(i.getThirdContacts(), i.getThirdMobile());
 		}
-		
+
 		res.setData(map);
 		return res;
 	}
-	
+
 	/**
 	 * 申请高企认定
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/applyCognizance", method = RequestMethod.POST)
-	public Result applyCognizance(String contacts, String comment, String consultant, String uid){
+	public Result applyCognizance(String contacts, String comment, String consultant, String uid) {
 		Result res = new Result();
 		OrgCognizance c = new OrgCognizance();
 		c.setId(UUID.randomUUID().toString());
@@ -789,19 +795,21 @@ public class AdminApiController extends BaseApiController {
 		c.setContacts(contacts);
 		c.setComment(comment);
 		c.setConsultant(consultant);
+		c.setYear(Calendar.getInstance().get(Calendar.YEAR));
 		c.setDeletedSign(0);
 		orgCognizanceService.insert(c);
 		return res;
 	}
-	
+
 	/**
 	 * 高企认定列表入口
+	 * 
 	 * @param locationProvince
 	 * @param unitName
 	 * @return
 	 */
 	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
-	public Result listCognizance(String locationProvince, String unitName, String pageNo, String pageSize){
+	public Result listCognizance(String locationProvince, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -811,10 +819,36 @@ public class AdminApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		
+
 		res.setData(orgCognizanceService.listCognizance(locationProvince, unitName, pNo, pSize));
 		return res;
 	}
+	
+	/**
+	 * 高企认定流转状态
+	 * @param cid
+	 * @return
+	 */
+	@RequestMapping(value = "/cognizanceLog", method = RequestMethod.POST)
+	public Result cognizanceLog(String cid){
+		Result res = new Result();
+		List<OrgCognizanceLog> list = orgCognizanceLogService.selectOrgCognizanceLogByCid(cid);
+		System.out.println(list.size());
+		res.setData(list);
+		return res;
+	}
+	
+	/**
+	 * 高企认定详情入口
+	 * @param uid
+	 * @param cid
+	 * @return
+	 */
+	@RequestMapping(value = "/cognizanceDetail", method = RequestMethod.POST)
+	public Result cognizanceDetail(String uid, String cid){
+		Result res = new Result();
+		return res;
+	}
 
 	// 判断用户是否通过认证
 	private Result checkCertify(Result res, String uid) {
@@ -838,11 +872,5 @@ public class AdminApiController extends BaseApiController {
 				auditStatus, pNo, pSize);
 	}
 
-	// 判断用户是否通过认证
-	private Result checkCertify(Result res) {
-		if (5 != organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()).getAuditStatus()) {
-			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
-		}
-		return res;
-	}
+	
 }

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

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.OrgCognizanceLog;
 
 public interface OrgCognizanceLogMapper {
@@ -14,4 +16,6 @@ public interface OrgCognizanceLogMapper {
     int updateByPrimaryKeySelective(OrgCognizanceLog record);
 
     int updateByPrimaryKey(OrgCognizanceLog record);
+
+	List<OrgCognizanceLog> selectOrgCognizanceLogByCid(String cid);
 }

+ 8 - 0
src/main/java/com/goafanti/common/mapper/OrgCognizanceLogMapper.xml

@@ -114,4 +114,12 @@
       comment = #{comment,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  
+  <select id="selectOrgCognizanceLogByCid"  parameterType="java.lang.String" resultMap="BaseResultMap">
+    select b.name as principal , m.operator , m.id , m.cid , m.state , m.comment , m.record_time  from 
+		(select a.name as operator, c.id ,c.cid  , c.state , c.comment ,c.record_time , c.principal as cri
+		from org_cognizance_log c INNER JOIN admin a 
+		on a.id = c.operator order by c.record_time desc) m INNER JOIN admin b on m.cri = b. id
+    where m.cid = #{cid,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -19,12 +19,13 @@
     <result column="certificate_number" property="certificateNumber" jdbcType="VARCHAR" />
     <result column="certificate_url" property="certificateUrl" jdbcType="VARCHAR" />
     <result column="state" property="state" jdbcType="INTEGER" />
+    <result column="year" property="year" jdbcType="INTEGER" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, serial_number, contacts, comment, consultant, technical_field1, technical_field2, 
     technical_field3, basic_research_cost, accident, create_time, accept_date, issuing_date, 
-    certificate_number, certificate_url, state, deleted_sign
+    certificate_number, certificate_url, state, year, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -42,14 +43,14 @@
       technical_field1, technical_field2, technical_field3, 
       basic_research_cost, accident, create_time, 
       accept_date, issuing_date, certificate_number, 
-      certificate_url, state, deleted_sign
+      certificate_url, state, year, deleted_sign
       )
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
       #{contacts,jdbcType=VARCHAR}, #{comment,jdbcType=VARCHAR}, #{consultant,jdbcType=VARCHAR}, 
       #{technicalField1,jdbcType=INTEGER}, #{technicalField2,jdbcType=INTEGER}, #{technicalField3,jdbcType=INTEGER}, 
       #{basicResearchCost,jdbcType=INTEGER}, #{accident,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{acceptDate,jdbcType=TIMESTAMP}, #{issuingDate,jdbcType=TIMESTAMP}, #{certificateNumber,jdbcType=VARCHAR}, 
-      #{certificateUrl,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER}
+      #{certificateUrl,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgCognizance" >
@@ -106,6 +107,9 @@
       <if test="state != null" >
         state,
       </if>
+      <if test="year != null" >
+        year,
+      </if>
       <if test="deletedSign != null" >
         deleted_sign,
       </if>
@@ -162,6 +166,9 @@
       <if test="state != null" >
         #{state,jdbcType=INTEGER},
       </if>
+      <if test="year != null" >
+        #{year,jdbcType=INTEGER},
+      </if>
       <if test="deletedSign != null" >
         #{deletedSign,jdbcType=INTEGER},
       </if>
@@ -218,6 +225,9 @@
       <if test="state != null" >
         state = #{state,jdbcType=INTEGER},
       </if>
+      <if test="year != null" >
+        year = #{year,jdbcType=INTEGER},
+      </if>
       <if test="deletedSign != null" >
         deleted_sign = #{deletedSign,jdbcType=INTEGER},
       </if>
@@ -242,6 +252,7 @@
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       certificate_url = #{certificateUrl,jdbcType=VARCHAR},
       state = #{state,jdbcType=INTEGER},
+      year = #{year,jdbcType=INTEGER},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>

+ 9 - 8
src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml

@@ -428,15 +428,16 @@
   </select>
   
   <select id="findOrgHumanResourceCount" resultType="java.lang.Integer" parameterType="String">
-   	select count(1) 
-	    from org_human_resource
-	     where deleted_sign = 0
-	    <if test="uid != null">
-		    and  uid = #{uid,jdbcType=VARCHAR}
-		</if>
-		<if test="year != null">
+   	select count(1) from 
+	   org_human_resource
+    where deleted_sign = 0
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="year != null">
 		and year = #{year,jdbcType=INTEGER}
-	    </if>
+	</if>
+	
   </select>
   
   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">

+ 14 - 0
src/main/java/com/goafanti/common/model/OrgCognizance.java

@@ -87,6 +87,11 @@ public class OrgCognizance {
     * 状态
     */
     private Integer state;
+    
+    /**
+     * 申请年份
+     */
+    private Integer year;
 
     /**
     * 删除标记
@@ -231,6 +236,15 @@ public class OrgCognizance {
     }
     
     @JsonIgnore
+    public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	@JsonIgnore
     public Integer getDeletedSign() {
         return deletedSign;
     }

+ 14 - 0
src/main/java/com/goafanti/common/model/OrgCognizanceLog.java

@@ -2,6 +2,8 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 public class OrgCognizanceLog {
     private String id;
 
@@ -87,4 +89,16 @@ public class OrgCognizanceLog {
     public void setComment(String comment) {
         this.comment = comment;
     }
+    
+    public String getRecordTimeFormattedDate(){
+		if (this.recordTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getRecordTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setRecordTimeFormattedDate(String recordTimeFormattedDate){
+		
+	}
 }

+ 6 - 6
src/main/java/com/goafanti/common/model/OrgHumanResource.java

@@ -158,7 +158,7 @@ public class OrgHumanResource {
     /**
      * 删除标记
      */
-    private String deleteSign;
+    private String deletedSign;
 
     public String getId() {
         return id;
@@ -411,14 +411,14 @@ public class OrgHumanResource {
 	}
     
 	@JsonIgnore
-	public String getDeleteSign() {
-		return deleteSign;
+	public String getDeletedSign() {
+		return deletedSign;
 	}
 
-	public void setDeleteSign(String deleteSign) {
-		this.deleteSign = deleteSign;
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
 	}
-	
+
 	public String getRosterDownloadFileName(){
 		if (StringUtils.isBlank(this.rosterUrl)){
 			return null;

+ 7 - 5
src/main/java/com/goafanti/common/model/OrgIntellectualProperty.java

@@ -58,7 +58,7 @@ public class OrgIntellectualProperty {
     /**
      * 知识产权URL
      */
-    private String propertyUrl;
+    private String propertyRightUrl;
     
     /**
      * 删除标记
@@ -148,12 +148,14 @@ public class OrgIntellectualProperty {
     }
     
     
-    public String getPropertyUrl() {
-		return propertyUrl;
+    
+
+	public String getPropertyRightUrl() {
+		return propertyRightUrl;
 	}
 
-	public void setPropertyUrl(String propertyUrl) {
-		this.propertyUrl = propertyUrl;
+	public void setPropertyRightUrl(String propertyRightUrl) {
+		this.propertyRightUrl = propertyRightUrl;
 	}
 
 	@JsonIgnore

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

@@ -0,0 +1,373 @@
+package com.goafanti.techservice.cognizance.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
+/**
+ * 高企认定明细
+ */
+public class CognizanceDetailBo {
+	private String uid;
+	
+	private String cid;
+	
+	/**
+	 * 公司名称
+	 */
+	private String unitName;
+	
+	/**
+	 * 公司组织机构代码
+	 */
+	private String orgCode;
+	
+	/**
+	 * 公司地址
+	 */
+	private String postalAddress;
+	
+	/**
+	 * 联系人
+	 */
+	private String contacts;
+	
+	/**
+	 * 技术领域1st
+	 */
+    private Integer technicalField1;
+	
+    /**
+     * 技术领域2nd
+     */
+    private Integer technicalField2;
+    
+    /**
+     * 技术领域3rd
+     */
+	private Integer technicalField3;
+	
+	/**
+	 * 一类知识产权数量
+	 */
+	private Integer firstCategory;
+	
+	/**
+	 * 二类知识产权数量
+	 */
+	private Integer secondCategory;
+	
+	/**
+	 * 职工总数
+	 */
+	private Integer firmTotal;
+	
+	/**
+	 * 科技人员总数
+	 */
+	private Integer techTotal;
+	
+	/**
+	 * 第一年所有者权益(净资产)
+	 */
+	private Integer netAsset1;
+	
+	/**
+	 * 第一年销售收入
+	 */
+	private Integer salesRevenue1;
+	
+	/**
+	 * 第一年利润总额
+	 */
+	private Integer grossProfit1;
+	
+	/**
+	 * 第二年所有者权益(净资产)
+	 */
+	private Integer netAsset2;
+	
+	/**
+	 * 第二年销售收入
+	 */
+	private Integer salesRevenue2;
+	
+	/**
+	 * 第二年利润总额
+	 */
+	private Integer grossProfit2;
+	
+	/**
+	 * 第三年所有者权益(净资产)
+	 */
+	private Integer netAsset3;
+	
+	/**
+	 * 第三年销售收入
+	 */
+	private Integer salesRevenue3;
+	
+	/**
+	 * 第三年利润总额
+	 */
+	private Integer grossProfit3;
+	
+	/**
+	 * 近三年研发费用总额
+	 */
+	private Integer researchCost;
+	
+	/**
+	 * 在中国境内研发费用
+	 */
+	private Integer territory;
+	
+	/**
+	 * 基础研究投入费用
+	 */
+	private Integer basicResearchCost;
+	
+	/**
+	 * 近一年企业总收入
+	 */
+	private Integer totalRevenue;
+	
+	/**
+	 * 近一年高新技术产品(服务)收入
+	 */
+	private Integer lastYearRevenue;
+	
+	/**
+	 * 申请认定前一年内是否发生过重大安全、重大质量或严重环境违法行为
+	 */
+	private Integer accident;
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getCid() {
+		return cid;
+	}
+
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getTechnicalField1() {
+		return technicalField1;
+	}
+
+	public void setTechnicalField1(Integer technicalField1) {
+		this.technicalField1 = technicalField1;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getTechnicalField2() {
+		return technicalField2;
+	}
+
+	public void setTechnicalField2(Integer technicalField2) {
+		this.technicalField2 = technicalField2;
+	}
+
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getTechnicalField3() {
+		return technicalField3;
+	}
+
+	public void setTechnicalField3(Integer technicalField3) {
+		this.technicalField3 = technicalField3;
+	}
+
+	public Integer getFirstCategory() {
+		return firstCategory;
+	}
+
+	public void setFirstCategory(Integer firstCategory) {
+		this.firstCategory = firstCategory;
+	}
+
+	public Integer getSecondCategory() {
+		return secondCategory;
+	}
+
+	public void setSecondCategory(Integer secondCategory) {
+		this.secondCategory = secondCategory;
+	}
+
+	public Integer getFirmTotal() {
+		return firmTotal;
+	}
+
+	public void setFirmTotal(Integer firmTotal) {
+		this.firmTotal = firmTotal;
+	}
+
+	public Integer getTechTotal() {
+		return techTotal;
+	}
+
+	public void setTechTotal(Integer techTotal) {
+		this.techTotal = techTotal;
+	}
+
+	public Integer getNetAsset1() {
+		return netAsset1;
+	}
+
+	public void setNetAsset1(Integer netAsset1) {
+		this.netAsset1 = netAsset1;
+	}
+
+	public Integer getSalesRevenue1() {
+		return salesRevenue1;
+	}
+
+	public void setSalesRevenue1(Integer salesRevenue1) {
+		this.salesRevenue1 = salesRevenue1;
+	}
+
+	public Integer getGrossProfit1() {
+		return grossProfit1;
+	}
+
+	public void setGrossProfit1(Integer grossProfit1) {
+		this.grossProfit1 = grossProfit1;
+	}
+
+	public Integer getNetAsset2() {
+		return netAsset2;
+	}
+
+	public void setNetAsset2(Integer netAsset2) {
+		this.netAsset2 = netAsset2;
+	}
+
+	public Integer getSalesRevenue2() {
+		return salesRevenue2;
+	}
+
+	public void setSalesRevenue2(Integer salesRevenue2) {
+		this.salesRevenue2 = salesRevenue2;
+	}
+
+	public Integer getGrossProfit2() {
+		return grossProfit2;
+	}
+
+	public void setGrossProfit2(Integer grossProfit2) {
+		this.grossProfit2 = grossProfit2;
+	}
+
+	public Integer getNetAsset3() {
+		return netAsset3;
+	}
+
+	public void setNetAsset3(Integer netAsset3) {
+		this.netAsset3 = netAsset3;
+	}
+
+	public Integer getSalesRevenue3() {
+		return salesRevenue3;
+	}
+
+	public void setSalesRevenue3(Integer salesRevenue3) {
+		this.salesRevenue3 = salesRevenue3;
+	}
+
+	public Integer getGrossProfit3() {
+		return grossProfit3;
+	}
+
+	public void setGrossProfit3(Integer grossProfit3) {
+		this.grossProfit3 = grossProfit3;
+	}
+
+	public Integer getResearchCost() {
+		return researchCost;
+	}
+
+	public void setResearchCost(Integer researchCost) {
+		this.researchCost = researchCost;
+	}
+
+	public Integer getTerritory() {
+		return territory;
+	}
+
+	public void setTerritory(Integer territory) {
+		this.territory = territory;
+	}
+
+	public Integer getBasicResearchCost() {
+		return basicResearchCost;
+	}
+
+	public void setBasicResearchCost(Integer basicResearchCost) {
+		this.basicResearchCost = basicResearchCost;
+	}
+
+	public Integer getTotalRevenue() {
+		return totalRevenue;
+	}
+
+	public void setTotalRevenue(Integer totalRevenue) {
+		this.totalRevenue = totalRevenue;
+	}
+
+	public Integer getLastYearRevenue() {
+		return lastYearRevenue;
+	}
+
+	public void setLastYearRevenue(Integer lastYearRevenue) {
+		this.lastYearRevenue = lastYearRevenue;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getAccident() {
+		return accident;
+	}
+
+	public void setAccident(Integer accident) {
+		this.accident = accident;
+	}
+	
+	
+}

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

@@ -890,6 +890,7 @@ public class CognizanceApiController extends BaseApiController {
 		c.setComment(comment);
 		c.setConsultant(consultant);
 		c.setDeletedSign(0);
+		c.setYear(Calendar.getInstance().get(Calendar.YEAR));
 		orgCognizanceService.insert(c);
 		return res;
 	}

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

@@ -0,0 +1,11 @@
+package com.goafanti.techservice.cognizance.service;
+
+import java.util.List;
+
+import com.goafanti.common.model.OrgCognizanceLog;
+
+public interface OrgCognizanceLogService {
+
+	List<OrgCognizanceLog> selectOrgCognizanceLogByCid(String cid);
+
+}

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

@@ -0,0 +1,20 @@
+package com.goafanti.techservice.cognizance.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrgCognizanceLogMapper;
+import com.goafanti.common.model.OrgCognizanceLog;
+import com.goafanti.techservice.cognizance.service.OrgCognizanceLogService;
+@Service
+public class OrgCognizanceLogServiceImpl implements OrgCognizanceLogService {
+	@Autowired
+	private OrgCognizanceLogMapper orgCognizanceLogMapper;
+
+	@Override
+	public List<OrgCognizanceLog> selectOrgCognizanceLogByCid(String cid) {
+		return orgCognizanceLogMapper.selectOrgCognizanceLogByCid(cid);
+	}
+}

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

@@ -30,11 +30,11 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		
-		if (StringUtils.isBlank(locationProvince)){
+		if (!StringUtils.isBlank(locationProvince)){
 			params.put("locationProvince", locationProvince);
 		}
 		
-		if (StringUtils.isBlank(unitName)){
+		if (!StringUtils.isBlank(unitName)){
 			params.put("unitName", unitName);
 		}
 		

+ 2 - 0
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -15,6 +15,7 @@ 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.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.common.bo.Result;
@@ -592,6 +593,7 @@ public class UserApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/humanResource", method = RequestMethod.GET)
+	@ResponseBody
 	public Result humanResource(Integer year, String pageNo, String pageSize ) {
 		Result res = new Result();
 		res = checkCertify(res);

+ 0 - 1
src/main/resources/spring/spring-shiro.xml

@@ -22,7 +22,6 @@
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
 	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
-	  
 	</bean>
 	
 

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/index.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>管理主页面</title>
 <link href="${staticHost}/admin/index.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/login.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>登录页</title>
 <link href="${staticHost}/admin/login.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/servicesManage/copyright.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>软件著作管理页</title>
 <link href="${staticHost}/admin/servicesManage/copyright.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/servicesManage/highTech.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>高企认定管理页</title>
 <link href="${staticHost}/admin/servicesManage/highTech.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/servicesManage/patent.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>专利申请管理页</title>
 <link href="${staticHost}/admin/servicesManage/patent.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/userManage.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>用户管理页面</title>
 <link href="${staticHost}/admin/userManage.css" rel="stylesheet">
 </head>
 <body>

+ 17 - 17
src/main/webapp/WEB-INF/views/error.jsp

@@ -1,18 +1,18 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags"%>
-<!DOCTYPE HTML>
-<html xmlns=http://www.w3.org/1999/xhtml>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
-	<title>错误页</title>
-</head>
-<body>
-	<div>
-	找不到该页面,请返回重试<br/>
-	${exception.message}
-	</div>
-	<a target="self" href="javascript:history.back();">返回</a>
-</body>
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags"%>
+<!DOCTYPE HTML>
+<html xmlns=http://www.w3.org/1999/xhtml>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
+	<title>错误页</title>
+</head>
+<body>
+	<div>
+	找不到该页面,请返回重试<br/>
+	${exception.message}
+	</div>
+	<a target="self" href="javascript:history.back();">返回</a>
+</body>
 </html>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/index.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>用户登录页</title>
 <link href="${staticHost}/user/account/index.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/services.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>科技服务页面</title>
 <link href="${staticHost}/user/account/services.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/set.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>用户设置页面</title>
 <link href="${staticHost}/user/account/set.css" rel="stylesheet">
 </head>
 <body>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/login.jsp

@@ -1,7 +1,7 @@
 <%@ 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>
+<title>登录页</title>
 <link href="${staticHost}/user/login.css" rel="stylesheet">
 </head>
 <body>