Przeglądaj źródła

科技服务-专利相关接口更改

Antiloveg 9 lat temu
rodzic
commit
0d40033b9e
27 zmienionych plików z 883 dodań i 266 usunięć
  1. 0 1
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  2. 15 19
      src/main/java/com/goafanti/common/controller/PublicController.java
  3. 5 0
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 1 1
      src/main/java/com/goafanti/common/dao/PatentLogMapper.java
  5. 4 15
      src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml
  6. 57 42
      src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml
  7. 135 24
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  8. 5 4
      src/main/java/com/goafanti/common/mapper/PatentLogMapper.xml
  9. 2 0
      src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml
  10. 3 0
      src/main/java/com/goafanti/common/model/Admin.java
  11. 0 11
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  12. 24 18
      src/main/java/com/goafanti/common/model/PatentCost.java
  13. 41 0
      src/main/java/com/goafanti/common/model/PatentInfo.java
  14. 3 1
      src/main/java/com/goafanti/common/model/User.java
  15. 64 0
      src/main/java/com/goafanti/common/utils/DownloadUtils.java
  16. 23 5
      src/main/java/com/goafanti/techservice/patent/bo/PatentApplicationFeeBo.java
  17. 41 0
      src/main/java/com/goafanti/techservice/patent/bo/PatentCompositeBo.java
  18. 15 0
      src/main/java/com/goafanti/techservice/patent/bo/PatentNoticeOfCorrectionBo.java
  19. 16 0
      src/main/java/com/goafanti/techservice/patent/bo/PatentPendingBo.java
  20. 85 0
      src/main/java/com/goafanti/techservice/patent/bo/PatentRecieveSendBo.java
  21. 163 0
      src/main/java/com/goafanti/techservice/patent/bo/PatentRegistrationBo.java
  22. 165 120
      src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java
  23. 1 1
      src/main/java/com/goafanti/techservice/patent/service/PatentLogService.java
  24. 1 1
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentCostServiceImpl.java
  25. 2 2
      src/main/java/com/goafanti/techservice/patent/service/impl/PatentLogServiceImpl.java
  26. 1 1
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  27. 11 0
      src/main/webapp/WEB-INF/views/user/index.jsp

+ 0 - 1
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -54,6 +54,5 @@ public class ErrorConstants {
 	
 	public static final String INSUFFICIENT_AUTHORITY_ERROR = "INSUFFICIENT_AUTHORITY_ERROR";
 	
-	public static final String FEE_EMPTY_ERROR = "FEE_EMPTY_ERROR";
 
 }

+ 15 - 19
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -29,6 +29,7 @@ import com.aliyuncs.sms.model.v20160927.SingleSendSmsResponse;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.UserDownLoadBo;
@@ -93,24 +94,16 @@ public class PublicController extends BaseController {
 	@ResponseBody
 	public Result getMcode(String mobile ,boolean sign,Integer type) {
 		Result res = new Result();
+		//用于找回密码
 		if(sign){
 			if(null == userService.selectByMobieAndType(mobile, type)){
 				res.getError().add(buildError(ErrorConstants.NON_REGISTER, "该用户未注册!"));
 				return res;
 			}
 		}
-		TokenManager.setVal2Session(VerifyCodeUtils.M_CODE, "123");
-		TokenManager.setVal2Session(VerifyCodeUtils.M_CODE_TIME, System.currentTimeMillis());
-		System.out.println(TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE));
-		if(res.getError().isEmpty() && sign){
-			String resetCode = UUID.randomUUID().toString();
-			System.out.println(resetCode);
-			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE, resetCode);
-			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE_TIME, System.currentTimeMillis());
-			res.setData(resetCode);
-		}
-		return res;
-		/*if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
+		
+		
+		if (TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == null
 				|| TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE_TIME) == "") {
 			sendMessage(mobile, res);
 		} else if (TimeUtils.checkOverTime("getMCode")) {
@@ -128,7 +121,7 @@ public class PublicController extends BaseController {
 			TokenManager.setVal2Session(VerifyCodeUtils.RESET_CODE_TIME, System.currentTimeMillis());
 			res.setData(resetCode);
 		}
-		return res;*/
+		return res;
 	}
 
 	/**
@@ -137,6 +130,7 @@ public class PublicController extends BaseController {
 	 * @param res
 	 * @return
 	 */
+	@SuppressWarnings("unused")
 	private Result sendMessage(String mobile, Result res) {
 		// 生成随机字串
 		String mobileVerifyCode = VerifyCodeUtils.generateMobileVerifyCode(6);
@@ -188,12 +182,14 @@ public class PublicController extends BaseController {
 		byte[] buffer = new byte[8 * 1024];
 		String fileSaveRootPath = "";
 		//下载权限判断
-		UserDownLoadBo u = userService.selectUserDownLoadBoByUserId(TokenManager.getUserId());
-		if(!path.equals(u.getDegreeDiplomaUrl())&&!path.equals(u.getDiplomaUrl())&&
-		   !path.equals(u.getOppositeIdUrl())&&!path.equals(u.getPositiveIdUrl())&&
-		   !path.equals(u.getProfessionalCertificateUrl())&&!path.equals(u.getQualificationCertificateUrl())){
-			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "权限不足,无法下载!"));	
-			return res;
+		if(null == TokenManager.getAdminToken()){
+			UserDownLoadBo u = userService.selectUserDownLoadBoByUserId(TokenManager.getUserId());
+			if(!path.equals(u.getDegreeDiplomaUrl())&&!path.equals(u.getDiplomaUrl())&&
+			   !path.equals(u.getOppositeIdUrl())&&!path.equals(u.getPositiveIdUrl())&&
+			   !path.equals(u.getProfessionalCertificateUrl())&&!path.equals(u.getQualificationCertificateUrl())){
+				res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "权限不足,无法下载!"));	
+				return res;
+			}
 		}
 		try {
 				fileSaveRootPath = uploadPrivatePath + path;

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

@@ -40,6 +40,11 @@ public class WebpageController extends BaseController {
 		return "/user/certify";
 	}
 	
+	@RequestMapping(value = "/user/index", method = RequestMethod.GET)
+	public String userIndex(HttpServletRequest request, ModelAndView modelview) {
+		return "/user/index";
+	}
+	
 	@RequestMapping(value = "/user/account/services", method = RequestMethod.GET)
 	public String userServices(HttpServletRequest request, ModelAndView modelview) {
 		return "/user/account/services";

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

@@ -17,5 +17,5 @@ public interface PatentLogMapper {
 
     int updateByPrimaryKey(PatentLog record);
 
-	List<PatentLog> selectCurrentProcessByPid(String pid);
+	List<PatentLog> selectProcessByPid(String pid);
 }

+ 4 - 15
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -15,12 +15,11 @@
     <result column="home_unit" property="homeUnit" jdbcType="VARCHAR" />
     <result column="logo_url" property="logoUrl" jdbcType="VARCHAR" />
     <result column="publicity_picture_url" property="publicityPictureUrl" jdbcType="VARCHAR" />
-    <result column="number" property="number" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, identity_type, company_name, legal_person,location_province, location_city,location_area,
     unit_size, company_introduction, 
-    home_unit,  logo_url, publicity_picture_url,number
+    home_unit,  logo_url, publicity_picture_url
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -37,13 +36,13 @@
       company_name, legal_person,location_province, location_city,location_area,
       unit_size, 
       company_introduction, home_unit,  
-      logo_url, publicity_picture_url,number)
+      logo_url, publicity_picture_url)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
       #{companyName,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR},
       #{locationProvince,jdbcType=VARCHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
       #{unitSize,jdbcType=VARCHAR}, 
       #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR},  
-      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR},#{number,jdbcType=INTEGER})
+      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
     insert into organization_info
@@ -87,9 +86,6 @@
       <if test="publicityPictureUrl != null" >
        publicity_picture_url,
       </if>
-      <if test="number != null" >
-      number,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -131,9 +127,6 @@
       <if test="publicityPictureUrl != null" >
         #{publicityPictureUrl,jdbcType=VARCHAR},
       </if>
-      <if test="number != null" >
-        #{number,jdbcType=INTEGER},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
@@ -175,9 +168,6 @@
       <if test="publicityPictureUrl != null" >
        publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
       </if>
-       <if test="number != null" >
-       number = #{number,jdbcType=INTEGER},
-      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -194,8 +184,7 @@
       company_introduction = #{companyIntroduction,jdbcType=VARCHAR},
       home_unit = #{homeUnit,jdbcType=VARCHAR},
       logo_url = #{logoUrl,jdbcType=VARCHAR},
-      publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
-      number = #{number,jdbcType=INTEGER}
+      publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

+ 57 - 42
src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml

@@ -9,13 +9,13 @@
     <result column="application_fee" property="applicationFee" jdbcType="INTEGER" />
     <result column="trial_fee" property="trialFee" jdbcType="INTEGER" />
     <result column="printing_fee" property="printingFee" jdbcType="INTEGER" />
-    <result column="is_request_funds" property="isRequestFunds" jdbcType="INTEGER" />
-    <result column="is_reimbursement" property="isReimbursement" jdbcType="INTEGER" />
+    <result column="funds" property="funds" jdbcType="INTEGER" />
+    <result column="reimbursement" property="reimbursement" jdbcType="INTEGER" />
     <result column="payment_state" property="paymentState" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, pid, annual_fee, annual_fee_state, application_fee, trial_fee, printing_fee, 
-    is_request_funds, is_reimbursement, payment_state
+    funds, reimbursement, payment_state
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -30,11 +30,11 @@
   <insert id="insert" parameterType="com.goafanti.common.model.PatentCost" >
     insert into patent_cost (id, pid, annual_fee, 
       annual_fee_state, application_fee, trial_fee, 
-      printing_fee, is_request_funds, is_reimbursement, 
+      printing_fee, funds, reimbursement, 
       payment_state)
     values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{annualFee,jdbcType=INTEGER}, 
       #{annualFeeState,jdbcType=INTEGER}, #{applicationFee,jdbcType=INTEGER}, #{trialFee,jdbcType=INTEGER}, 
-      #{printingFee,jdbcType=INTEGER}, #{isRequestFunds,jdbcType=INTEGER}, #{isReimbursement,jdbcType=INTEGER}, 
+      #{printingFee,jdbcType=INTEGER}, #{funds,jdbcType=INTEGER}, #{reimbursement,jdbcType=INTEGER}, 
       #{paymentState,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentCost" >
@@ -61,11 +61,11 @@
       <if test="printingFee != null" >
         printing_fee,
       </if>
-      <if test="isRequestFunds != null" >
-        is_request_funds,
+      <if test="funds != null" >
+        funds,
       </if>
-      <if test="isReimbursement != null" >
-        is_reimbursement,
+      <if test="reimbursement != null" >
+        reimbursement,
       </if>
       <if test="paymentState != null" >
         payment_state,
@@ -93,11 +93,11 @@
       <if test="printingFee != null" >
         #{printingFee,jdbcType=INTEGER},
       </if>
-      <if test="isRequestFunds != null" >
-        #{isRequestFunds,jdbcType=INTEGER},
+      <if test="funds != null" >
+        #{funds,jdbcType=INTEGER},
       </if>
-      <if test="isReimbursement != null" >
-        #{isReimbursement,jdbcType=INTEGER},
+      <if test="reimbursement != null" >
+        #{reimbursement,jdbcType=INTEGER},
       </if>
       <if test="paymentState != null" >
         #{paymentState,jdbcType=INTEGER},
@@ -125,11 +125,11 @@
       <if test="printingFee != null" >
         printing_fee = #{printingFee,jdbcType=INTEGER},
       </if>
-      <if test="is_request_funds != null" >
-        is_request_funds = #{isRequestFunds,jdbcType=INTEGER},
+      <if test="funds != null" >
+        funds = #{funds,jdbcType=INTEGER},
       </if>
-      <if test="is_reimbursement != null" >
-        is_reimbursement = #{isReimbursement,jdbcType=INTEGER},
+      <if test="reimbursement != null" >
+        reimbursement = #{reimbursement,jdbcType=INTEGER},
       </if>
       <if test="paymentState != null" >
         payment_state = #{paymentState,jdbcType=INTEGER},
@@ -145,8 +145,8 @@
       application_fee = #{applicationFee,jdbcType=INTEGER},
       trial_fee = #{trialFee,jdbcType=INTEGER},
       printing_fee = #{printingFee,jdbcType=INTEGER},
-      is_request_funds = #{isRequestFunds,jdbcType=INTEGER},
-      is_reimbursement = #{isReimbursement,jdbcType=INTEGER},
+      funds = #{funds,jdbcType=INTEGER},
+      reimbursement = #{reimbursement,jdbcType=INTEGER},
       payment_state = #{paymentState,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -155,16 +155,16 @@
   	select m.uid as uid , m.pid as pid , m.oid ,
        		m.serialNumber ,m.patentNumber ,
      	    m.locationProvince , m.unitName , 
-      		m.patentName , m.authorizedDate ,
+      		m.patentName , m.patentApplicationDate ,
   	    c.id as cid ,
     	c.payment_state as paymentState,c.application_fee as applicationFee ,
     	c.trial_fee as trialFee , c.printing_fee as printingFee , 
-   	    c.is_request_funds as isRequestFunds , c.is_reimbursement as isReimbursement
+   	    c.funds as funds , c.reimbursement as reimbursement
    	from patent_cost c RIGHT JOIN 
      	(select u.id as uid , p.id as pid ,o.id as oid ,
        		p.serial_number as serialNumber ,p.patent_number as patentNumber ,
      	    o.location_province as locationProvince , o.unit_name as unitName , 
-      		p.patent_name as patentName , p.authorized_date as authorizedDate
+      		p.patent_name as patentName , p.patent_application_date as patentApplicationDate
     from user u
 		INNER JOIN patent_info p on u.id =p.uid
 		INNER JOIN organization_identity o on o.uid = u.id  
@@ -173,36 +173,51 @@
 		 and o.location_province = #{locationProvince,jdbcType=VARCHAR}
 		</if>
 		<if test="pStart != null">
-		 and p.authorized_date <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+		 and p.patent_application_date <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
 		</if>
 		<if test="pEnd">
-		 and p.authorized_date <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+		 and p.patent_application_date <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
 		</if>
-		order by p.authorized_date DESC) m
+		order by p.patent_application_date DESC) m
    on c.pid = m.pid 
    <if test="page_sql!=null">
 		${page_sql}
 	</if>
   </select>
   
-  <select id="findApplicationFeeCount" resultType="java.lang.Integer"> 
-	select count(1) from   (select  m.uid as uid , m.pid as pid , m.oid ,
+  <select id="findApplicationFeeCount" resultType="java.lang.Integer" parameterType="String"> 
+	select count(1) from   (
+			select m.uid as uid , m.pid as pid , m.oid ,
        		m.serialNumber ,m.patentNumber ,
      	    m.locationProvince , m.unitName , 
-      		m.patentName , m.authorizedDate ,
-      		c.id as cid ,
-		    	c.payment_state as paymentState,c.application_fee as applicationFee ,
-		    	c.trial_fee as trialFee , c.printing_fee as printingFee , 
-		   	    c.is_request_funds as isRequestFunds , c.is_reimbursement as isReimbursement
-		   	from patent_cost c RIGHT JOIN 
-		     	(select u.id as uid , p.id as pid ,o.id as oid ,
-		       		p.serial_number as serialNumber ,p.patent_number as patentNumber ,
-		     	    o.location_province as locationProvince , o.unit_name as unitName , 
-		      		p.patent_name as patentName , p.authorized_date as authorizedDate
-		    from user u
-				INNER JOIN patent_info p on u.id =p.uid
-				INNER JOIN organization_identity o on o.uid = u.id  
-				order by p.authorized_date DESC) m
-		   on c.pid = m.pid) n 
+      		m.patentName , m.patentApplicationDate ,
+  	    c.id as cid ,
+    	c.payment_state as paymentState,c.application_fee as applicationFee ,
+    	c.trial_fee as trialFee , c.printing_fee as printingFee , 
+   	    c.funds as funds , c.reimbursement as reimbursement
+   	from patent_cost c RIGHT JOIN 
+     	(select u.id as uid , p.id as pid ,o.id as oid ,
+       		p.serial_number as serialNumber ,p.patent_number as patentNumber ,
+     	    o.location_province as locationProvince , o.unit_name as unitName , 
+      		p.patent_name as patentName , p.patent_application_date as patentApplicationDate
+    from user u
+		INNER JOIN patent_info p on u.id =p.uid
+		INNER JOIN organization_identity o on o.uid = u.id  
+		where 1=1
+		<if test="locationProvince != null">
+		 and o.location_province = #{locationProvince,jdbcType=VARCHAR}
+		</if>
+		<if test="pStart != null">
+		 and p.patent_application_date <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+		</if>
+		<if test="pEnd">
+		 and p.patent_application_date <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+		</if>
+		order by p.patent_application_date DESC) m
+   on c.pid = m.pid 
+   <if test="page_sql!=null">
+		${page_sql}
+	</if>
+		   ) n 
   </select>
 </mapper>

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

@@ -492,20 +492,78 @@
 	
   </select>
   
-  <select id="findManagePatentCount" resultType="java.lang.Integer">
+  <select id="findManagePatentCount" resultType="java.lang.Integer" parameterType="String">
    	select count(1) from (
-		select  u.id uid,o.id oid,p.id pid,p.serial_number,p.patent_number,p.office ,o.unit_name ,
-			p.patent_catagory,p.patent_name,p.patent_state,p.create_time,p.patent_application_date,
-			p.authorized_date,p.author,o.org_code,o.location_province,o.location_city,o.location_area,
-			o.contacts,u.number,p.patent_field,p.patent_des,p.first_inventor_name,p.first_inventor_nationality,
-			p.first_inventor_id_number,p.second_inventor_name,p.second_inventor_nationality,p.third_inventor_name,
-			p.third_inventor_nationality,p.patent_prory_statement_url, o.last_year_tax_report_url,
-			p.patent_writing_url,p.authorization_notice_url,p.patent_certificate_url
-		from user u 
-		INNER JOIN organization_identity o
-		on u.id = o.uid
-		INNER JOIN patent_info p
-		on u.id = p.uid ) 
+   	
+		select  u.id as uid ,o.id as oid , p.id as pid , p.serial_number as serialNumber , p.patent_number as patentNumber , p.office , 
+	  	    o.unit_name as unitName,
+			p.patent_catagory as patentCatagory,p.patent_name as patentName,p.patent_state as patentState,p.create_time as createTime,
+			p.patent_application_date as patentApplicationDate,
+			p.authorized_date as authorizedDate, p.author, o.org_code as orgCode, o.location_province as locationProvince, 
+			o.location_city as locationCity, o.location_area as locationArea,
+			o.contacts, u.number, p.patent_field as patentField, p.patent_des as patentDes , p.first_inventor_name as firstInventorName, 
+			p.first_inventor_nationality as firstInventorNationality,
+			p.first_inventor_id_number as firstInventorIdNumber, p.second_inventor_name as secondInventorName , 
+			p.second_inventor_nationality as secondInventorNationality , p.third_inventor_name as thirdInventorName,
+			p.third_inventor_nationality as thirdInventorNationality , p.patent_prory_statement_url as patentProryStatementUrl , 
+			o.last_year_tax_report_url as lastYearTaxReportUrl, p.patent_writing_url as patentWritingUrl ,
+		    p.authorization_notice_url as authorizationNoticeUrl , p.patent_certificate_url as patentCertificateUrl
+	from user u 
+	INNER JOIN organization_identity o
+	on u.id = o.uid
+	INNER  JOIN patent_info p
+	on u.id = p.uid 
+	where 1=1
+	 
+	<if test="serialNumber != null">
+	    and p.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	</if>
+	<if test="patentNumber != null">
+	    and p.patent_number = #{patentNumber,jdbcType=VARCHAR}
+	</if>
+	<if test="office != null">
+	    and p.office = #{office,jdbcType=VARCHAR}
+	</if>
+	<if test="unitName != null">
+	    and  o.unit_name= #{unitName,jdbcType=VARCHAR}
+	</if>
+	<if test="patentCatagory != null">
+	    and  p.patent_catagory= #{patentCatagory,jdbcType=INTEGER}
+	</if>
+	<if test="patentName != null">
+	    and  p.patent_name= #{patentName,jdbcType=VARCHAR}
+	</if>
+	<if test="patentState != null">
+	    and  p.patent_state= #{patentState,jdbcType=INTEGER}
+	</if>
+	<if test="cStart != null">
+	    and  
+	    p.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	    and  
+	    p.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="pStart != null">
+	    and 
+	    p.patent_application_date <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="pEnd != null">
+	    and 
+	    p.patent_application_date <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="author != null">
+	    and p.author = #{author,jdbcType=VARCHAR}
+	</if>
+	<if test="locationProvince != null">
+	    and  o.location_province=#{locationProvince,jdbcType=VARCHAR}
+	</if>
+	 order by p.create_time desc
+	 <if test="page_sql!=null">
+		${page_sql}
+	</if>
+		
+		) 
 	as total
   </select>
   
@@ -530,15 +588,29 @@
 	</if>
   </select>
   
-  <select id="findManagePendingPaymentCount" resultType="java.lang.Integer">
-  	 select count(1) from (select n.*,c.id cid ,c.annual_fee_state from patent_cost c INNER JOIN
-		(select u.id uid,p.id pid,o.id oid,p.serial_number,p.patent_number,o.location_province,o.unit_name,
-		p.patent_catagory,p.patent_state, p.authorized_date
-		   from user u
+  <select id="findManagePendingPaymentCount" resultType="java.lang.Integer" parameterType="String">
+  	 select count(1) from (
+  	 
+  	   select n.*,c.id as cid ,c.annual_fee_state as annualFeeState 
+  	   from patent_cost c INNER JOIN
+       (select u.id as uid , p.id as pid ,o.id as oid , p.serial_number as serialNumber ,p.patent_number as patentNumber ,
+               o.location_province as locationProvince , o.unit_name as unitName , p.patent_name as patentName,
+               p.patent_catagory as patentCatagory ,p.patent_state as patentState , p.authorized_date as authorizedDate
+        from user u
 		INNER JOIN patent_info p on u.id =p.uid
-		INNER JOIN organization_identity o on o.uid = u.id where p.patent_state=8) n
+		INNER JOIN organization_identity o on o.uid = u.id where p.patent_state=8 
+		<if test="locationProvince != null">
+		 and o.location_province = #{locationProvince,jdbcType=VARCHAR}
+		</if>
+		order by p.authorized_date DESC
+		) n
 		on n.pid= c.pid where c.annual_fee_state=0
-		order by n.authorized_date DESC) as total
+		
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+		
+		) as total
   </select>
   
   <select id="findNoticeOfCorrectionListByPage" parameterType="String"  resultType="com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo">
@@ -586,14 +658,53 @@
 	</if>
   </select>
   
-  <select id="findNoticeOfCorrectionCount" resultType="java.lang.Integer">
-  	select count(1) from (SELECT u.id as uid ,p.id as pid , o.id as oid , p.serial_number as serialNumber , p.patent_number as patentNumber ,
+  <select id="findNoticeOfCorrectionCount" resultType="java.lang.Integer" parameterType="String">
+  	select count(1) from (
+  	
+  		select u.id as uid ,p.id as pid , o.id as oid , p.serial_number as serialNumber , p.patent_number as patentNumber ,
 		 p.patent_name as patentName , p.office ,
 		 o.location_province as locationProvince ,o.unit_name as unitName , p.patent_catagory as patentCatagory ,
 		 p.patent_state as patentState , p.author , p.authorized_date as authorizedDate 
-		 FROM user u INNER JOIN patent_info p on u.id = p.uid 
+		 FROM user u 
+		 INNER JOIN patent_info p on u.id = p.uid 
 		 INNER JOIN organization_identity o ON u.id = o.uid
-	where p.patent_state in (4,6) order by p.authorized_date DESC  ) as n
+   where p.patent_state in (4,6) 
+	<if test="serialNumber != null">
+	    and p.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	</if>
+	<if test="patentNumber != null">
+	    and p.patent_number = #{patentNumber,jdbcType=VARCHAR}
+	</if>
+	<if test="office != null">
+	    and p.office = #{office,jdbcType=VARCHAR}
+	</if>
+	<if test="unitName != null">
+	    and  o.unit_name= #{unitName,jdbcType=VARCHAR}
+	</if>
+	<if test="patentCatagory != null">
+	    and  p.patent_catagory= #{patentCatagory,jdbcType=INTEGER}
+	</if>
+	<if test="patentName != null">
+	    and  p.patent_name= #{patentName,jdbcType=VARCHAR}
+	</if>
+	<if test="patentState != null">
+	    and  p.patent_state= #{patentState,jdbcType=INTEGER}
+	</if>
+	<if test="authorizedDate != null">
+	    and  p.authorized_date = #{authorizedDate,jdbcType=TIMESTAMP}
+	</if>
+	<if test="author != null">
+	    and p.author = #{author,jdbcType=VARCHAR}
+	</if>
+	<if test="locationProvince != null">
+	    and  o.location_province=#{locationProvince,jdbcType=VARCHAR}
+	</if>
+	order by p.authorized_date DESC 
+	<if test="page_sql!=null">
+		${page_sql}
+	</if> 
+	
+	) as n
   </select>
   
   

+ 5 - 4
src/main/java/com/goafanti/common/mapper/PatentLogMapper.xml

@@ -115,10 +115,11 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  <select id="selectCurrentProcessByPid"  parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from patent_log
+  <select id="selectProcessByPid"  parameterType="java.lang.String" resultMap="BaseResultMap">
+    select b.name as principal , m.operator , m.id , m.pid , m.state , m.comment , m.record_time from 
+		(select a.name as operator, p.id ,p.pid  , p.state , p.comment ,p.record_time , p.principal as pri
+		from patent_log p INNER JOIN admin a 
+		on a.id = p.operator) m INNER JOIN admin b on m.pri = b. id
     where pid = #{pid,jdbcType=VARCHAR}
   </select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml

@@ -223,6 +223,7 @@
   
   <select id="findRecieveSendCount" resultType="java.lang.Integer">
   	select count(1) from (
+  	
   	 select r.id as rid, r.acceptance_receive_time as acceptanceReceiveTime , r.acceptance_issue_time as acceptanceIssueTime, 
   	   r.acceptance_tracking_number as acceptanceTrackingNumber , r.acceptance_express_company as acceptanceExpressCompany,
        r.authorization_receive_time as authorizationReceiveTime , r.authorization_issue_time as authorizationIssueTime, 
@@ -238,6 +239,7 @@
 	   INNER JOIN organization_identity o on o.uid = u.id
 	   ) m
     LEFT JOIN patent_registration r on m.pid = r.pid
+    
   	) k
   </select>
 </mapper>

+ 3 - 0
src/main/java/com/goafanti/common/model/Admin.java

@@ -2,6 +2,8 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class Admin {
     private String id;
 
@@ -59,6 +61,7 @@ public class Admin {
         this.name = name;
     }
 
+    @JsonIgnore
     public String getPassword() {
         return password;
     }

+ 0 - 11
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -63,10 +63,6 @@ public class OrganizationInfo {
     */
     private String publicityPictureUrl;
     
-    /**
-     * 公司编号
-     */
-    private Integer number;
 
     public String getId() {
         return id;
@@ -173,13 +169,6 @@ public class OrganizationInfo {
 		this.publicityPictureUrl = publicityPictureUrl;
 	}
 
-	public Integer getNumber() {
-		return number;
-	}
-
-	public void setNumber(Integer number) {
-		this.number = number;
-	}
 	
 	
 

+ 24 - 18
src/main/java/com/goafanti/common/model/PatentCost.java

@@ -33,17 +33,19 @@ public class PatentCost {
     /**
     * 是否请款
     */
-    private Integer isRequestFunds;
+    private Integer funds;
 
     /**
     * 是否报销
     */
-    private Integer isReimbursement;
+    private Integer reimbursement;
 
     /**
     * 缴费状态
     */
-    private String paymentState;
+    private Integer paymentState;
+    
+   
 
     public String getId() {
         return id;
@@ -100,29 +102,33 @@ public class PatentCost {
     public void setPrintingFee(Integer printingFee) {
         this.printingFee = printingFee;
     }
-
     
-    public Integer getIsRequestFunds() {
-		return isRequestFunds;
+	public Integer getFunds() {
+		return funds;
 	}
 
-	public void setIsRequestFunds(Integer isRequestFunds) {
-		this.isRequestFunds = isRequestFunds;
+	public void setFunds(Integer funds) {
+		this.funds = funds;
 	}
 
-	public Integer getIsReimbursement() {
-		return isReimbursement;
+	public Integer getReimbursement() {
+		return reimbursement;
 	}
 
-	public void setIsReimbursement(Integer isReimbursement) {
-		this.isReimbursement = isReimbursement;
+	public void setReimbursement(Integer reimbursement) {
+		this.reimbursement = reimbursement;
 	}
 
-	public String getPaymentState() {
-        return paymentState;
-    }
+	public Integer getPaymentState() {
+		return paymentState;
+	}
 
-    public void setPaymentState(String paymentState) {
-        this.paymentState = paymentState;
-    }
+	public void setPaymentState(Integer paymentState) {
+		this.paymentState = paymentState;
+	}
+
+	
+	
+    
+	
 }

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

@@ -2,6 +2,8 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 public class PatentInfo {
     private String id;
 
@@ -373,6 +375,45 @@ public class PatentInfo {
 	public void setAuthorizedDate(Date authorizedDate) {
 		this.authorizedDate = authorizedDate;
 	}
+	
+	//授权日/发文日
+	public String getAuthorizedFormattedDate() {
+		if (this.authorizedDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+		}
+	}
+
+	public void setAuthorizedFormattedDate(String authorizedFormattedDate) {
+
+	}
+	
+	//申请日/受理日
+	public String getPatentApplicationFormattedDate(){
+		if (this.patentApplicationDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setPatentApplicationFormattedDate(String patentApplicationFormattedDate){
+		
+	}
+	
+	//创建时间
+	public String getCreateTimeFormattedDate(){
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+		
+	}
     
     
 }

+ 3 - 1
src/main/java/com/goafanti/common/model/User.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.goafanti.common.constant.ErrorConstants;
 
 
@@ -28,6 +29,7 @@ public class User extends BaseModel{
     /**
     * 密码,md5+salt
     */
+    
     private String password;
 
     /**
@@ -77,7 +79,7 @@ public class User extends BaseModel{
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
-
+    @JsonIgnore
     public String getPassword() {
         return password;
     }

+ 64 - 0
src/main/java/com/goafanti/common/utils/DownloadUtils.java

@@ -0,0 +1,64 @@
+package com.goafanti.common.utils;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+public class DownloadUtils {
+	/**
+	 * response 输出JSON
+	 * 
+	 * @param hresponse
+	 * @param resultMap
+	 * @throws IOException
+	 */
+	public void out(HttpServletResponse response, String jsonStr) {
+		PrintWriter out = null;
+		try {
+			response.setHeader("Content-Type", "application/json");
+			response.setCharacterEncoding("UTF-8");
+			out = response.getWriter();
+			out.println(jsonStr);
+		} catch (Exception e) {
+			LoggerUtils.fmtError(getClass(), e, "输出数据失败");
+		} finally {
+			if (null != out) {
+				out.flush();
+				out.close();
+			}
+		}
+	}
+
+	public void downloadExcel(HttpServletResponse response, String fileName, HSSFWorkbook workbook) {
+		String fn = null;
+		try {
+			fn = URLEncoder.encode(fileName, "UTF-8");
+		} catch (UnsupportedEncodingException e1) {
+			fn = fileName;
+		}
+		response.setContentType("application/x-download;charset=UTF-8");
+		response.setHeader("Content-Disposition", "attachment; filename=\"" + fn + "\";");
+		OutputStream out = null;
+		try {
+			out = response.getOutputStream();
+			workbook.write(out);
+		} catch (IOException e) {
+			LoggerUtils.fmtError(getClass(), e, "输出Excel失败");
+		} finally {
+			if (null != out) {
+				try {
+					out.flush();
+					out.close();
+				} catch (IOException e) {
+					out = null;
+				}
+			}
+		}
+	}
+}

+ 23 - 5
src/main/java/com/goafanti/techservice/patent/bo/PatentApplicationFeeBo.java

@@ -2,6 +2,8 @@ package com.goafanti.techservice.patent.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 /**
  * 专利申请费用管理
  */
@@ -36,7 +38,8 @@ public class PatentApplicationFeeBo {
 	
 	private Integer isReimbursement;
 	
-	private Date authorizedDate;
+	private Date patentApplicationDate;
+	
 
 	public String getUid() {
 		return uid;
@@ -157,13 +160,28 @@ public class PatentApplicationFeeBo {
 	public void setIsReimbursement(Integer isReimbursement) {
 		this.isReimbursement = isReimbursement;
 	}
+	
+	
 
-	public Date getAuthorizedDate() {
-		return authorizedDate;
+	public Date getPatentApplicationDate() {
+		return patentApplicationDate;
 	}
 
-	public void setAuthorizedDate(Date authorizedDate) {
-		this.authorizedDate = authorizedDate;
+	public void setPatentApplicationDate(Date patentApplicationDate) {
+		this.patentApplicationDate = patentApplicationDate;
+	}
+    
+	//patentApplicationDate
+	public String getPatentApplicationDateFormattedDate(){
+		if (this.patentApplicationDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setPatentApplicationDateFormattedDate(String patentApplicationDateFormattedDate){
+		
 	}
 
 	

+ 41 - 0
src/main/java/com/goafanti/techservice/patent/bo/PatentCompositeBo.java

@@ -2,6 +2,8 @@ package com.goafanti.techservice.patent.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import com.goafanti.common.model.BaseModel;
 
 /**
@@ -341,6 +343,45 @@ public class PatentCompositeBo {
 	public void setPatentProryStatementUrl(String patentProryStatementUrl) {
 		this.patentProryStatementUrl = patentProryStatementUrl;
 	}
+	
+	//授权日/发文日
+		public String getAuthorizedFormattedDate() {
+			if (this.authorizedDate == null) {
+				return null;
+			} else {
+				return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+			}
+		}
+
+		public void setAuthorizedFormattedDate(String authorizedFormattedDate) {
+
+		}
+		
+		//申请日/受理日
+		public String getPatentApplicationFormattedDate(){
+			if (this.patentApplicationDate == null) {
+				return null;
+			} else {
+				return DateFormatUtils.format(this.getPatentApplicationDate(), "yyyy-MM-dd");
+			}
+		}
+		
+		public void setPatentApplicationFormattedDate(String patentApplicationFormattedDate){
+			
+		}
+		
+		//创建时间
+		public String getCreateTimeFormattedDate(){
+			if (this.createTime == null) {
+				return null;
+			} else {
+				return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+			}
+		}
+		
+		public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+			
+		}
     
     
     

+ 15 - 0
src/main/java/com/goafanti/techservice/patent/bo/PatentNoticeOfCorrectionBo.java

@@ -1,6 +1,8 @@
 package com.goafanti.techservice.patent.bo;
 
 import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
 /**
  * 补正审查通知
  */
@@ -135,5 +137,18 @@ public class PatentNoticeOfCorrectionBo {
 			this.authorizedDate = authorizedDate;
 		}
 		
+		//authorizedDate
+		public String getAuthorizedDateFormattedDate(){
+			if (this.authorizedDate == null) {
+				return null;
+			} else {
+				return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+			}
+		}
+		
+		public void setAuthorizedDateFormattedDate(String authorizedDateFormattedDate){
+			
+		}
+		
 		
 }

+ 16 - 0
src/main/java/com/goafanti/techservice/patent/bo/PatentPendingBo.java

@@ -2,6 +2,8 @@ package com.goafanti.techservice.patent.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 /**
  * 待缴费专利管理
  */
@@ -137,6 +139,20 @@ public class PatentPendingBo {
 	}
 	
 	
+	//authorizedDate
+	public String getAuthorizedDateFormattedDate(){
+		if (this.authorizedDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAuthorizedDate(), "yyyy-MM-dd");
+		}
+	}
+			
+	public void setAuthorizedDateFormattedDate(String authorizedDateFormattedDate){
+				
+	}
+	
+	
 	
 	
 }

+ 85 - 0
src/main/java/com/goafanti/techservice/patent/bo/PatentRecieveSendBo.java

@@ -2,6 +2,8 @@ package com.goafanti.techservice.patent.bo;
 
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 public class PatentRecieveSendBo {
 	private String	uid;
 
@@ -224,5 +226,88 @@ public class PatentRecieveSendBo {
 	}
 	
 	
+	
+	
+	//acceptanceReceiveTime
+	public String getAcceptanceReceiveTimeFormattedDate(){
+		if (this.acceptanceReceiveTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAcceptanceReceiveTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setAcceptanceReceiveTimeFormattedDate(String acceptanceReceiveTimeFormattedDate){
+		
+	}
+	
+	//acceptanceIssueTime
+	public String getAcceptanceIssueTimeFormattedDate(){
+		if (this.acceptanceIssueTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAcceptanceIssueTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setAcceptanceIssueTimeFormattedDate(String acceptanceIssueTimeFormattedDate){
+		
+	}
+	
+	//authorizationReceiveTime
+	public String getAuthorizationReceiveTimeFormattedDate(){
+		if (this.authorizationReceiveTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAuthorizationReceiveTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setAuthorizationReceiveTimeFormattedDate(String authorizationReceiveTimeFormattedDate){
+		
+	}
+	
+	//authorizationIssueTime
+	public String getAuthorizationIssueTimeFormattedDate(){
+		if (this.authorizationIssueTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getAuthorizationIssueTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setAuthorizationIssueTimeFormattedDate(String authorizationIssueTimeFormattedDate){
+		
+	}
+	
+	//certificateRecieveTime
+	public String getCertificateRecieveTimeFormattedDate(){
+		if (this.certificateRecieveTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCertificateRecieveTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setCertificateRecieveTimeFormattedDate(String certificateRecieveTimeFormattedDate){
+		
+	}
+	
+	//certificateIssueTime
+	public String getCertificateIssueTimeFormattedDate(){
+		if (this.certificateIssueTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCertificateIssueTime(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setCertificateIssueTimeFormattedDate(String certificateIssueTimeFormattedDate){
+		
+	}
+	
+	
+	
+	
 
 }

+ 163 - 0
src/main/java/com/goafanti/techservice/patent/bo/PatentRegistrationBo.java

@@ -0,0 +1,163 @@
+package com.goafanti.techservice.patent.bo;
+
+import java.util.Date;
+
+public class PatentRegistrationBo {
+	 /**
+	    * 受理通知书收到时间
+	    */
+	    private String acceptanceReceiveTime;
+
+	    /**
+	    * 受理通知书发出时间
+	    */
+	    private String acceptanceIssueTime;
+
+	    /**
+	    * 受理通知书发出快递单号
+	    */
+	    private String acceptanceTrackingNumber;
+
+	    /**
+	    * 受理通知书快递公司
+	    */
+	    private String acceptanceExpressCompany;
+
+	    /**
+	    * 授权通知书收到时间
+	    */
+	    private String authorizationReceiveTime;
+
+	    /**
+	    * 授权通知书发出时间
+	    */
+	    private String authorizationIssueTime;
+
+	    /**
+	    * 授权通知书快递单号
+	    */
+	    private String authorizationTrackingNumber;
+
+	    /**
+	    * 授权通知书快递公司
+	    */
+	    private String authorizationExpressCompany;
+
+	    /**
+	    * 专利证书收到时间
+	    */
+	    private String certificateRecieveTime;
+
+	    /**
+	    * 专利证书发出时间
+	    */
+	    private String certificateIssueTime;
+
+	    /**
+	    * 专利证书快递单号
+	    */
+	    private String certificateTrackingNumber;
+
+	    /**
+	    * 专利证书快递公司
+	    */
+	    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;
+		}
+	    
+	    
+}

+ 165 - 120
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -1,6 +1,7 @@
 package com.goafanti.techservice.patent.controller;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -10,6 +11,7 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 
+import org.junit.Test;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,6 +26,7 @@ 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.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -32,6 +35,7 @@ import com.goafanti.techservice.patent.bo.PatentCompositeBo;
 import com.goafanti.techservice.patent.bo.PatentNoticeOfCorrectionBo;
 import com.goafanti.techservice.patent.bo.PatentPendingBo;
 import com.goafanti.techservice.patent.bo.PatentRecieveSendBo;
+import com.goafanti.techservice.patent.bo.PatentRegistrationBo;
 import com.goafanti.techservice.patent.service.AdminService;
 import com.goafanti.techservice.patent.service.PatentCostService;
 import com.goafanti.techservice.patent.service.PatentInfoService;
@@ -43,17 +47,17 @@ import com.goafanti.user.service.OrganizationIdentityService;
 @RequestMapping(value = "/techservice/patent")
 public class PatentApiController extends BaseApiController {
 	@Resource
-	private PatentInfoService	patentInfoService;
+	private PatentInfoService			patentInfoService;
 	@Resource
-	private PatentLogService	patentLogService;
+	private PatentLogService			patentLogService;
 	@Resource
-	private OrganizationIdentityService organizationIdentityServivce;
+	private OrganizationIdentityService	organizationIdentityServivce;
 	@Resource
-	private PatentCostService patentCostService;
+	private PatentCostService			patentCostService;
 	@Resource
-	private PatentRegistrationService patentRegistrationService;
+	private PatentRegistrationService	patentRegistrationService;
 	@Resource
-	private AdminService adminService;
+	private AdminService				adminService;
 
 	/**
 	 * 用户端专利申请
@@ -111,22 +115,25 @@ public class PatentApiController extends BaseApiController {
 	 * 用户端申请专利当前流程/管理端专利详情-专利状态流转记录
 	 */
 	@RequestMapping(value = "/patentProcess", method = RequestMethod.POST)
-	public Result clientCurrentProcess(String pid) {
+	public Result patentProcess(String pid) {
 		Result res = new Result();
-		List<PatentLog> patentLog = patentLogService.selectCurrentProcessByPid(pid);
+		List<PatentLog> patentLog = patentLogService.selectProcessByPid(pid);
 		res.setData(patentLog);
 		return res;
 	}
-	
+
 	/**
 	 * 管理端申请专利列表
-	 * @throws ParseException 
+	 * 
+	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/managePatentList", method = RequestMethod.POST)
-	public Result managePatentList(String 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) throws ParseException{
-		Result res =new Result();
+	public Result managePatentList(String 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) throws ParseException {
+		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
 		if (StringUtils.isNumeric(pageSize)) {
@@ -135,45 +142,48 @@ public class PatentApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName,
-				 patentCatagory, patentName, patentState, createTime, patentApplicationDate
-				 , author, pNo,  pSize));
+		res.setData(getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName, patentCatagory,
+				patentName, patentState, createTime, patentApplicationDate, author, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 获取公司
 	 */
-	@RequestMapping(value="/getUnitNames",method = RequestMethod.GET)
-	public Result getUnitNames(){
+	@RequestMapping(value = "/getUnitNames", method = RequestMethod.GET)
+	public Result getUnitNames() {
 		Result res = new Result();
 		List<OrganizationIdentity> list = organizationIdentityServivce.selectAllOrgIndentity();
 		Map<String, String> map = new LinkedHashMap<String, String>();
-		for(OrganizationIdentity o : list){
+		for (OrganizationIdentity o : list) {
 			map.put(o.getUid(), o.getUnitName());
 		}
 		res.setData(map);
 		return res;
 	}
-	
+
 	/**
-	 * 获取操作人
+	 * 获取管理员
 	 */
-	@RequestMapping(value="/getAdmin",method=RequestMethod.GET)
-	public Result getAdmin(){
+	@RequestMapping(value = "/getAdmin", method = RequestMethod.GET)
+	public Result getAdmin() {
 		Result res = new Result();
 		List<Admin> admin = adminService.selectAllAdmin();
-		res.setData(admin);
+		Map<String, String> map = new LinkedHashMap<String, String>();
+		for (Admin a : admin) {
+			map.put(a.getId(), a.getName());
+		}
+		res.setData(map);
 		return res;
 	}
-	
+
 	/**
 	 * 管理端新增专利申请
 	 */
-	@RequestMapping(value="/manageApplyPatent",method = RequestMethod.POST)
-	public Result manageApplyPatent(PatentInfo patentInfo,String uid){
+	@RequestMapping(value = "/manageApplyPatent", method = RequestMethod.POST)
+	public Result manageApplyPatent(PatentInfo patentInfo, String uid) {
 		Result res = new Result();
-		if(null == uid){
+		if (null == uid) {
 			res.getError().add(buildError("该公司无法提交申请!"));
 			return res;
 		}
@@ -191,19 +201,19 @@ public class PatentApiController extends BaseApiController {
 		res.setData(patentInfo);
 		return res;
 	}
-	
+
 	/**
 	 * 管理端专利详情修改保存
 	 */
-	@RequestMapping(value="managePatentInfo",method = RequestMethod.POST)
-	public Result managePatentInfo(PatentInfo patentInfo,String pid,PatentLog patentLog){
+	@RequestMapping(value = "/managePatentInfo", method = RequestMethod.POST)
+	public Result managePatentInfo(PatentInfo patentInfo, String pid, PatentLog patentLog) {
 		Result res = new Result();
-		if(null == patentInfo.getId()){
+		if (null == patentInfo.getId()) {
 			res.getError().add(buildError("保存失败!"));
 			return res;
 		}
-		if (patentLog != null){
-			switch (patentLog.getState()){
+		if (patentLog != null) {
+			switch (patentLog.getState()) {
 			case 1:
 				patentInfo.setCreateTime(patentLog.getRecordTime());
 				break;
@@ -215,18 +225,18 @@ public class PatentApiController extends BaseApiController {
 				break;
 			}
 			patentInfo.setPatentState(patentLog.getState());
-		    patentLogService.insert(patentLog);
+			patentLogService.insert(patentLog);
 		}
 		patentInfo.setId(pid);
 		patentInfoService.updateByPrimaryKeySelective(patentInfo);
 		return res;
 	}
-	
+
 	/**
 	 * 待缴费专利管理
 	 */
-	@RequestMapping(value="/managePendingPaymentList",method = RequestMethod.POST)
-	public Result managePendingPaymentList(String locationProvince,String pageNo, String pageSize){
+	@RequestMapping(value = "/managePendingPaymentList", method = RequestMethod.POST)
+	public Result managePendingPaymentList(String locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -236,33 +246,34 @@ public class PatentApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(getManagePendingPaymentList(locationProvince,pNo,pSize));
+		res.setData(getManagePendingPaymentList(locationProvince, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 年费确认缴费
 	 */
-	@RequestMapping(value="/confirmPayment",method = RequestMethod.POST)
-	public Result confirmPayment(String cid){
+	@RequestMapping(value = "/confirmPayment", method = RequestMethod.POST)
+	public Result confirmPayment(String cid) {
 		Result res = new Result();
-		if (null == cid){
+		if (null == cid) {
 			res.getError().add(buildError("确认缴费失败!"));
 			return res;
 		}
-		PatentCost patentCost =new PatentCost();
+		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,String serialNumber, String patentNumber, String office, String locationProvince, String unitName,
-			 Integer patentCatagory, String patentName, Integer patentState ,String author ,String pageNo, String pageSize){
+	@RequestMapping(value = "/noticeOfCorrectionList", method = RequestMethod.POST)
+	public Result noticeOfCorrectionList(Date authorizedDate, String 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();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -272,24 +283,24 @@ public class PatentApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		 res.setData(getNoticeOfCorrectionList(authorizedDate,serialNumber,patentNumber,office,locationProvince,unitName,
-				patentCatagory,patentName,patentState,author,pNo,pSize));
-		 return res;
+		res.setData(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 ,Integer patentState){
+	@RequestMapping(value = "/replyConfirm", method = RequestMethod.POST)
+	public Result replyConfirm(String pid, Integer patentState) {
 		Result res = new Result();
 		PatentInfo patentInfo = new PatentInfo();
 		patentInfo.setId(pid);
-		if(patentState == 4){
+		if (patentState == 4) {
 			patentInfo.setPatentState(5);
-		}else if(patentState == 6){
+		} else if (patentState == 6) {
 			patentInfo.setPatentState(7);
-		}else{
+		} else {
 			res.getError().add(buildError("通知答复确认失败!"));
 			return res;
 		}
@@ -307,12 +318,12 @@ public class PatentApiController extends BaseApiController {
 		patentLogService.insert(patentLog);
 		return res;
 	}
-	
+
 	/**
 	 * 收发详情入口/收发纸件登记
 	 */
-	@RequestMapping(value="/getRecieveSendList",method = RequestMethod.POST)
-	public Result RecieveSendList(String pageNo, String pageSize){
+	@RequestMapping(value = "/getRecieveSendList", method = RequestMethod.POST)
+	public Result RecieveSendList(String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -322,29 +333,29 @@ public class PatentApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(getRecieveSendList(pNo,pSize));
+		res.setData(getRecieveSendList(pNo, pSize));
 		return res;
 	}
-	
-	
 
 	/**
-	 * 收发详情保存修改
+	 * 收发登记详情编辑保存
+	 * 
+	 * @throws ParseException
 	 */
-	@RequestMapping(value="/saveRecieveSend",method = RequestMethod.POST)
-	public Result recieveSendDetail(String rid,PatentRegistration patentRegistration){
+	@RequestMapping(value = "/saveRecieveSend", method = RequestMethod.POST)
+	public Result recieveSendDetail(String rid, PatentRegistrationBo patentRegistrationBo) throws ParseException {
 		Result res = new Result();
-		patentRegistration.setId(rid);
-		patentRegistrationService.updateByPrimaryKeySelective(patentRegistration);
+		patentRegistrationService.updateByPrimaryKeySelective(regBo2Reg(rid, patentRegistrationBo));
 		return res;
 	}
-	
+
 	/**
 	 * 专利申请费用管理
 	 */
-	@RequestMapping(value="/getApplicationFeeList",method=RequestMethod.POST)
-	public Result getApplicationFeeList(String[] patentApplicationDate,String locationProvince,String pageNo, String pageSize)
-			throws ParseException{
+	@RequestMapping(value = "/getApplicationFeeList", method = RequestMethod.POST)
+	public Result getApplicationFeeList(
+			@RequestParam(name = "patentApplicationDate[]", required = false) String[] patentApplicationDate,
+			String locationProvince, String pageNo, String pageSize) throws ParseException {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -354,75 +365,109 @@ public class PatentApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(getApplicationFeeList(patentApplicationDate,locationProvince,pNo,pSize));
+		res.setData(getApplicationFeeList(patentApplicationDate, locationProvince, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 登记申请费用
 	 */
-	@RequestMapping(value="/registerApplicationFee",method=RequestMethod.POST)
-	public Result registerApplicationFee(PatentCost patentCost,String cid){
+	@RequestMapping(value = "/registerApplicationFee", method = RequestMethod.POST)
+	public Result registerApplicationFee(PatentCost patentCost, String cid) {
 		Result res = new Result();
 		PatentCost p = new PatentCost();
-		if(null == patentCost.getApplicationFee() || null == patentCost.getPrintingFee() || null == patentCost.getTrialFee()){
-			res.getError().add(buildError(ErrorConstants.FEE_EMPTY_ERROR,"申请费、实审费、文印费均不能为空!"));
-			return res;
-		}
 		p.setId(cid);
 		p.setApplicationFee(patentCost.getApplicationFee());
-		p.setIsReimbursement(patentCost.getIsReimbursement());
-		p.setIsRequestFunds(patentCost.getIsRequestFunds());
+		p.setReimbursement(patentCost.getReimbursement());
+		p.setFunds(patentCost.getFunds());
 		p.setTrialFee(patentCost.getTrialFee());
 		p.setPrintingFee(patentCost.getPrintingFee());
-		p.setPaymentState("1");
+		p.setPaymentState(patentCost.getPaymentState());
 		res.setData(patentCostService.updateByPrimaryKeySelective(p));
 		return res;
 	}
-	
-	
-	
-	
-	//专利纸件收发登记
-	private Pagination<PatentRecieveSendBo> getRecieveSendList(Integer pNo,Integer pSize) {
-		return (Pagination<PatentRecieveSendBo>) patentRegistrationService.getRecieveSendList(pNo,pSize) ;
+
+	// 专利纸件收发登记
+	private Pagination<PatentRecieveSendBo> getRecieveSendList(Integer pNo, Integer pSize) {
+		return (Pagination<PatentRecieveSendBo>) patentRegistrationService.getRecieveSendList(pNo, pSize);
 	}
-	
-	
-	//专利申请费用管理
-	private Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate, String locationProvince, 
-			Integer pNo,Integer pSize) throws ParseException{
-		return (Pagination<PatentApplicationFeeBo>) patentCostService.getApplicationFeeList(patentApplicationDate,locationProvince,pNo,pSize);
+
+	// 专利申请费用管理
+	private Pagination<PatentApplicationFeeBo> getApplicationFeeList(String[] patentApplicationDate,
+			String locationProvince, Integer pNo, Integer pSize) throws ParseException {
+		return (Pagination<PatentApplicationFeeBo>) patentCostService.getApplicationFeeList(patentApplicationDate,
+				locationProvince, pNo, pSize);
 	}
-    
-	//补正审查通知列表
-	private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber, String patentNumber,
-			String office, String locationProvince, String unitName, Integer patentCatagory, String patentName,
-			Integer patentState, String author, Integer pNo, Integer pSize) {
-		return (Pagination<PatentNoticeOfCorrectionBo>) patentInfoService.getNoticeOfCorrectionList(authorizedDate,serialNumber,patentNumber,office,locationProvince,unitName,
-				patentCatagory,patentName,patentState,author,pNo,pSize);
+
+	// 补正审查通知列表
+	private Pagination<PatentNoticeOfCorrectionBo> getNoticeOfCorrectionList(Date authorizedDate, String serialNumber,
+			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
+			String patentName, Integer patentState, String author, Integer pNo, Integer pSize) {
+		return (Pagination<PatentNoticeOfCorrectionBo>) patentInfoService.getNoticeOfCorrectionList(authorizedDate,
+				serialNumber, patentNumber, office, locationProvince, unitName, patentCatagory, patentName, patentState,
+				author, pNo, pSize);
 	}
-    
-	//待缴费专利管理
-	private Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo, Integer pSize) {
-		return (Pagination<PatentPendingBo>) patentInfoService.getManagePendingPaymentList(locationProvince,pNo,pSize);
+
+	// 待缴费专利管理
+	private Pagination<PatentPendingBo> getManagePendingPaymentList(String locationProvince, Integer pNo,
+			Integer pSize) {
+		return (Pagination<PatentPendingBo>) patentInfoService.getManagePendingPaymentList(locationProvince, pNo,
+				pSize);
 	}
-    
-	//管理端申请专利列表
-	private Pagination<PatentCompositeBo> getManagePatentList(String 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{
-		return (Pagination<PatentCompositeBo>) patentInfoService.getManagePatentList( serialNumber, patentNumber, office, locationProvince, unitName,
-				 patentCatagory, patentName, patentState, createTime, patentApplicationDate,
-				  author, pNo,  pSize);
+
+	// 管理端申请专利列表(专利综合管理)
+	private Pagination<PatentCompositeBo> getManagePatentList(String 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 {
+		return (Pagination<PatentCompositeBo>) patentInfoService.getManagePatentList(serialNumber, patentNumber, office,
+				locationProvince, unitName, patentCatagory, patentName, patentState, createTime, patentApplicationDate,
+				author, pNo, pSize);
 	}
-    
-	//用户端申请专利列表
+
+	// 用户端申请专利列表
 	private Pagination<PatentInfo> getClientApplyList(Result res, String patentNumber, String patentName,
 			Integer patentCatagory, Integer patentState, Integer pNo, Integer pSize) {
 		return (Pagination<PatentInfo>) patentInfoService.getClientApplyList(TokenManager.getUserId(), patentNumber,
 				patentName, patentCatagory, patentState, pNo, pSize);
 	}
-	
+
+	private PatentRegistration regBo2Reg(String rid, PatentRegistrationBo patentRegistrationBo) throws ParseException {
+		PatentRegistration patentRegistration = new PatentRegistration();
+		patentRegistration.setId(rid);
+		patentRegistration.setAcceptanceExpressCompany(patentRegistrationBo.getAcceptanceExpressCompany());
+		if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceIssueTime())) {
+				patentRegistration.setAcceptanceIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceIssueTime(), "yyyy-MM-dd"));
+		}
+		if (!StringUtils.isBlank(patentRegistrationBo.getAcceptanceReceiveTime())) {
+				patentRegistration.setAcceptanceReceiveTime(
+						DateUtils.parseDate(patentRegistrationBo.getAcceptanceReceiveTime(), "yyyy-MM-dd"));
+		}
+		patentRegistration.setAcceptanceTrackingNumber(patentRegistrationBo.getAcceptanceTrackingNumber());
+		patentRegistration.setAuthorizationExpressCompany(patentRegistrationBo.getAuthorizationExpressCompany());
+		if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationIssueTime())) {
+				patentRegistration.setAuthorizationIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationIssueTime(), "yyyy-MM-dd"));
+		}
+		if (!StringUtils.isBlank(patentRegistrationBo.getAuthorizationReceiveTime())) {
+				patentRegistration.setAuthorizationReceiveTime(
+						DateUtils.parseDate(patentRegistrationBo.getAuthorizationReceiveTime(), "yyyy-MM-dd"));
+		}
+		patentRegistration.setAuthorizationTrackingNumber(patentRegistrationBo.getAuthorizationTrackingNumber());
+		patentRegistration.setCertificateExpressCompany(patentRegistrationBo.getCertificateExpressCompany());
+		if (!StringUtils.isBlank(patentRegistrationBo.getCertificateIssueTime())) {
+				patentRegistration.setCertificateIssueTime(
+						DateUtils.parseDate(patentRegistrationBo.getCertificateIssueTime(), "yyyy-MM-dd"));
+
+		}
+		if (!StringUtils.isBlank(patentRegistrationBo.getCertificateRecieveTime())) {
+				patentRegistration.setCertificateRecieveTime(
+						DateUtils.parseDate(patentRegistrationBo.getCertificateRecieveTime(), "yyyy-MM-dd"));
+		}
+		patentRegistration.setCertificateTrackingNumber(patentRegistrationBo.getCertificateTrackingNumber());
+		return patentRegistration;
+	}
+
 
 }

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

@@ -8,7 +8,7 @@ public interface PatentLogService {
 
 	PatentLog selectByPrimaryKey(String patentId);
 
-	List<PatentLog> selectCurrentProcessByPid(String patentId);
+	List<PatentLog> selectProcessByPid(String patentId);
 
 	PatentLog insert(PatentLog patentLog);
 

+ 1 - 1
src/main/java/com/goafanti/techservice/patent/service/impl/PatentCostServiceImpl.java

@@ -57,7 +57,7 @@ public class PatentCostServiceImpl extends BaseMybatisDao<PatentCostMapper> impl
 		}
 
 		if (pageSize == null || pageSize < 0) {
-			pageSize = 15;
+			pageSize = 10;
 		}
 		return (Pagination<PatentApplicationFeeBo>) findPage("findApplicationFeeListByPage", "findApplicationFeeCount", params, pageNo,
 				pageSize);

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

@@ -19,8 +19,8 @@ public class PatentLogServiceImpl implements PatentLogService {
 	}
 
 	@Override
-	public List<PatentLog> selectCurrentProcessByPid(String pid) {
-		return patentLogMapper.selectCurrentProcessByPid(pid);
+	public List<PatentLog> selectProcessByPid(String pid) {
+		return patentLogMapper.selectProcessByPid(pid);
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -37,7 +37,7 @@ public class UserRegisterController extends BaseController{
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
 	@ResponseBody
-		public Result register(@Valid User user,
+		public Result register(User user,
 				String companyName,String verificationCode,String contacts,
 				String mobileCode,BindingResult bindingResult){
 		Result res = new Result();

+ 11 - 0
src/main/webapp/WEB-INF/views/user/index.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}/user/index.css" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	<script type="text/javascript" src="${staticHost}/user/index.js"></script>
+</body>
+</html>