Antiloveg 8 years ago
parent
commit
9bf2fb6e25

+ 81 - 75
src/main/java/com/goafanti/cognizance/bo/CognizanceDetailBo.java

@@ -9,149 +9,162 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
  * 高企认定明细
  */
 public class CognizanceDetailBo {
-	private String uid;
-	
-	private String cid;
-	
+	private String		uid;
+
+	private String		cid;
+
 	/**
 	 * 公司名称
 	 */
-	private String unitName;
-	
+	private String		unitName;
+
 	/**
 	 * 公司组织机构代码
 	 */
-	private String orgCode;
-	
+	private String		orgCode;
+
 	/**
 	 * 公司地址
 	 */
-	private String postalAddress;
-	
+	private String		postalAddress;
+
 	/**
 	 * 联系人
 	 */
-	private String contacts;
-	
+	private String		contacts;
+
 	/**
 	 * 技术领域1st
 	 */
-    private Integer technicalField1;
-	
-    /**
-     * 技术领域2nd
-     */
-    private Integer technicalField2;
-    
-    /**
-     * 技术领域3rd
-     */
-	private Integer technicalField3;
-	
+	private Integer		technicalField1;
+
+	/**
+	 * 技术领域2nd
+	 */
+	private Integer		technicalField2;
+
+	/**
+	 * 技术领域3rd
+	 */
+	private Integer		technicalField3;
+
 	/**
 	 * 一类知识产权数量
 	 */
-	private Integer firstCatagory;
-	
+	private Integer		firstCatagory;
+
 	/**
 	 * 二类知识产权数量
 	 */
-	private Integer secondCatagory;
-	
+	private Integer		secondCatagory;
+
 	/**
 	 * 职工总数
 	 */
-	private Integer firmTotal;
-	
+	private Integer		firmTotal;
+
 	/**
 	 * 科技人员总数
 	 */
-	private Integer techTotal;
-	
+	private Integer		techTotal;
+
 	/**
 	 * 第一年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset1;
-	
+	private BigDecimal	netAsset1;
+
 	/**
 	 * 第一年销售收入
 	 */
-	private BigDecimal salesRevenue1;
-	
+	private BigDecimal	salesRevenue1;
+
 	/**
 	 * 第一年利润总额
 	 */
-	private BigDecimal grossProfit1;
-	
+	private BigDecimal	grossProfit1;
+
 	/**
 	 * 第二年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset2;
-	
+	private BigDecimal	netAsset2;
+
 	/**
 	 * 第二年销售收入
 	 */
-	private BigDecimal salesRevenue2;
-	
+	private BigDecimal	salesRevenue2;
+
 	/**
 	 * 第二年利润总额
 	 */
-	private BigDecimal grossProfit2;
-	
+	private BigDecimal	grossProfit2;
+
 	/**
 	 * 第三年所有者权益(净资产)
 	 */
-	private BigDecimal netAsset3;
-	
+	private BigDecimal	netAsset3;
+
 	/**
 	 * 第三年销售收入
 	 */
-	private BigDecimal salesRevenue3;
-	
+	private BigDecimal	salesRevenue3;
+
 	/**
 	 * 第三年利润总额
 	 */
-	private BigDecimal grossProfit3;
-	
+	private BigDecimal	grossProfit3;
+
 	/**
 	 * 近三年研发费用总额
 	 */
-	private BigDecimal researchCost;
-	
+	private BigDecimal	researchCost;
+
 	/**
 	 * 在中国境内研发费用
 	 */
-	private BigDecimal territory;
-	
+	private BigDecimal	territory;
+
 	/**
 	 * 基础研究投入费用
 	 */
-	private BigDecimal basicResearchCost;
-	
+	private BigDecimal	basicResearchCost;
+
 	/**
 	 * 近一年企业总收入
 	 */
-	private BigDecimal totalRevenue;
-	
+	private BigDecimal	totalRevenue;
+
 	/**
 	 * 近一年高新技术产品(服务)收入
 	 */
-	private BigDecimal lastYearRevenue;
-	
+	private BigDecimal	lastYearRevenue;
+
 	/**
 	 * 申请认定前一年内是否发生过重大安全、重大质量或严重环境违法行为
 	 */
-	private Integer accident;
-	
+	private Integer		accident;
+
 	/**
 	 * 是否为大额订单
 	 */
-	private Integer largeOrder;
-	
+	private Integer		largeOrder;
+
 	/**
 	 * 年份
 	 */
-	private Integer year;
+	private Integer		year;
+	
+	/**
+	 * 证书编号
+	 */
+	private String		certificateNumber;
+	
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
 
 	public String getUid() {
 		return uid;
@@ -193,8 +206,6 @@ public class CognizanceDetailBo {
 		this.postalAddress = postalAddress;
 	}
 
-	
-
 	public String getContacts() {
 		return contacts;
 	}
@@ -211,7 +222,7 @@ public class CognizanceDetailBo {
 	public void setTechnicalField1(Integer technicalField1) {
 		this.technicalField1 = technicalField1;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField2() {
 		return technicalField2;
@@ -262,7 +273,6 @@ public class CognizanceDetailBo {
 		this.techTotal = techTotal;
 	}
 
-	
 	public BigDecimal getNetAsset1() {
 		return netAsset1;
 	}
@@ -382,7 +392,7 @@ public class CognizanceDetailBo {
 	public void setAccident(Integer accident) {
 		this.accident = accident;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getLargeOrder() {
 		return largeOrder;
@@ -399,9 +409,5 @@ public class CognizanceDetailBo {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
-	
-	
-	
-	
-	
+
 }

+ 38 - 36
src/main/java/com/goafanti/cognizance/bo/CognizanceOrgInfoBo.java

@@ -6,32 +6,33 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 public class CognizanceOrgInfoBo {
-	private String uid;
-	
-	private String cid;
-	
-	private String unitName;
-	
-	private String orgCode;
-	
-	private String postalAddress;
-	
-	private Integer contacts;
-	
-	private Integer technicalField1;
-	
-	private Integer technicalField2;
-	
-	private Integer technicalField3;
-	
-	private BigDecimal basicResearchCost;
-	
-	private Integer largeOrder;
-
-	private Integer accient;
-	
-	private Integer year;
-	
+	private String		uid;
+
+	private String		cid;
+
+	private String		unitName;
+
+	private String		orgCode;
+
+	private String		postalAddress;
+
+	private Integer		contacts;
+
+	private Integer		technicalField1;
+
+	private Integer		technicalField2;
+
+	private Integer		technicalField3;
+
+	private BigDecimal	basicResearchCost;
+
+	private Integer		largeOrder;
+
+	private Integer		accient;
+
+	private Integer		year;
+
+	private String		certificateNumber;
 
 	public String getUid() {
 		return uid;
@@ -82,7 +83,6 @@ public class CognizanceOrgInfoBo {
 		this.contacts = contacts;
 	}
 
-
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField1() {
 		return technicalField1;
@@ -91,7 +91,7 @@ public class CognizanceOrgInfoBo {
 	public void setTechnicalField1(Integer technicalField1) {
 		this.technicalField1 = technicalField1;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField2() {
 		return technicalField2;
@@ -100,7 +100,7 @@ public class CognizanceOrgInfoBo {
 	public void setTechnicalField2(Integer technicalField2) {
 		this.technicalField2 = technicalField2;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getTechnicalField3() {
 		return technicalField3;
@@ -110,7 +110,6 @@ public class CognizanceOrgInfoBo {
 		this.technicalField3 = technicalField3;
 	}
 
-
 	public BigDecimal getBasicResearchCost() {
 		return basicResearchCost;
 	}
@@ -142,10 +141,13 @@ public class CognizanceOrgInfoBo {
 	public void setYear(Integer year) {
 		this.year = year;
 	}
-	
-	
-	
-	
-	
-	
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+
 }

+ 1 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -137,6 +137,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 			cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
 			cog.setLargeOrder(null == orgInfo.getLargeOrder() ? 0 : orgInfo.getLargeOrder());
 			cog.setYear(orgInfo.getYear());
+			cog.setCertificateNumber(orgInfo.getCertificateNumber());
 		}
 
 		CognizanceResearchCostBo researchCost = orgCognizanceMapper.selectCognizanceResearchCostBoByUidAndYear(year,

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

@@ -390,7 +390,7 @@
   <select id="selectCognizanceOrgInfoBoByUidAndCid"  resultType="com.goafanti.cognizance.bo.CognizanceOrgInfoBo">
 		select u.id as uid, c.id as cid, o.unit_name as unitName, o.org_code as orgCode, o.postal_address as postalAddress, 
 			c.contacts, c.technical_field1 as technicalField1, c.technical_field2 as technicalField2, c.technical_field3 as technicalField3,
-			c.basic_research_cost as basicResearchCost, c.accident, c.large_order as largeOrder, c.year
+			c.basic_research_cost as basicResearchCost, c.accident, c.large_order as largeOrder, c.year, c.certificate_number as certificateNumber
     	from  (select id from user where id = #{0}) u
 			LEFT JOIN organization_identity o on u.id = o.uid 
 			INNER JOIN org_cognizance c on c.uid = u.id  and c.deleted_sign = 0 and c.id = #{1}

+ 14 - 7
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -815,13 +815,21 @@
 
 	<select id="findNoticeOfCorrectionListByPage" parameterType="String"
 		resultType="com.goafanti.patent.bo.PatentNoticeOfCorrectionBo">
-		select p.uid 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
+	 select
+		p.uid 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.licence_province as locationProvince,
+		o.unit_name as unitName , 
+		p.patent_catagory as
 		patentCatagory ,
-		p.patent_state as patentState , a.name as author , p.record_time as
+		p.patent_state as patentState , 
+		a.name as author , 
+		p.record_time as
 		recordTime
 		FROM patent_info p
 		LEFT JOIN organization_identity o ON o.uid = p.uid
@@ -831,7 +839,6 @@
 		</if>
 		where p.patent_state in
 		(6,8) and p.deleted_sign = 0
-		
 		<if test="principal != null">
 			and l.principal = #{principal,jdbcType=VARCHAR}
 		</if>

+ 23 - 9
src/main/java/com/goafanti/common/mapper/PatentRegistrationMapper.xml

@@ -204,15 +204,29 @@
   </update>
   
   <select id="findRecieveSendList" resultType="com.goafanti.patent.bo.PatentRecieveSendBo">
-  select p.id as pid ,p.uid as uid, o.id as oid, r.id as rid, p.serial_number as serialNumber ,p.patent_number as patentNumber ,
-         o.location_province as locationProvince , o.unit_name as unitName ,
-         p.patent_catagory as patentCatagory , p.patent_name as patentName,
- 	     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, 
-         r.authorization_tracking_number as authorizationTrackingNumber , r.authorization_express_company as authorizationExpressCompany,
-         r.certificate_recieve_time as certificateRecieveTime, r.certificate_issue_time as certificateIssueTime, 
-         r.certificate_tracking_number as certificateTrackingNumber, r.certificate_express_company as certificateExpressCompany
+  	select 
+  		p.id as pid ,
+  		p.uid as uid, 
+  		o.id as oid, 
+  		r.id as rid, 
+  		p.serial_number as serialNumber ,
+  		p.patent_number as patentNumber ,
+        o.licence_province as locationProvince , 
+        o.unit_name as unitName ,
+        p.patent_catagory as patentCatagory , 
+        p.patent_name as patentName,
+ 	    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, 
+        r.authorization_tracking_number as authorizationTrackingNumber , 
+        r.authorization_express_company as authorizationExpressCompany,
+        r.certificate_recieve_time as certificateRecieveTime, 
+        r.certificate_issue_time as certificateIssueTime, 
+        r.certificate_tracking_number as certificateTrackingNumber, 
+        r.certificate_express_company as certificateExpressCompany
 		from patent_info p 
 		LEFT  JOIN patent_registration r  on p.id = r.pid
 		LEFT JOIN organization_identity o on o.uid = p.uid