Browse Source

用户端申请专利流程查询接口

Antiloveg 9 years ago
parent
commit
dc5e7128a2

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

@@ -5,7 +5,6 @@ import java.util.Map;
 
 import com.goafanti.common.model.PatentInfo;
 
-
 public interface PatentInfoMapper {
     int deleteByPrimaryKey(String id);
 
@@ -17,16 +16,12 @@ public interface PatentInfoMapper {
 
     int updateByPrimaryKeySelective(PatentInfo record);
 
-    int updateByPrimaryKeyWithBLOBs(PatentInfo record);
-
     int updateByPrimaryKey(PatentInfo record);
     
-    
-    
-
-	PatentInfo selectPatentInfoByUserId(String uid);
+    PatentInfo selectPatentInfoByUserId(String uid);
 	
     List<PatentInfo> findClientApplyListByPage(Map<String, Object> params);
 	
 	int findClentApplyCount(Map<String, Object> params);
+	
 }

+ 17 - 0
src/main/java/com/goafanti/common/dao/PatentLogMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.PatentLog;
+
+public interface PatentLogMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(PatentLog record);
+
+    int insertSelective(PatentLog record);
+
+    PatentLog selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(PatentLog record);
+
+    int updateByPrimaryKey(PatentLog record);
+}

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

@@ -10,6 +10,7 @@
     <result column="patent_catagory" property="patentCatagory" jdbcType="INTEGER" />
     <result column="patent_state" property="patentState" jdbcType="INTEGER" />
     <result column="patent_field" property="patentField" jdbcType="INTEGER" />
+    <result column="patent_des" property="patentDes" jdbcType="VARCHAR" />
     <result column="patent_prory_statement_url" property="patentProryStatementUrl" jdbcType="VARCHAR" />
     <result column="patent_writing_url" property="patentWritingUrl" jdbcType="VARCHAR" />
     <result column="authorization_notice_url" property="authorizationNoticeUrl" jdbcType="VARCHAR" />
@@ -27,20 +28,19 @@
     <result column="third_inventor_is_publish" property="thirdInventorIsPublish" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="author" property="author" jdbcType="VARCHAR" />
+    <result column="authorized_date" property="authorizedDate" jdbcType="TIMESTAMP" />
     <result column="office" property="office" jdbcType="VARCHAR" />
     <result column="principal" property="principal" jdbcType="VARCHAR" />
-    <result column="authorized_date" property="authorizedDate" jdbcType="TIMESTAMP"/>
-    <result column="patent_des" property="patentDes" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, serial_number, patent_number, patent_name, patent_catagory, patent_state, 
-    patent_field, patent_prory_statement_url, patent_writing_url, authorization_notice_url, 
+    patent_field, patent_des, patent_prory_statement_url, patent_writing_url, authorization_notice_url, 
     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, office, principal, authorized_date , patent_des
+    create_time, author, authorized_date,office, principal
   </sql>
-  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String" >
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />
     from patent_info
@@ -53,28 +53,30 @@
   <insert id="insert" parameterType="com.goafanti.common.model.PatentInfo" >
     insert into patent_info (id, uid, serial_number, 
       patent_number, patent_name, patent_catagory, 
-      patent_state, patent_field, patent_prory_statement_url, 
-      patent_writing_url, authorization_notice_url, 
-      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, office, 
-      principal, authorized_date,patent_des)
+      patent_state, patent_field, patent_des, 
+      patent_prory_statement_url, patent_writing_url, 
+      authorization_notice_url, 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)
+     
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=VARCHAR}, 
       #{patentNumber,jdbcType=VARCHAR}, #{patentName,jdbcType=VARCHAR}, #{patentCatagory,jdbcType=INTEGER}, 
-      #{patentState,jdbcType=INTEGER}, #{patentField,jdbcType=INTEGER}, #{patentProryStatementUrl,jdbcType=VARCHAR}, 
-      #{patentWritingUrl,jdbcType=VARCHAR}, #{authorizationNoticeUrl,jdbcType=VARCHAR}, 
-      #{patentCertificateUrl,jdbcType=VARCHAR}, #{patentApplicationDate,jdbcType=TIMESTAMP}, 
-      #{firstInventorName,jdbcType=VARCHAR}, #{firstInventorNationality,jdbcType=VARCHAR}, 
-      #{firstInventorIdNumber,jdbcType=VARCHAR}, #{firstInventorIsPublish,jdbcType=INTEGER}, 
-      #{secondInventorName,jdbcType=VARCHAR}, #{secondInventorNationality,jdbcType=VARCHAR}, 
-      #{secondInventorIsPublish,jdbcType=INTEGER}, #{thirdInventorName,jdbcType=VARCHAR}, 
-      #{thirdInventorNationality,jdbcType=VARCHAR}, #{thirdInventorIsPublish,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR}, #{office,jdbcType=VARCHAR}, 
-      #{principal,jdbcType=VARCHAR}, #{authorizedDate,jdbcType=TIMESTAMP},#{patentDes,jdbcType=LONGVARCHAR})
+      #{patentState,jdbcType=INTEGER}, #{patentField,jdbcType=INTEGER}, #{patentDes,jdbcType=VARCHAR}, 
+      #{patentProryStatementUrl,jdbcType=VARCHAR}, #{patentWritingUrl,jdbcType=VARCHAR}, 
+      #{authorizationNoticeUrl,jdbcType=VARCHAR}, #{patentCertificateUrl,jdbcType=VARCHAR}, 
+      #{patentApplicationDate,jdbcType=TIMESTAMP}, #{firstInventorName,jdbcType=VARCHAR}, 
+      #{firstInventorNationality,jdbcType=VARCHAR}, #{firstInventorIdNumber,jdbcType=VARCHAR}, 
+      #{firstInventorIsPublish,jdbcType=INTEGER}, #{secondInventorName,jdbcType=VARCHAR}, 
+      #{secondInventorNationality,jdbcType=VARCHAR}, #{secondInventorIsPublish,jdbcType=INTEGER}, 
+      #{thirdInventorName,jdbcType=VARCHAR}, #{thirdInventorNationality,jdbcType=VARCHAR}, 
+      #{thirdInventorIsPublish,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR}, 
+      #{authorizedDate,jdbcType=TIMESTAMP},
+      #{office,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentInfo" >
     insert into patent_info
@@ -103,6 +105,9 @@
       <if test="patentField != null" >
         patent_field,
       </if>
+      <if test="patentDes != null" >
+        patent_des,
+      </if>
       <if test="patentProryStatementUrl != null" >
         patent_prory_statement_url,
       </if>
@@ -154,18 +159,15 @@
       <if test="author != null" >
         author,
       </if>
+       <if test="authorizedDate != null" >
+        authorized_date,
+      </if>
       <if test="office != null" >
         office,
       </if>
       <if test="principal != null" >
         principal,
       </if>
-      <if test="authorizedDate != null" >
-        authorized_date,
-      </if>
-      <if test="patentDes != null" >
-        patent_des,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -192,6 +194,9 @@
       <if test="patentField != null" >
         #{patentField,jdbcType=INTEGER},
       </if>
+      <if test="patentDes != null" >
+        #{patentDes,jdbcType=VARCHAR},
+      </if>
       <if test="patentProryStatementUrl != null" >
         #{patentProryStatementUrl,jdbcType=VARCHAR},
       </if>
@@ -243,18 +248,15 @@
       <if test="author != null" >
         #{author,jdbcType=VARCHAR},
       </if>
+       <if test="authorizedDate != null" >
+        #{authorizedDate,jdbcType=TIMESTAMP},
+      </if>
       <if test="office != null" >
         #{office,jdbcType=VARCHAR},
       </if>
       <if test="principal != null" >
         #{principal,jdbcType=VARCHAR},
       </if>
-       <if test="authorizedDate != null" >
-        #{authorizedDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="patentDes != null" >
-        #{patentDes,jdbcType=LONGVARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PatentInfo" >
@@ -281,6 +283,9 @@
       <if test="patentField != null" >
         patent_field = #{patentField,jdbcType=INTEGER},
       </if>
+      <if test="patentDes != null" >
+        patent_des = #{patentDes,jdbcType=VARCHAR},
+      </if>
       <if test="patentProryStatementUrl != null" >
         patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
       </if>
@@ -332,18 +337,15 @@
       <if test="author != null" >
         author = #{author,jdbcType=VARCHAR},
       </if>
+      <if test="authorizedDate != null" >
+        authorized_date = #{authorizedDate,jdbcType=VARCHAR},
+      </if>
       <if test="office != null" >
         office = #{office,jdbcType=VARCHAR},
       </if>
       <if test="principal != null" >
         principal = #{principal,jdbcType=VARCHAR},
       </if>
-       <if test="authorizedDate != null" >
-        authorized_date = #{authorizedDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="patentDes != null" >
-        patent_des = #{patentDes,jdbcType=LONGVARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -356,6 +358,7 @@
       patent_catagory = #{patentCatagory,jdbcType=INTEGER},
       patent_state = #{patentState,jdbcType=INTEGER},
       patent_field = #{patentField,jdbcType=INTEGER},
+      patent_des = #{patentDes,jdbcType=VARCHAR},
       patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
       patent_writing_url = #{patentWritingUrl,jdbcType=VARCHAR},
       authorization_notice_url = #{authorizationNoticeUrl,jdbcType=VARCHAR},
@@ -373,15 +376,13 @@
       third_inventor_is_publish = #{thirdInventorIsPublish,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       author = #{author,jdbcType=VARCHAR},
+      authorized_date = #{authorizedDate,jdbcType=VARCHAR},
       office = #{office,jdbcType=VARCHAR},
-      principal = #{principal,jdbcType=VARCHAR},
-      authorized_date = #{authorizedDate,jdbcType=TIMESTAMP},
-      patent_des = #{patentDes,jdbcType=LONGVARCHAR}
+      principal = #{principal,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  
-  <select id="selectPatentInfoByUserId" parameterType="java.lang.String" resultType="BaseResultMap">
+   <select id="selectPatentInfoByUserId" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
       <include refid="Base_Column_List" />
       from patent_info

+ 117 - 0
src/main/java/com/goafanti/common/mapper/PatentLogMapper.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.PatentLogMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.PatentLog" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="pid" property="pid" jdbcType="VARCHAR" />
+    <result column="record_time" property="recordTime" jdbcType="TIMESTAMP" />
+    <result column="state" property="state" jdbcType="INTEGER" />
+    <result column="principal" property="principal" jdbcType="INTEGER" />
+    <result column="operator" property="operator" jdbcType="INTEGER" />
+    <result column="comment" property="comment" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, pid, record_time, state, principal, operator, comment
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from patent_log
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from patent_log
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.PatentLog" >
+    insert into patent_log (id, pid, record_time, 
+      state, principal, operator, 
+      comment)
+    values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{recordTime,jdbcType=TIMESTAMP}, 
+      #{state,jdbcType=INTEGER}, #{principal,jdbcType=INTEGER}, #{operator,jdbcType=INTEGER}, 
+      #{comment,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentLog" >
+    insert into patent_log
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="pid != null" >
+        pid,
+      </if>
+      <if test="recordTime != null" >
+        record_time,
+      </if>
+      <if test="state != null" >
+        state,
+      </if>
+      <if test="principal != null" >
+        principal,
+      </if>
+      <if test="operator != null" >
+        operator,
+      </if>
+      <if test="comment != null" >
+        comment,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null" >
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="recordTime != null" >
+        #{recordTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="principal != null" >
+        #{principal,jdbcType=INTEGER},
+      </if>
+      <if test="operator != null" >
+        #{operator,jdbcType=INTEGER},
+      </if>
+      <if test="comment != null" >
+        #{comment,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PatentLog" >
+    update patent_log
+    <set >
+      <if test="pid != null" >
+        pid = #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="recordTime != null" >
+        record_time = #{recordTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="principal != null" >
+        principal = #{principal,jdbcType=INTEGER},
+      </if>
+      <if test="operator != null" >
+        operator = #{operator,jdbcType=INTEGER},
+      </if>
+      <if test="comment != null" >
+        comment = #{comment,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.PatentLog" >
+    update patent_log
+    set pid = #{pid,jdbcType=VARCHAR},
+      record_time = #{recordTime,jdbcType=TIMESTAMP},
+      state = #{state,jdbcType=INTEGER},
+      principal = #{principal,jdbcType=INTEGER},
+      operator = #{operator,jdbcType=INTEGER},
+      comment = #{comment,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 22 - 23
src/main/java/com/goafanti/common/model/PatentInfo.java

@@ -38,6 +38,11 @@ public class PatentInfo {
     private Integer patentField;
 
     /**
+    * 专利简介
+    */
+    private String patentDes;
+
+    /**
     * 专利代理委托书
     */
     private String patentProryStatementUrl;
@@ -57,10 +62,9 @@ public class PatentInfo {
     */
     private String patentCertificateUrl;
     
-    
-   /**
-    * 专利申请日(受理日)
-    */
+    /**
+     * 申请日/受理日
+     */
     private Date patentApplicationDate;
 
     /**
@@ -114,7 +118,7 @@ public class PatentInfo {
     private Integer thirdInventorIsPublish;
 
     /**
-    * 创建时间(派单日)
+    * 创建时间
     */
     private Date createTime;
 
@@ -122,6 +126,11 @@ public class PatentInfo {
     * 撰写人
     */
     private String author;
+    
+    /**
+     * 授权日/发文日
+     */
+    private Date authorizedDate;
 
     /**
     * 事务所
@@ -133,16 +142,6 @@ public class PatentInfo {
     */
     private String principal;
 
-    /**
-    * 专利简介
-    */
-    private String patentDes;
-    
-    /**
-     * 授权日
-     */
-    private Date authorizedDate;
-
     public String getId() {
         return id;
     }
@@ -207,6 +206,14 @@ public class PatentInfo {
         this.patentField = patentField;
     }
 
+    public String getPatentDes() {
+        return patentDes;
+    }
+
+    public void setPatentDes(String patentDes) {
+        this.patentDes = patentDes;
+    }
+
     public String getPatentProryStatementUrl() {
         return patentProryStatementUrl;
     }
@@ -359,14 +366,6 @@ public class PatentInfo {
         this.principal = principal;
     }
 
-    public String getPatentDes() {
-        return patentDes;
-    }
-
-    public void setPatentDes(String patentDes) {
-        this.patentDes = patentDes;
-    }
-
 	public Date getAuthorizedDate() {
 		return authorizedDate;
 	}

+ 90 - 0
src/main/java/com/goafanti/common/model/PatentLog.java

@@ -0,0 +1,90 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class PatentLog {
+    private String id;
+
+    private String pid;
+
+    /**
+    * 状态变更录入时间
+    */
+    private Date recordTime;
+
+    /**
+    * 状态
+    */
+    private Integer state;
+
+    /**
+    * 负责人
+    */
+    private Integer principal;
+
+    /**
+    * 操作人
+    */
+    private Integer operator;
+
+    /**
+    * 备注
+    */
+    private String comment;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public Date getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(Date recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getPrincipal() {
+        return principal;
+    }
+
+    public void setPrincipal(Integer principal) {
+        this.principal = principal;
+    }
+
+    public Integer getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Integer operator) {
+        this.operator = operator;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+}

+ 36 - 41
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -11,61 +11,51 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.PatentInfo;
+import com.goafanti.common.model.PatentLog;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techservice.patent.service.PatentInfoService;
-
-
+import com.goafanti.techservice.patent.service.PatentLogService;
 
 @Controller
 @RequestMapping(value = "/techservice/patent")
-public class PatentApiController extends BaseApiController{
+public class PatentApiController extends BaseApiController {
 	@Resource
-	private PatentInfoService						patentInfoService;
-	
+	private PatentInfoService	patentInfoService;
+	@Resource
+	private PatentLogService	patentLogService;
+
 	/**
 	 * 用户端专利申请
 	 */
-	@RequestMapping(value="/clientApplyPatent",method=RequestMethod.POST)
-	public Result clientApplyPatent(PatentInfo patentInfo){
+	@RequestMapping(value = "/clientApplyPatent", method = RequestMethod.POST)
+	public Result clientApplyPatent(PatentInfo patentInfo) {
 		Result res = new Result();
-		PatentInfo info = patentInfoService.selectPatentInfoByUserId(TokenManager.getUserId());
-		if(null == info){
-			patentInfo.setId(UUID.randomUUID().toString());
-			patentInfo.setUid(TokenManager.getUserId());
-			patentInfoService.insert(patentInfo);
-		}else{
-			patentInfo.setId(info.getId());
-			patentInfoService.updateByPrimaryKeySelective(patentInfo);
-		}
+		patentInfo.setId(UUID.randomUUID().toString());
+		patentInfo.setUid(TokenManager.getUserId());
+		patentInfoService.insert(patentInfo);
 		res.setData(patentInfo);
 		return res;
 	}
-	
+
 	/**
 	 * 用户端专利详情
 	 * 
 	 */
-	@RequestMapping(value="/clientPatentInfo",method=RequestMethod.POST)
-	public Result clientPatentInfo(String id){
+	@RequestMapping(value = "/clientPatentInfo", method = RequestMethod.POST)
+	public Result clientPatentInfo(String patentId) {
 		Result res = new Result();
-		res.setData(patentInfoService.selectByPrimaryKey(id));
+		res.setData(patentInfoService.selectByPrimaryKey(patentId));
 		return res;
 	}
-	
+
 	/**
 	 * 用户端申请专利列表
-	 * @param patentNumber
-	 * @param patentName
-	 * @param patentCatagory
-	 * @param patentState
-	 * @param pageNo
-	 * @param pageSize
-	 * @return
 	 */
+	@RequestMapping(value = "/clientApplyList", method = RequestMethod.POST)
 	public Result clientApplyList(String patentNumber, String patentName, Integer patentCatagory, Integer patentState,
-			String pageNo, String pageSize){
+			String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 15;
@@ -79,17 +69,22 @@ public class PatentApiController extends BaseApiController{
 		res.setData(getClientApplyList(res, patentNumber, patentName, patentCatagory, patentState, pNo, pSize));
 		return res;
 	}
-	
-	private Pagination<PatentInfo> getClientApplyList(Result res, String patentNumber, String patentName, Integer parentCatagory, 
-			Integer patentState, Integer pNo, Integer pSize){
-		return (Pagination<PatentInfo>) patentInfoService.getClientApplyList
-				(TokenManager.getUserId(), patentNumber, patentName, parentCatagory, patentState,pNo, pSize);
+
+	/**
+	 * 用户端申请专利当前流程
+	 */
+	@RequestMapping(value = "/clientCurrentProcess", method = RequestMethod.POST)
+	public Result clientCurrentProcess(String patentId) {
+		Result res = new Result();
+		PatentLog patentLog = patentLogService.selectByPrimaryKey(patentId);
+		res.setData(patentLog);
+		return res;
 	}
-	
-	
-	
-	
-	
-	
-	 
+
+	private Pagination<PatentInfo> getClientApplyList(Result res, String patentNumber, String patentName,
+			Integer parentCatagory, Integer patentState, Integer pNo, Integer pSize) {
+		return (Pagination<PatentInfo>) patentInfoService.getClientApplyList(TokenManager.getUserId(), patentNumber,
+				patentName, parentCatagory, patentState, pNo, pSize);
+	}
+
 }

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

@@ -0,0 +1,9 @@
+package com.goafanti.techservice.patent.service;
+
+import com.goafanti.common.model.PatentLog;
+
+public interface PatentLogService {
+
+	PatentLog selectByPrimaryKey(String patentId);
+
+}

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

@@ -0,0 +1,20 @@
+package com.goafanti.techservice.patent.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.PatentLogMapper;
+import com.goafanti.common.model.PatentLog;
+import com.goafanti.techservice.patent.service.PatentLogService;
+@Service
+public class PatentLogServiceImpl implements PatentLogService {
+	@Autowired
+	private PatentLogMapper patentLogMapper;
+
+	@Override
+	public PatentLog selectByPrimaryKey(String id) {
+		return patentLogMapper.selectByPrimaryKey(id);
+	}
+	
+	
+}

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

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <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"/>
+	   <!--  <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
 	  
 	</bean>
 	

+ 1 - 1
src/main/webapp/WEB-INF/web.xml

@@ -10,7 +10,7 @@
 		and Filters -->
 	<context-param>
 		<param-name>spring.profiles.active</param-name>
-		<param-value>dev</param-value>
+		<param-value>local</param-value>
 	</context-param>
 
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->