Browse Source

1.管理端申请专利列表(分页)接口
2.管理端新增申请获取所有公司接口
3.管理端专利详情修改保存接口

Antiloveg 9 years ago
parent
commit
bd16ab6138

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

@@ -1,9 +1,10 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.user.bo.OrgIdentityBo;
 
-
 public interface OrganizationIdentityMapper {
     int deleteByPrimaryKey(String id);
 
@@ -22,4 +23,6 @@ public interface OrganizationIdentityMapper {
 	OrganizationIdentity selectOrgIdentityByUserId(String userId);
 
 	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
+
+	List<OrganizationIdentity> selectAllOrgIndentity();
 }

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

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

+ 224 - 17
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -9,21 +9,30 @@
     <result column="qq" property="qq" jdbcType="VARCHAR" />
     <result column="postal_address" property="postalAddress" jdbcType="VARCHAR" />
     <result column="postcode" property="postcode" jdbcType="VARCHAR" />
+    <result column="unit_name" property="unitName" jdbcType="VARCHAR" />
+    <result column="registered_capital" property="registeredCapital" jdbcType="INTEGER" />
+    <result column="licence_number" property="licenceNumber" jdbcType="VARCHAR" />
+    <result column="licence_province" property="licenceProvince" jdbcType="VARCHAR" />
+    <result column="licence_city" property="licenceCity" jdbcType="VARCHAR" />
+    <result column="licence_area" property="licenceArea" jdbcType="VARCHAR" />
+    <result column="licence_scanning_url" property="licenceScanningUrl" jdbcType="VARCHAR" />
+    <result column="org_code" property="orgCode" jdbcType="VARCHAR" />
+    <result column="org_code_url" property="orgCodeUrl" jdbcType="VARCHAR" />
+    <result column="bank_account" property="bankAccount" jdbcType="VARCHAR" />
+    <result column="banks" property="banks" jdbcType="VARCHAR" />
+    <result column="validation_amount" property="validationAmount" jdbcType="INTEGER" />
+    <result column="identity_type" property="identityType" jdbcType="INTEGER" />
+    <result column="location_province" property="locationProvince" jdbcType="VARCHAR" />
+    <result column="location_city" property="locationCity" jdbcType="VARCHAR" />
+    <result column="location_area" property="locationArea" jdbcType="VARCHAR" />
+    <result column="audit_status" property="auditStatus" jdbcType="INTEGER" />
+    <result column="last_year_tax_report_url" property="lastYearTaxReportUrl" jdbcType="VARCHAR" />
   </resultMap>
-  
-  <resultMap type="com.goafanti.user.bo.OrgIdentityBo" id="OrgIdentityBoMap">
-  	<id column="id" property="id" jdbcType="VARCHAR" />
-    <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="contacts" property="contacts" jdbcType="VARCHAR" />
-    <result column="fixed_tel" property="fixedTel" jdbcType="VARCHAR" />
-    <result column="qq" property="qq" jdbcType="VARCHAR" />
-    <result column="postal_address" property="postalAddress" jdbcType="VARCHAR" />
-    <result column="postcode" property="postcode" jdbcType="VARCHAR" />
-    <result column="email" property="email" jdbcType="VARCHAR" />
-  </resultMap>
-  
   <sql id="Base_Column_List" >
-    id, uid, contacts, fixed_tel, qq, postal_address, postcode 
+    id, uid, contacts, fixed_tel, qq, postal_address, postcode, unit_name, registered_capital, 
+    licence_number, licence_province, licence_city, licence_area, licence_scanning_url, 
+    org_code, org_code_url, bank_account, banks, validation_amount, identity_type, location_province, 
+    location_city, location_area, audit_status, last_year_tax_report_url
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -38,10 +47,22 @@
   <insert id="insert" parameterType="com.goafanti.common.model.OrganizationIdentity" >
     insert into organization_identity (id, uid, contacts, 
       fixed_tel, qq, postal_address, 
-      postcode)
+      postcode, unit_name, registered_capital, 
+      licence_number, licence_province, licence_city, 
+      licence_area, licence_scanning_url, org_code, 
+      org_code_url, bank_account, banks, 
+      validation_amount, identity_type, location_province, 
+      location_city, location_area, audit_status, 
+      last_year_tax_report_url)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, #{postalAddress,jdbcType=VARCHAR}, 
-      #{postcode,jdbcType=VARCHAR})
+      #{postcode,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, #{registeredCapital,jdbcType=INTEGER}, 
+      #{licenceNumber,jdbcType=VARCHAR}, #{licenceProvince,jdbcType=VARCHAR}, #{licenceCity,jdbcType=VARCHAR}, 
+      #{licenceArea,jdbcType=VARCHAR}, #{licenceScanningUrl,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, 
+      #{orgCodeUrl,jdbcType=VARCHAR}, #{bankAccount,jdbcType=VARCHAR}, #{banks,jdbcType=VARCHAR}, 
+      #{validationAmount,jdbcType=INTEGER}, #{identityType,jdbcType=INTEGER}, #{locationProvince,jdbcType=VARCHAR}, 
+      #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, #{auditStatus,jdbcType=INTEGER}, 
+      #{lastYearTaxReportUrl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity" >
     insert into organization_identity
@@ -67,6 +88,60 @@
       <if test="postcode != null" >
         postcode,
       </if>
+      <if test="unitName != null" >
+        unit_name,
+      </if>
+      <if test="registeredCapital != null" >
+        registered_capital,
+      </if>
+      <if test="licenceNumber != null" >
+        licence_number,
+      </if>
+      <if test="licenceProvince != null" >
+        licence_province,
+      </if>
+      <if test="licenceCity != null" >
+        licence_city,
+      </if>
+      <if test="licenceArea != null" >
+        licence_area,
+      </if>
+      <if test="licenceScanningUrl != null" >
+        licence_scanning_url,
+      </if>
+      <if test="orgCode != null" >
+        org_code,
+      </if>
+      <if test="orgCodeUrl != null" >
+        org_code_url,
+      </if>
+      <if test="bankAccount != null" >
+        bank_account,
+      </if>
+      <if test="banks != null" >
+        banks,
+      </if>
+      <if test="validationAmount != null" >
+        validation_amount,
+      </if>
+      <if test="identityType != null" >
+        identity_type,
+      </if>
+      <if test="locationProvince != null" >
+        location_province,
+      </if>
+      <if test="locationCity != null" >
+        location_city,
+      </if>
+      <if test="locationArea != null" >
+        location_area,
+      </if>
+      <if test="auditStatus != null" >
+        audit_status,
+      </if>
+      <if test="lastYearTaxReportUrl != null" >
+        last_year_tax_report_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -90,6 +165,60 @@
       <if test="postcode != null" >
         #{postcode,jdbcType=VARCHAR},
       </if>
+      <if test="unitName != null" >
+        #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null" >
+        #{registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="licenceNumber != null" >
+        #{licenceNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceProvince != null" >
+        #{licenceProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceCity != null" >
+        #{licenceCity,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceArea != null" >
+        #{licenceArea,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceScanningUrl != null" >
+        #{licenceScanningUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null" >
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCodeUrl != null" >
+        #{orgCodeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="bankAccount != null" >
+        #{bankAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="banks != null" >
+        #{banks,jdbcType=VARCHAR},
+      </if>
+      <if test="validationAmount != null" >
+        #{validationAmount,jdbcType=INTEGER},
+      </if>
+      <if test="identityType != null" >
+        #{identityType,jdbcType=INTEGER},
+      </if>
+      <if test="locationProvince != null" >
+        #{locationProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="locationCity != null" >
+        #{locationCity,jdbcType=VARCHAR},
+      </if>
+      <if test="locationArea != null" >
+        #{locationArea,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null" >
+        #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="lastYearTaxReportUrl != null" >
+        #{lastYearTaxReportUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationIdentity" >
@@ -113,6 +242,60 @@
       <if test="postcode != null" >
         postcode = #{postcode,jdbcType=VARCHAR},
       </if>
+      <if test="unitName != null" >
+        unit_name = #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null" >
+        registered_capital = #{registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="licenceNumber != null" >
+        licence_number = #{licenceNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceProvince != null" >
+        licence_province = #{licenceProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceCity != null" >
+        licence_city = #{licenceCity,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceArea != null" >
+        licence_area = #{licenceArea,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceScanningUrl != null" >
+        licence_scanning_url = #{licenceScanningUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null" >
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCodeUrl != null" >
+        org_code_url = #{orgCodeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="bankAccount != null" >
+        bank_account = #{bankAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="banks != null" >
+        banks = #{banks,jdbcType=VARCHAR},
+      </if>
+      <if test="validationAmount != null" >
+        validation_amount = #{validationAmount,jdbcType=INTEGER},
+      </if>
+      <if test="identityType != null" >
+        identity_type = #{identityType,jdbcType=INTEGER},
+      </if>
+      <if test="locationProvince != null" >
+        location_province = #{locationProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="locationCity != null" >
+        location_city = #{locationCity,jdbcType=VARCHAR},
+      </if>
+      <if test="locationArea != null" >
+        location_area = #{locationArea,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null" >
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="lastYearTaxReportUrl != null" >
+        last_year_tax_report_url = #{lastYearTaxReportUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -123,7 +306,25 @@
       fixed_tel = #{fixedTel,jdbcType=VARCHAR},
       qq = #{qq,jdbcType=VARCHAR},
       postal_address = #{postalAddress,jdbcType=VARCHAR},
-      postcode = #{postcode,jdbcType=VARCHAR}
+      postcode = #{postcode,jdbcType=VARCHAR},
+      unit_name = #{unitName,jdbcType=VARCHAR},
+      registered_capital = #{registeredCapital,jdbcType=INTEGER},
+      licence_number = #{licenceNumber,jdbcType=VARCHAR},
+      licence_province = #{licenceProvince,jdbcType=VARCHAR},
+      licence_city = #{licenceCity,jdbcType=VARCHAR},
+      licence_area = #{licenceArea,jdbcType=VARCHAR},
+      licence_scanning_url = #{licenceScanningUrl,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      org_code_url = #{orgCodeUrl,jdbcType=VARCHAR},
+      bank_account = #{bankAccount,jdbcType=VARCHAR},
+      banks = #{banks,jdbcType=VARCHAR},
+      validation_amount = #{validationAmount,jdbcType=INTEGER},
+      identity_type = #{identityType,jdbcType=INTEGER},
+      location_province = #{locationProvince,jdbcType=VARCHAR},
+      location_city = #{locationCity,jdbcType=VARCHAR},
+      location_area = #{locationArea,jdbcType=VARCHAR},
+      audit_status = #{auditStatus,jdbcType=INTEGER},
+      last_year_tax_report_url = #{lastYearTaxReportUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -135,10 +336,16 @@
   </select>
   
    
-  <select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String" resultMap="OrgIdentityBoMap">
+  <select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgIdentityBo">
   	select t.id,t.uid,t.contacts,t.fixed_tel,t.qq,t.postal_address,t.postcode,
     u.email from user u LEFT JOIN organization_identity t
     on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
   </select>
   
+  <select id="selectAllOrgIndentity" resultMap="BaseResultMap">
+   select 
+   <include refid="Base_Column_List" />
+    from organization_identity
+   
+  </select>
 </mapper>

+ 93 - 2
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -389,17 +389,108 @@
     where uid = #{uid,jdbcType=VARCHAR}
   </select>
   
-   <select id="findClientApplyListByPage" resultMap="BaseResultMap" >
+   <select id="findClientApplyListByPage" resultMap="BaseResultMap" parameterType="String">
  	select
     <include refid="Base_Column_List" />
-    from patent_info
+    from patent_info 
+    where 1=1
+    <if test ="uid != null">
+        and uid = #{uid,jdbcType=VARCHAR}
+    </if>
+    <if test = "patentNumber != null" >
+        and patent_number = #{patentNumber,jdbcType=VARCHAR}
+    </if>
+    <if test = "patentName != null">
+    	and patent_name like "%"#{patentName,jdbcType=VARCHAR}"%"
+    </if>
+     <if test = "patentCatagory != null">
+    	and patent_catagory = #{patentCatagory,jdbcType=INTEGER}
+    </if>
+     <if test = "patentState != nulll">
+    	and patent_state = #{patentState,jdbcType=INTEGER}
+    </if>
+    order by  patent_application_date desc
     <if test="page_sql!=null">
 		${page_sql}
 	</if>
+	
   </select>
   
   <select id="findClentApplyCount" resultType="java.lang.Integer">
  	select count(1)
     from patent_info
   </select>
+  
+  <select id="findManagePatentListByPage" resultType="com.goafanti.techservice.patent.bo.PatentCompositeBo">
+  	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 
+	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="createTime != null">
+	    and  p.create_time = #{createTime,jdbcType=TIMESTAMP}
+	</if>
+	<if test="patentApplicationDate != null">
+	    and  p.patent_application_date = #{patentApplicationDate,jdbcType=TIMESTAMP}
+	</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 create_time desc
+	 <if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findManagePatentCount" resultType="java.lang.Integer">
+   	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 ) 
+	as total
+  </select>
 </mapper>

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

@@ -114,4 +114,11 @@
       comment = #{comment,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  
+  <select id="selectCurrentProcessByPid"  parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from patent_log
+    where pid = #{pid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 233 - 3
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -29,8 +29,96 @@ public class OrganizationIdentity {
     * 邮政编码
     */
     private String postcode;
-    
-   
+
+    /**
+    * 单位名称
+    */
+    private String unitName;
+
+    /**
+    * 注册资金
+    */
+    private Integer registeredCapital;
+
+    /**
+    * 营业执照注册号
+    */
+    private String licenceNumber;
+
+    /**
+    * 营业执照所在地--省
+    */
+    private String licenceProvince;
+
+    /**
+    * 营业执照所在地-市
+    */
+    private String licenceCity;
+
+    /**
+    * 营业执照所在地-区(县)
+    */
+    private String licenceArea;
+
+    /**
+    * 营业执照副本扫描件URL
+    */
+    private String licenceScanningUrl;
+
+    /**
+    * 组织机构代码证号码
+    */
+    private String orgCode;
+
+    /**
+    * 组织机构代码证URL
+    */
+    private String orgCodeUrl;
+
+    /**
+    * 银行账号
+    */
+    private String bankAccount;
+
+    /**
+    * 开户行
+    */
+    private String banks;
+
+    /**
+    * 打入账内信息
+    */
+    private Integer validationAmount;
+
+    /**
+    * 身份类型
+    */
+    private Integer identityType;
+
+    /**
+    * 所在地-省
+    */
+    private String locationProvince;
+
+    /**
+    * 所在地-市
+    */
+    private String locationCity;
+
+    /**
+    * 所在地-区(县)
+    */
+    private String locationArea;
+
+    /**
+    * 审核状态
+    */
+    private Integer auditStatus;
+
+    /**
+    * 上年度纳税报表
+    */
+    private String lastYearTaxReportUrl;
 
     public String getId() {
         return id;
@@ -88,5 +176,147 @@ public class OrganizationIdentity {
         this.postcode = postcode;
     }
 
-    
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public Integer getRegisteredCapital() {
+        return registeredCapital;
+    }
+
+    public void setRegisteredCapital(Integer registeredCapital) {
+        this.registeredCapital = registeredCapital;
+    }
+
+    public String getLicenceNumber() {
+        return licenceNumber;
+    }
+
+    public void setLicenceNumber(String licenceNumber) {
+        this.licenceNumber = licenceNumber;
+    }
+
+    public String getLicenceProvince() {
+        return licenceProvince;
+    }
+
+    public void setLicenceProvince(String licenceProvince) {
+        this.licenceProvince = licenceProvince;
+    }
+
+    public String getLicenceCity() {
+        return licenceCity;
+    }
+
+    public void setLicenceCity(String licenceCity) {
+        this.licenceCity = licenceCity;
+    }
+
+    public String getLicenceArea() {
+        return licenceArea;
+    }
+
+    public void setLicenceArea(String licenceArea) {
+        this.licenceArea = licenceArea;
+    }
+
+    public String getLicenceScanningUrl() {
+        return licenceScanningUrl;
+    }
+
+    public void setLicenceScanningUrl(String licenceScanningUrl) {
+        this.licenceScanningUrl = licenceScanningUrl;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getOrgCodeUrl() {
+        return orgCodeUrl;
+    }
+
+    public void setOrgCodeUrl(String orgCodeUrl) {
+        this.orgCodeUrl = orgCodeUrl;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getBanks() {
+        return banks;
+    }
+
+    public void setBanks(String banks) {
+        this.banks = banks;
+    }
+
+    public Integer getValidationAmount() {
+        return validationAmount;
+    }
+
+    public void setValidationAmount(Integer validationAmount) {
+        this.validationAmount = validationAmount;
+    }
+
+    public Integer getIdentityType() {
+        return identityType;
+    }
+
+    public void setIdentityType(Integer identityType) {
+        this.identityType = identityType;
+    }
+
+    public String getLocationProvince() {
+        return locationProvince;
+    }
+
+    public void setLocationProvince(String locationProvince) {
+        this.locationProvince = locationProvince;
+    }
+
+    public String getLocationCity() {
+        return locationCity;
+    }
+
+    public void setLocationCity(String locationCity) {
+        this.locationCity = locationCity;
+    }
+
+    public String getLocationArea() {
+        return locationArea;
+    }
+
+    public void setLocationArea(String locationArea) {
+        this.locationArea = locationArea;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getLastYearTaxReportUrl() {
+        return lastYearTaxReportUrl;
+    }
+
+    public void setLastYearTaxReportUrl(String lastYearTaxReportUrl) {
+        this.lastYearTaxReportUrl = lastYearTaxReportUrl;
+    }
 }

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

@@ -0,0 +1,344 @@
+package com.goafanti.techservice.patent.bo;
+
+import java.util.Date;
+
+/**
+ * 管理端综合管理
+ */
+public class PatentCompositeBo {
+	private String uid;
+	
+	private String oid;
+	
+	private String pid;
+	
+	private String serialNumber;
+	
+	private String patentNumber;
+	
+	private String office;
+	
+	private String unitName;
+	
+	private Integer patentCatagory;
+	
+	private String patentName;
+	
+	private Integer patentState;
+	
+	private Date createTime;
+	
+    private Date patentApplicationDate;
+    
+    private Date authorizedDate;
+    
+    private String author;
+    
+    private String orgCode;
+    
+    private String locationProvince;
+    
+    private String locationCity;
+    
+    private String locationArea;
+    
+    private String contacts;
+    
+    private Integer number;
+    
+    private Integer patentField;
+    
+    private String patentDes;
+    
+    private String firstInventorName;
+    
+    private String firstInventorNationality;
+    
+    private String firstInventorIdNumber;
+    
+    private String secondInventorName;
+    
+    private String secondInventorNationality;
+    
+    private String thirdInventorName;
+    
+    private String lastYearTaxReportUrl;
+    
+    private String patentProryStatementUrl;
+    
+    private String patentWritingUrl;
+    
+    private String authorizationNoticeUrl;
+    
+    private String patentCertificateUrl;
+    
+   
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getOid() {
+		return oid;
+	}
+
+	public void setOid(String oid) {
+		this.oid = oid;
+	}
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	public String getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(String serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getPatentNumber() {
+		return patentNumber;
+	}
+
+	public void setPatentNumber(String patentNumber) {
+		this.patentNumber = patentNumber;
+	}
+
+	public String getOffice() {
+		return office;
+	}
+
+	public void setOffice(String office) {
+		this.office = office;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public Integer getPatentCatagory() {
+		return patentCatagory;
+	}
+
+	public void setPatentCatagory(Integer patentCatagory) {
+		this.patentCatagory = patentCatagory;
+	}
+
+	public String getPatentName() {
+		return patentName;
+	}
+
+	public void setPatentName(String patentName) {
+		this.patentName = patentName;
+	}
+
+	public Integer getPatentState() {
+		return patentState;
+	}
+
+	public void setPatentState(Integer patentState) {
+		this.patentState = patentState;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getPatentApplicationDate() {
+		return patentApplicationDate;
+	}
+
+	public void setPatentApplicationDate(Date patentApplicationDate) {
+		this.patentApplicationDate = patentApplicationDate;
+	}
+
+	public Date getAuthorizedDate() {
+		return authorizedDate;
+	}
+
+	public void setAuthorizedDate(Date authorizedDate) {
+		this.authorizedDate = authorizedDate;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+
+
+	public String getLocationProvince() {
+		return locationProvince;
+	}
+
+	public void setLocationProvince(String locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	public String getLocationCity() {
+		return locationCity;
+	}
+
+	public void setLocationCity(String locationCity) {
+		this.locationCity = locationCity;
+	}
+
+	public String getLocationArea() {
+		return locationArea;
+	}
+
+	public void setLocationArea(String locationArea) {
+		this.locationArea = locationArea;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	public Integer getPatentField() {
+		return patentField;
+	}
+
+	public void setPatentField(Integer patentField) {
+		this.patentField = patentField;
+	}
+
+	public String getPatentDes() {
+		return patentDes;
+	}
+
+	public void setPatentDes(String patentDes) {
+		this.patentDes = patentDes;
+	}
+
+	public String getFirstInventorName() {
+		return firstInventorName;
+	}
+
+	public void setFirstInventorName(String firstInventorName) {
+		this.firstInventorName = firstInventorName;
+	}
+
+	public String getFirstInventorNationality() {
+		return firstInventorNationality;
+	}
+
+	public void setFirstInventorNationality(String firstInventorNationality) {
+		this.firstInventorNationality = firstInventorNationality;
+	}
+
+	public String getFirstInventorIdNumber() {
+		return firstInventorIdNumber;
+	}
+
+	public void setFirstInventorIdNumber(String firstInventorIdNumber) {
+		this.firstInventorIdNumber = firstInventorIdNumber;
+	}
+
+	public String getSecondInventorName() {
+		return secondInventorName;
+	}
+
+	public void setSecondInventorName(String secondInventorName) {
+		this.secondInventorName = secondInventorName;
+	}
+
+	public String getSecondInventorNationality() {
+		return secondInventorNationality;
+	}
+
+	public void setSecondInventorNationality(String secondInventorNationality) {
+		this.secondInventorNationality = secondInventorNationality;
+	}
+
+	public String getThirdInventorName() {
+		return thirdInventorName;
+	}
+
+	public void setThirdInventorName(String thirdInventorName) {
+		this.thirdInventorName = thirdInventorName;
+	}
+
+	public String getPatentWritingUrl() {
+		return patentWritingUrl;
+	}
+
+	public void setPatentWritingUrl(String patentWritingUrl) {
+		this.patentWritingUrl = patentWritingUrl;
+	}
+
+	public String getAuthorizationNoticeUrl() {
+		return authorizationNoticeUrl;
+	}
+
+	public void setAuthorizationNoticeUrl(String authorizationNoticeUrl) {
+		this.authorizationNoticeUrl = authorizationNoticeUrl;
+	}
+
+	public String getPatentCertificateUrl() {
+		return patentCertificateUrl;
+	}
+
+	public void setPatentCertificateUrl(String patentCertificateUrl) {
+		this.patentCertificateUrl = patentCertificateUrl;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getLastYearTaxReportUrl() {
+		return lastYearTaxReportUrl;
+	}
+
+	public void setLastYearTaxReportUrl(String lastYearTaxReportUrl) {
+		this.lastYearTaxReportUrl = lastYearTaxReportUrl;
+	}
+
+	public String getPatentProryStatementUrl() {
+		return patentProryStatementUrl;
+	}
+
+	public void setPatentProryStatementUrl(String patentProryStatementUrl) {
+		this.patentProryStatementUrl = patentProryStatementUrl;
+	}
+    
+    
+    
+}

+ 97 - 3
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -1,5 +1,10 @@
 package com.goafanti.techservice.patent.controller;
 
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import javax.annotation.Resource;
@@ -9,14 +14,18 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrganizationIdentity;
 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.bo.PatentCompositeBo;
 import com.goafanti.techservice.patent.service.PatentInfoService;
 import com.goafanti.techservice.patent.service.PatentLogService;
+import com.goafanti.user.service.OrganizationIdentityService;
 
 @Controller
 @RequestMapping(value = "/techservice/patent")
@@ -25,6 +34,8 @@ public class PatentApiController extends BaseApiController {
 	private PatentInfoService	patentInfoService;
 	@Resource
 	private PatentLogService	patentLogService;
+	@Resource
+	private OrganizationIdentityService organizationIdentityServivce;
 
 	/**
 	 * 用户端专利申请
@@ -76,15 +87,98 @@ public class PatentApiController extends BaseApiController {
 	@RequestMapping(value = "/clientCurrentProcess", method = RequestMethod.POST)
 	public Result clientCurrentProcess(String patentId) {
 		Result res = new Result();
-		PatentLog patentLog = patentLogService.selectByPrimaryKey(patentId);
+		List<PatentLog> patentLog = patentLogService.selectCurrentProcessByPid(patentId);
 		res.setData(patentLog);
 		return res;
 	}
+	
+	/**
+	 * 管理端申请专利列表
+	 */
+	@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,Date createTime,Date patentApplicationDate,
+			Date authorizedDate,String author,String pageNo, String pageSize){
+		Result res =new Result();
+		Integer pNo = 1;
+		Integer pSize = 15;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(getManagePatentList(serialNumber, patentNumber, office, locationProvince, unitName,
+				 patentCatagory, patentName, patentState, createTime, patentApplicationDate,
+				 authorizedDate, author, pNo,  pSize));
+		return res;
+	}
+	
+	/**
+	 * 获取公司
+	 * @return
+	 */
+	@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){
+			map.put(o.getUid(), o.getUnitName());
+		}
+		res.setData(map);
+		return res;
+	}
+	
+	/**
+	 * 管理端新增专利申请
+	 */
+	@RequestMapping(value="manageApplyPatent",method = RequestMethod.POST)
+	public Result manageApplyPatent(PatentInfo patentInfo,String uid){
+		Result res = new Result();
+		if(null == uid){
+			res.getError().add(buildError("该公司无法提交申请!"));
+			return res;
+		}
+		patentInfo.setId(UUID.randomUUID().toString());
+		patentInfo.setUid(uid);
+		patentInfoService.insert(patentInfo);
+		res.setData(patentInfo);
+		return res;
+	}
+	
+	/**
+	 * 管理端专利详情修改保存
+	 */
+	@RequestMapping(value="managePatentInfo",method = RequestMethod.POST)
+	public Result managePatentInfo(PatentInfo patentInfo,String pid,PatentLog patentLog){
+		Result res = new Result();
+		if(null == patentInfo.getId()){
+			res.getError().add(buildError("保存失败!"));
+			return res;
+		}
+		if (patentLog != null){
+			patentInfo.setPatentState(patentLog.getState());
+		    patentLogService.insert(patentLog);
+		}
+		patentInfo.setId(pid);
+		patentInfoService.updateByPrimaryKeySelective(patentInfo);
+		return res;
+	}
+	
+	
+	private Pagination<PatentCompositeBo> getManagePatentList(String serialNumber,String patentNumber,String office,String locationProvince,String unitName,
+			Integer patentCatagory,String patentName,Integer patentState,Date createTime,Date patentApplicationDate,
+			Date authorizedDate,String author,Integer pNo, Integer pSize){
+		return (Pagination<PatentCompositeBo>) patentInfoService.getManagePatentList( serialNumber, patentNumber, office, locationProvince, unitName,
+				 patentCatagory, patentName, patentState, createTime, patentApplicationDate,
+				 authorizedDate, author, pNo,  pSize);
+	}
 
 	private Pagination<PatentInfo> getClientApplyList(Result res, String patentNumber, String patentName,
-			Integer parentCatagory, Integer patentState, Integer pNo, Integer pSize) {
+			Integer patentCatagory, Integer patentState, Integer pNo, Integer pSize) {
 		return (Pagination<PatentInfo>) patentInfoService.getClientApplyList(TokenManager.getUserId(), patentNumber,
-				patentName, parentCatagory, patentState, pNo, pSize);
+				patentName, patentCatagory, patentState, pNo, pSize);
 	}
 
 }

+ 8 - 0
src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java

@@ -1,7 +1,10 @@
 package com.goafanti.techservice.patent.service;
 
+import java.util.Date;
+
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.patent.bo.PatentCompositeBo;
 
 public interface PatentInfoService {
 
@@ -16,4 +19,9 @@ public interface PatentInfoService {
 	Pagination<PatentInfo> getClientApplyList(String userId, String patentNumber, String patentName,
 			Integer parentCatagory, Integer patentState, Integer pNo, Integer pSize);
 
+	Pagination<PatentCompositeBo> getManagePatentList(String serialNumber, String patentNumber, String office,
+			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			Date createTime, Date patentApplicationDate, Date authorizedDate, String author, Integer pNo,
+			Integer pSize);
+
 }

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

@@ -1,9 +1,15 @@
 package com.goafanti.techservice.patent.service;
 
+import java.util.List;
+
 import com.goafanti.common.model.PatentLog;
 
 public interface PatentLogService {
 
 	PatentLog selectByPrimaryKey(String patentId);
 
+	List<PatentLog> selectCurrentProcessByPid(String patentId);
+
+	PatentLog insert(PatentLog patentLog);
+
 }

+ 77 - 8
src/main/java/com/goafanti/techservice/patent/service/impl/PatentInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.techservice.patent.service.impl;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,6 +11,7 @@ import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.patent.bo.PatentCompositeBo;
 import com.goafanti.techservice.patent.service.PatentInfoService;
 
 
@@ -46,26 +48,26 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<PatentInfo> getClientApplyList(String userId, String patentNumber, String patentName,
-			Integer parentCatagory, Integer patentState, Integer pageNo, Integer pageSize) {
+	public Pagination<PatentInfo> getClientApplyList(String uid, String patentNumber, String patentName,
+			Integer patentCatagory, Integer patentState, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		
-		if (userId == null){
+		if (uid == null){
 			return null;
 		}else{		
-			params.put("userId", userId);
+			params.put("uid", uid);
 		}
 		
-		if (patentNumber != null){
+		if (patentNumber != null && patentNumber != ""){
 			params.put("patentNumber", patentNumber);
 		}
 		
-		if (patentName != null){
+		if (patentName != null && patentName != ""){
 			params.put("patentName", patentName);
 		}
 		
-		if (parentCatagory != null){
-			params.put("parentCatagory", parentCatagory);
+		if (patentCatagory != null ){
+			params.put("patentCatagory", patentCatagory);
 		}
 		
 		if(patentState != null){
@@ -83,4 +85,71 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 				pageSize);
 	}
 
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<PatentCompositeBo> getManagePatentList(String serialNumber, String patentNumber, String office,
+			String locationProvince, String unitName, Integer patentCatagory, String patentName, Integer patentState,
+			Date createTime, Date patentApplicationDate, Date authorizedDate, String author, Integer pageNo,
+			Integer pageSize) {
+		Map<String, Object> params = new HashMap<>();
+		if(serialNumber != null && serialNumber != ""){
+			params.put("serialNumber", serialNumber);
+		}
+		
+		if(patentNumber != null && patentNumber != ""){
+			params.put(patentNumber, patentNumber);
+		}
+		
+		if(office != null && office != ""){
+			params.put("office", office);
+		}
+		
+		if(locationProvince != null && locationProvince != ""){
+			params.put("locationProvince", locationProvince);
+		}
+		
+		if(unitName != null && unitName != ""){
+			params.put("unitName", unitName);
+		}
+		
+		if(patentCatagory != null){
+			params.put("patentCatagory", patentCatagory);
+		}
+		
+		if(patentName != null && patentName != ""){
+			params.put("patentName", patentName);
+		}
+		
+		if(patentState != null){
+			params.put("patentState", patentState);
+		}
+		
+		if(createTime != null){
+			params.put("createTime", createTime);
+		}
+		
+		if(patentApplicationDate != null){
+			params.put("patentApplicationDate", patentApplicationDate);
+		}
+		
+		if(authorizedDate != null){
+			params.put("authorizedDate", authorizedDate);
+		}
+		
+		if(author != null && author != ""){
+			params.put("author", author);
+		}
+		
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 15;
+		}
+		return (Pagination<PatentCompositeBo>) findPage("findManagePatentListByPage","findManagePatentCount", params, pageNo, pageSize);
+	}
+
 }

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

@@ -1,5 +1,7 @@
 package com.goafanti.techservice.patent.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +17,17 @@ public class PatentLogServiceImpl implements PatentLogService {
 	public PatentLog selectByPrimaryKey(String id) {
 		return patentLogMapper.selectByPrimaryKey(id);
 	}
+
+	@Override
+	public List<PatentLog> selectCurrentProcessByPid(String pid) {
+		return patentLogMapper.selectCurrentProcessByPid(pid);
+	}
+
+	@Override
+	public PatentLog insert(PatentLog patentLog) {
+		patentLogMapper.insert(patentLog);
+		return patentLog;
+	}
 	
 	
 }

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

@@ -1,5 +1,7 @@
 package com.goafanti.user.service;
 
+import java.util.List;
+
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.user.bo.OrgIdentityBo;
 
@@ -13,4 +15,6 @@ public interface OrganizationIdentityService {
 
 	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
 
+	List<OrganizationIdentity> selectAllOrgIndentity();
+
 }

+ 7 - 0
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -1,5 +1,7 @@
 package com.goafanti.user.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,4 +36,9 @@ public class OrganizationIdentityServiceImpl implements OrganizationIdentityServ
 		return organizationIdentityMapper.selectOrgIdentityBoByUserId(uid);
 	}
 
+	@Override
+	public List<OrganizationIdentity> selectAllOrgIndentity() {
+		return organizationIdentityMapper.selectAllOrgIndentity();
+	}
+
 }

+ 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>