Browse Source

年报申请&&年报详情接口&&数据类型更改

Antiloveg 9 years ago
parent
commit
4fda934176
30 changed files with 1394 additions and 548 deletions
  1. 49 0
      schema/2017-03-09.sql
  2. 14 13
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  3. 9 0
      src/main/java/com/goafanti/common/dao/OrgAnnualReportMapper.java
  4. 3 1
      src/main/java/com/goafanti/common/dao/OrgCognizanceMapper.java
  5. 40 40
      src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml
  6. 18 18
      src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml
  7. 157 3
      src/main/java/com/goafanti/common/mapper/OrgAnnualReportMapper.xml
  8. 15 9
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  9. 48 48
      src/main/java/com/goafanti/common/mapper/OrgFinanceMapper.xml
  10. 40 40
      src/main/java/com/goafanti/common/mapper/OrgRatepayMapper.xml
  11. 5 5
      src/main/java/com/goafanti/common/mapper/OrgTechProductMapper.xml
  12. 38 36
      src/main/java/com/goafanti/common/model/OrgActivity.java
  13. 67 64
      src/main/java/com/goafanti/common/model/OrgActivityCost.java
  14. 15 2
      src/main/java/com/goafanti/common/model/OrgAnnualReport.java
  15. 81 78
      src/main/java/com/goafanti/common/model/OrgFinance.java
  16. 72 67
      src/main/java/com/goafanti/common/model/OrgRatepay.java
  17. 12 9
      src/main/java/com/goafanti/common/model/OrgTechProduct.java
  18. 105 30
      src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportBo.java
  19. 270 0
      src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportMainBo.java
  20. 146 0
      src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportPropertyRightBo.java
  21. 6 3
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceCatagoryBo.java
  22. 46 43
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceDetailBo.java
  23. 30 27
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceManageCostBo.java
  24. 6 3
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceOrgInfoBo.java
  25. 9 6
      src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceResearchCostBo.java
  26. 45 1
      src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java
  27. 13 0
      src/main/java/com/goafanti/techservice/cognizance/service/OrgAnnualReportService.java
  28. 3 1
      src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceService.java
  29. 30 0
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgAnnualReportServiceImpl.java
  30. 2 1
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceServiceImpl.java

+ 49 - 0
schema/2017-03-09.sql

@@ -0,0 +1,49 @@
+ALTER TABLE org_annual_report 
+add `basic_research_cost` DECIMAL(8,2) NULL COMMENT '基础研究投入费用' AFTER `total_export_volume`
+
+ALTER TABLE org_activity 
+MODIFY COLUMN budget DECIMAL(8,2) COMMENT '预算(万元)',
+MODIFY COLUMN first_year_expenditure DECIMAL(8,2) COMMENT '第一年研发经费支出(万元)',
+MODIFY COLUMN second_year_expenditure DECIMAL(8,2) COMMENT '第二年研发经费支出(万元)',
+MODIFY COLUMN third_year_expenditure DECIMAL(8,2) COMMENT '第三年研发经费支出(万元)'
+
+ALTER TABLE org_activity_cost 
+MODIFY COLUMN internal_labor_cost DECIMAL(8,2) COMMENT '内部人员人工费用(万元)',
+MODIFY COLUMN internal_direct_cost DECIMAL(8,2) COMMENT '内部直接投入费用(万元)',
+MODIFY COLUMN internal_depreciation_cost DECIMAL(8,2) COMMENT '内部折旧费用与长期待摊费用(万元)',
+MODIFY COLUMN internal_amortization_cost DECIMAL(8,2) COMMENT '内部无形资产摊销费用(万元)',
+MODIFY COLUMN internal_design_cost DECIMAL(8,2) COMMENT '内部设计费用(万元)',
+MODIFY COLUMN internal_equipment_cost DECIMAL(8,2) COMMENT '内部装备调试费用与实验费用(万元)',
+MODIFY COLUMN internal_other_cost DECIMAL(8,2) COMMENT '内部其他费用(万元)',
+MODIFY COLUMN external_total_cost DECIMAL(8,2) COMMENT '委托外部研究开发总费用(万元)',
+MODIFY COLUMN external_abroad_cost DECIMAL(8,2) COMMENT '委托外部境内的外部研发费用(万元)'
+
+ALTER TABLE org_cognizance 
+MODIFY COLUMN basic_research_cost DECIMAL(8,2) COMMENT '基础研究投入费用总额(万元)'
+
+ALTER TABLE org_finance
+MODIFY COLUMN main_business_income DECIMAL(8,2) COMMENT '主营业务收入(万元)',
+MODIFY COLUMN management_cost DECIMAL(8,2) COMMENT '管理费用(万元)',
+MODIFY COLUMN operating_profit DECIMAL(8,2) COMMENT '营业利润(万元)',
+MODIFY COLUMN various_tax DECIMAL(8,2) COMMENT '支付的各项税费(万元)',
+MODIFY COLUMN current_asset DECIMAL(8,2) COMMENT '流动资产(万元)',
+MODIFY COLUMN net_fixed_asset DECIMAL(8,2) COMMENT '固定资产净额(万元)',
+MODIFY COLUMN total_asset DECIMAL(8,2) COMMENT '资产总额(万元)',
+MODIFY COLUMN net_asset DECIMAL(8,2) COMMENT '所有者权益合计(万元)',
+MODIFY COLUMN gross_profit DECIMAL(8,2) COMMENT '利润总额(万元)',
+MODIFY COLUMN net_profit DECIMAL(8,2) COMMENT '净利润(万元)',
+MODIFY COLUMN sales_revenue DECIMAL(8,2) COMMENT '销售收入(万元)'
+
+ALTER TABLE org_ratepay
+MODIFY COLUMN operating_income DECIMAL(8,2) COMMENT '营业收入(万元)',
+MODIFY COLUMN management_cost DECIMAL(8,2) COMMENT '管理费用(万元)',
+MODIFY COLUMN operating_profit DECIMAL(8,2) COMMENT '营业利润(万元)',
+MODIFY COLUMN non_operating_income DECIMAL(8,2) COMMENT '营业外收入(万元)',
+MODIFY COLUMN non_taxable_income DECIMAL(8,2) COMMENT '不征税收入(万元)',
+MODIFY COLUMN tax_exempt_income DECIMAL(8,2) COMMENT '免税收入(万元)',
+MODIFY COLUMN subsidy_income DECIMAL(8,2) COMMENT '政府补助收入(万元)',
+MODIFY COLUMN gross_profit DECIMAL(8,2) COMMENT '利润总额(万元)',
+MODIFY COLUMN research_cost DECIMAL(8,2) COMMENT '研发费用(万元)'
+
+ALTER TABLE org_tech_product
+MODIFY COLUMN last_year_revenue DECIMAL(8,2) COMMENT '上年度销售收入(万元)'

+ 14 - 13
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1,5 +1,6 @@
 package com.goafanti.admin.controller;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.LinkedHashMap;
@@ -958,30 +959,30 @@ public class AdminApiController extends BaseApiController {
 		cog.setTechnicalField1(null == orgInfo.getTechnicalField1() ? 0 : orgInfo.getTechnicalField1());
 		cog.setTechnicalField2(null == orgInfo.getTechnicalField2() ? 0 : orgInfo.getTechnicalField2());
 		cog.setTechnicalField3(null == orgInfo.getTechnicalField3() ? 0 : orgInfo.getTechnicalField3());
-		cog.setBasicResearchCost(null == orgInfo.getBasicResearchCost() ? 0 : orgInfo.getBasicResearchCost());
+		cog.setBasicResearchCost(null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
 		cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
 		
 		CognizanceResearchCostBo  researchCost = orgCognizanceService.selectCognizanceResearchCostBoByUid(uid);
-		cog.setResearchCost(null == researchCost.getResearchCost() ? 0 :  researchCost.getResearchCost());
-		cog.setTerritory(null == researchCost.getTerritory() ? 0 : researchCost.getTerritory());
+		cog.setResearchCost(null == researchCost.getResearchCost() ? new BigDecimal(0) :  researchCost.getResearchCost());
+		cog.setTerritory(null == researchCost.getTerritory() ? new BigDecimal(0) : researchCost.getTerritory());
 		
 		CognizanceManageCostBo manageCost = orgCognizanceService.selectCognizanceManageCostBoByUid(uid);
-		cog.setNetAsset1(null == manageCost.getNetAsset1() ? 0 : manageCost.getNetAsset1());
-		cog.setNetAsset2(null == manageCost.getNetAsset2() ? 0 : manageCost.getNetAsset2());
-		cog.setNetAsset3(null == manageCost.getNetAsset3() ? 0 : manageCost.getNetAsset3());
-		cog.setSalesRevenue1(null == manageCost.getSalesRevenue1() ? 0 : manageCost.getSalesRevenue1());
-		cog.setSalesRevenue2(null == manageCost.getSalesRevenue2() ? 0 : manageCost.getSalesRevenue2());
-		cog.setSalesRevenue3(null == manageCost.getSalesRevenue3() ? 0 : manageCost.getSalesRevenue3());
-		cog.setGrossProfit1(null == manageCost.getGrossProfit1() ? 0 : manageCost.getGrossProfit1());
-		cog.setGrossProfit2(null == manageCost.getGrossProfit2() ? 0 : manageCost.getGrossProfit2());
-		cog.setGrossProfit3(null == manageCost.getGrossProfit3() ? 0 : manageCost.getGrossProfit3());
+		cog.setNetAsset1(null == manageCost.getNetAsset1() ? new BigDecimal(0) : manageCost.getNetAsset1());
+		cog.setNetAsset2(null == manageCost.getNetAsset2() ? new BigDecimal(0) : manageCost.getNetAsset2());
+		cog.setNetAsset3(null == manageCost.getNetAsset3() ? new BigDecimal(0) : manageCost.getNetAsset3());
+		cog.setSalesRevenue1(null == manageCost.getSalesRevenue1() ? new BigDecimal(0) : manageCost.getSalesRevenue1());
+		cog.setSalesRevenue2(null == manageCost.getSalesRevenue2() ? new BigDecimal(0) : manageCost.getSalesRevenue2());
+		cog.setSalesRevenue3(null == manageCost.getSalesRevenue3() ? new BigDecimal(0) : manageCost.getSalesRevenue3());
+		cog.setGrossProfit1(null == manageCost.getGrossProfit1() ? new BigDecimal(0) : manageCost.getGrossProfit1());
+		cog.setGrossProfit2(null == manageCost.getGrossProfit2() ? new BigDecimal(0) : manageCost.getGrossProfit2());
+		cog.setGrossProfit3(null == manageCost.getGrossProfit3() ? new BigDecimal(0) : manageCost.getGrossProfit3());
 		
 		CognizanceCatagoryBo catagory = orgCognizanceService.selectCognizanceCatagoryBoByUid(uid);
 		cog.setFirstCatagory(null == catagory.getFirstCatagory() ? 0 : catagory.getFirstCatagory());
 		cog.setSecondCatagory(null == catagory.getSecondCatagory() ? 0 : catagory.getSecondCatagory());
 		cog.setFirmTotal(null == catagory.getFirmTotal() ? 0 : catagory.getFirmTotal());
 		cog.setTechTotal(null == catagory.getTechTotal() ? 0 : catagory.getTechTotal());
-		cog.setTotalRevenue(null == catagory.getTotalRevenue() ? 0 : catagory.getTotalRevenue());
+		cog.setTotalRevenue(null == catagory.getTotalRevenue() ? new BigDecimal(0) : catagory.getTotalRevenue());
 		
 		cog.setLastYearRevenue(orgCognizanceService.selectLastYearRevenueByUid(uid));
 		return cog;

+ 9 - 0
src/main/java/com/goafanti/common/dao/OrgAnnualReportMapper.java

@@ -1,8 +1,11 @@
 package com.goafanti.common.dao;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.goafanti.common.model.OrgAnnualReport;
+import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 
 public interface OrgAnnualReportMapper {
     int deleteByPrimaryKey(String id);
@@ -18,4 +21,10 @@ public interface OrgAnnualReportMapper {
     int updateByPrimaryKey(OrgAnnualReport record);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(String year, String uid);
+
+	BigDecimal selectAnnualReportTerritoryByYearAndUid(String year, String uid);
+
+	AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(String year, String uid);
 }

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

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import java.math.BigDecimal;
+
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.techservice.cognizance.bo.CognizanceCatagoryBo;
 import com.goafanti.techservice.cognizance.bo.CognizanceManageCostBo;
@@ -27,5 +29,5 @@ public interface OrgCognizanceMapper {
 
 	CognizanceCatagoryBo selectCognizanceCatagoryBoByUid(String uid);
 
-	Integer selectLastYearRevenueByUid(String uid);
+	BigDecimal selectLastYearRevenueByUid(String uid);
 }

+ 40 - 40
src/main/java/com/goafanti/common/mapper/OrgActivityCostMapper.xml

@@ -6,15 +6,15 @@
     <result column="aid" property="aid" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="activity_number" property="activityNumber" jdbcType="VARCHAR" />
-    <result column="internal_labor_cost" property="internalLaborCost" jdbcType="INTEGER" />
-    <result column="internal_direct_cost" property="internalDirectCost" jdbcType="INTEGER" />
-    <result column="internal_depreciation_cost" property="internalDepreciationCost" jdbcType="INTEGER" />
-    <result column="internal_amortization_cost" property="internalAmortizationCost" jdbcType="INTEGER" />
-    <result column="internal_design_cost" property="internalDesignCost" jdbcType="INTEGER" />
-    <result column="internal_equipment_cost" property="internalEquipmentCost" jdbcType="INTEGER" />
-    <result column="internal_other_cost" property="internalOtherCost" jdbcType="INTEGER" />
-    <result column="external_total_cost" property="externalTotalCost" jdbcType="INTEGER" />
-    <result column="external_abroad_cost" property="externalAbroadCost" jdbcType="INTEGER" />
+    <result column="internal_labor_cost" property="internalLaborCost" jdbcType="DECIMAL" />
+    <result column="internal_direct_cost" property="internalDirectCost" jdbcType="DECIMAL" />
+    <result column="internal_depreciation_cost" property="internalDepreciationCost" jdbcType="DECIMAL" />
+    <result column="internal_amortization_cost" property="internalAmortizationCost" jdbcType="DECIMAL" />
+    <result column="internal_design_cost" property="internalDesignCost" jdbcType="DECIMAL" />
+    <result column="internal_equipment_cost" property="internalEquipmentCost" jdbcType="DECIMAL" />
+    <result column="internal_other_cost" property="internalOtherCost" jdbcType="DECIMAL" />
+    <result column="external_total_cost" property="externalTotalCost" jdbcType="DECIMAL" />
+    <result column="external_abroad_cost" property="externalAbroadCost" jdbcType="DECIMAL" />
     <result column="enterprise_filler" property="enterpriseFiller" jdbcType="VARCHAR" />
     <result column="sign_date" property="signDate" jdbcType="TIMESTAMP" />
     <result column="sort_number" property="sortNumber" jdbcType="VARCHAR" />
@@ -49,10 +49,10 @@
       start_date, end_date, account_url, deleted_sign
       )
     values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
-      #{activityNumber,jdbcType=VARCHAR}, #{internalLaborCost,jdbcType=INTEGER}, #{internalDirectCost,jdbcType=INTEGER}, 
-      #{internalDepreciationCost,jdbcType=INTEGER}, #{internalAmortizationCost,jdbcType=INTEGER}, 
-      #{internalDesignCost,jdbcType=INTEGER}, #{internalEquipmentCost,jdbcType=INTEGER}, 
-      #{internalOtherCost,jdbcType=INTEGER}, #{externalTotalCost,jdbcType=INTEGER}, #{externalAbroadCost,jdbcType=INTEGER}, 
+      #{activityNumber,jdbcType=VARCHAR}, #{internalLaborCost,jdbcType=DECIMAL}, #{internalDirectCost,jdbcType=DECIMAL}, 
+      #{internalDepreciationCost,jdbcType=DECIMAL}, #{internalAmortizationCost,jdbcType=DECIMAL}, 
+      #{internalDesignCost,jdbcType=DECIMAL}, #{internalEquipmentCost,jdbcType=DECIMAL}, 
+      #{internalOtherCost,jdbcType=DECIMAL}, #{externalTotalCost,jdbcType=DECIMAL}, #{externalAbroadCost,jdbcType=DECIMAL}, 
       #{enterpriseFiller,jdbcType=VARCHAR}, #{signDate,jdbcType=TIMESTAMP}, #{sortNumber,jdbcType=VARCHAR}, 
       #{startDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{accountUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}
       )
@@ -135,31 +135,31 @@
         #{activityNumber,jdbcType=VARCHAR},
       </if>
       <if test="internalLaborCost != null" >
-        #{internalLaborCost,jdbcType=INTEGER},
+        #{internalLaborCost,jdbcType=DECIMAL},
       </if>
       <if test="internalDirectCost != null" >
-        #{internalDirectCost,jdbcType=INTEGER},
+        #{internalDirectCost,jdbcType=DECIMAL},
       </if>
       <if test="internalDepreciationCost != null" >
-        #{internalDepreciationCost,jdbcType=INTEGER},
+        #{internalDepreciationCost,jdbcType=DECIMAL},
       </if>
       <if test="internalAmortizationCost != null" >
-        #{internalAmortizationCost,jdbcType=INTEGER},
+        #{internalAmortizationCost,jdbcType=DECIMAL},
       </if>
       <if test="internalDesignCost != null" >
-        #{internalDesignCost,jdbcType=INTEGER},
+        #{internalDesignCost,jdbcType=DECIMAL},
       </if>
       <if test="internalEquipmentCost != null" >
-        #{internalEquipmentCost,jdbcType=INTEGER},
+        #{internalEquipmentCost,jdbcType=DECIMAL},
       </if>
       <if test="internalOtherCost != null" >
-        #{internalOtherCost,jdbcType=INTEGER},
+        #{internalOtherCost,jdbcType=DECIMAL},
       </if>
       <if test="externalTotalCost != null" >
-        #{externalTotalCost,jdbcType=INTEGER},
+        #{externalTotalCost,jdbcType=DECIMAL},
       </if>
       <if test="externalAbroadCost != null" >
-        #{externalAbroadCost,jdbcType=INTEGER},
+        #{externalAbroadCost,jdbcType=DECIMAL},
       </if>
       <if test="enterpriseFiller != null" >
         #{enterpriseFiller,jdbcType=VARCHAR},
@@ -197,31 +197,31 @@
         activity_number = #{activityNumber,jdbcType=VARCHAR},
       </if>
       <if test="internalLaborCost != null" >
-        internal_labor_cost = #{internalLaborCost,jdbcType=INTEGER},
+        internal_labor_cost = #{internalLaborCost,jdbcType=DECIMAL},
       </if>
       <if test="internalDirectCost != null" >
-        internal_direct_cost = #{internalDirectCost,jdbcType=INTEGER},
+        internal_direct_cost = #{internalDirectCost,jdbcType=DECIMAL},
       </if>
       <if test="internalDepreciationCost != null" >
-        internal_depreciation_cost = #{internalDepreciationCost,jdbcType=INTEGER},
+        internal_depreciation_cost = #{internalDepreciationCost,jdbcType=DECIMAL},
       </if>
       <if test="internalAmortizationCost != null" >
-        internal_amortization_cost = #{internalAmortizationCost,jdbcType=INTEGER},
+        internal_amortization_cost = #{internalAmortizationCost,jdbcType=DECIMAL},
       </if>
       <if test="internalDesignCost != null" >
-        internal_design_cost = #{internalDesignCost,jdbcType=INTEGER},
+        internal_design_cost = #{internalDesignCost,jdbcType=DECIMAL},
       </if>
       <if test="internalEquipmentCost != null" >
-        internal_equipment_cost = #{internalEquipmentCost,jdbcType=INTEGER},
+        internal_equipment_cost = #{internalEquipmentCost,jdbcType=DECIMAL},
       </if>
       <if test="internalOtherCost != null" >
-        internal_other_cost = #{internalOtherCost,jdbcType=INTEGER},
+        internal_other_cost = #{internalOtherCost,jdbcType=DECIMAL},
       </if>
       <if test="externalTotalCost != null" >
-        external_total_cost = #{externalTotalCost,jdbcType=INTEGER},
+        external_total_cost = #{externalTotalCost,jdbcType=DECIMAL},
       </if>
       <if test="externalAbroadCost != null" >
-        external_abroad_cost = #{externalAbroadCost,jdbcType=INTEGER},
+        external_abroad_cost = #{externalAbroadCost,jdbcType=DECIMAL},
       </if>
       <if test="enterpriseFiller != null" >
         enterprise_filler = #{enterpriseFiller,jdbcType=VARCHAR},
@@ -252,15 +252,15 @@
     set aid = #{aid,jdbcType=VARCHAR},
       uid = #{uid,jdbcType=VARCHAR},
       activity_number = #{activityNumber,jdbcType=VARCHAR},
-      internal_labor_cost = #{internalLaborCost,jdbcType=INTEGER},
-      internal_direct_cost = #{internalDirectCost,jdbcType=INTEGER},
-      internal_depreciation_cost = #{internalDepreciationCost,jdbcType=INTEGER},
-      internal_amortization_cost = #{internalAmortizationCost,jdbcType=INTEGER},
-      internal_design_cost = #{internalDesignCost,jdbcType=INTEGER},
-      internal_equipment_cost = #{internalEquipmentCost,jdbcType=INTEGER},
-      internal_other_cost = #{internalOtherCost,jdbcType=INTEGER},
-      external_total_cost = #{externalTotalCost,jdbcType=INTEGER},
-      external_abroad_cost = #{externalAbroadCost,jdbcType=INTEGER},
+      internal_labor_cost = #{internalLaborCost,jdbcType=DECIMAL},
+      internal_direct_cost = #{internalDirectCost,jdbcType=DECIMAL},
+      internal_depreciation_cost = #{internalDepreciationCost,jdbcType=DECIMAL},
+      internal_amortization_cost = #{internalAmortizationCost,jdbcType=DECIMAL},
+      internal_design_cost = #{internalDesignCost,jdbcType=DECIMAL},
+      internal_equipment_cost = #{internalEquipmentCost,jdbcType=DECIMAL},
+      internal_other_cost = #{internalOtherCost,jdbcType=DECIMAL},
+      external_total_cost = #{externalTotalCost,jdbcType=DECIMAL},
+      external_abroad_cost = #{externalAbroadCost,jdbcType=DECIMAL},
       enterprise_filler = #{enterpriseFiller,jdbcType=VARCHAR},
       sign_date = #{signDate,jdbcType=TIMESTAMP},
       sort_number = #{sortNumber,jdbcType=VARCHAR},

+ 18 - 18
src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml

@@ -15,10 +15,10 @@
     <result column="technical_field3" property="technicalField3" jdbcType="VARCHAR" />
     <result column="technical_source" property="technicalSource" jdbcType="INTEGER" />
     <result column="intellectual_property_number" property="intellectualPropertyNumber" jdbcType="VARCHAR" />
-    <result column="budget" property="budget" jdbcType="INTEGER" />
-    <result column="first_year_expenditure" property="firstYearExpenditure" jdbcType="INTEGER" />
-    <result column="second_year_expenditure" property="secondYearExpenditure" jdbcType="INTEGER" />
-    <result column="third_year_expenditure" property="thirdYearExpenditure" jdbcType="INTEGER" />
+    <result column="budget" property="budget" jdbcType="DECIMAL" />
+    <result column="first_year_expenditure" property="firstYearExpenditure" jdbcType="DECIMAL" />
+    <result column="second_year_expenditure" property="secondYearExpenditure" jdbcType="DECIMAL" />
+    <result column="third_year_expenditure" property="thirdYearExpenditure" jdbcType="DECIMAL" />
     <result column="implement" property="implement" jdbcType="VARCHAR" />
     <result column="technology_innovation" property="technologyInnovation" jdbcType="VARCHAR" />
     <result column="achievement" property="achievement" jdbcType="VARCHAR" />
@@ -54,8 +54,8 @@
       #{activityName,jdbcType=VARCHAR}, #{startDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, #{participant,jdbcType=VARCHAR},
       #{projectMode,jdbcType=INTEGER}, #{technicalField1,jdbcType=VARCHAR}, #{technicalField2,jdbcType=VARCHAR}, #{technicalField3,jdbcType=VARCHAR}, 
       #{technicalSource,jdbcType=INTEGER}, #{intellectualPropertyNumber,jdbcType=VARCHAR}, 
-      #{budget,jdbcType=INTEGER}, #{firstYearExpenditure,jdbcType=INTEGER}, #{secondYearExpenditure,jdbcType=INTEGER}, 
-      #{thirdYearExpenditure,jdbcType=INTEGER}, #{implement,jdbcType=VARCHAR}, #{technologyInnovation,jdbcType=VARCHAR}, 
+      #{budget,jdbcType=DECIMAL}, #{firstYearExpenditure,jdbcType=DECIMAL}, #{secondYearExpenditure,jdbcType=DECIMAL}, 
+      #{thirdYearExpenditure,jdbcType=DECIMAL}, #{implement,jdbcType=VARCHAR}, #{technologyInnovation,jdbcType=VARCHAR}, 
       #{achievement,jdbcType=VARCHAR}, #{proofUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}
       )
   </insert>
@@ -170,16 +170,16 @@
         #{intellectualPropertyNumber,jdbcType=VARCHAR},
       </if>
       <if test="budget != null" >
-        #{budget,jdbcType=INTEGER},
+        #{budget,jdbcType=DECIMAL},
       </if>
       <if test="firstYearExpenditure != null" >
-        #{firstYearExpenditure,jdbcType=INTEGER},
+        #{firstYearExpenditure,jdbcType=DECIMAL},
       </if>
       <if test="secondYearExpenditure != null" >
-        #{secondYearExpenditure,jdbcType=INTEGER},
+        #{secondYearExpenditure,jdbcType=DECIMAL},
       </if>
       <if test="thirdYearExpenditure != null" >
-        #{thirdYearExpenditure,jdbcType=INTEGER},
+        #{thirdYearExpenditure,jdbcType=DECIMAL},
       </if>
       <if test="implement != null" >
         #{implement,jdbcType=VARCHAR},
@@ -238,16 +238,16 @@
         intellectual_property_number = #{intellectualPropertyNumber,jdbcType=VARCHAR},
       </if>
       <if test="budget != null" >
-        budget = #{budget,jdbcType=INTEGER},
+        budget = #{budget,jdbcType=DECIMAL},
       </if>
       <if test="firstYearExpenditure != null" >
-        first_year_expenditure = #{firstYearExpenditure,jdbcType=INTEGER},
+        first_year_expenditure = #{firstYearExpenditure,jdbcType=DECIMAL},
       </if>
       <if test="secondYearExpenditure != null" >
-        second_year_expenditure = #{secondYearExpenditure,jdbcType=INTEGER},
+        second_year_expenditure = #{secondYearExpenditure,jdbcType=DECIMAL},
       </if>
       <if test="thirdYearExpenditure != null" >
-        third_year_expenditure = #{thirdYearExpenditure,jdbcType=INTEGER},
+        third_year_expenditure = #{thirdYearExpenditure,jdbcType=DECIMAL},
       </if>
       <if test="implement != null" >
         implement = #{implement,jdbcType=VARCHAR},
@@ -281,10 +281,10 @@
       technical_field3 = #{technicalField3,jdbcType=VARCHAR},
       technical_source = #{technicalSource,jdbcType=INTEGER},
       intellectual_property_number = #{intellectualPropertyNumber,jdbcType=VARCHAR},
-      budget = #{budget,jdbcType=INTEGER},
-      first_year_expenditure = #{firstYearExpenditure,jdbcType=INTEGER},
-      second_year_expenditure = #{secondYearExpenditure,jdbcType=INTEGER},
-      third_year_expenditure = #{thirdYearExpenditure,jdbcType=INTEGER},
+      budget = #{budget,jdbcType=DECIMAL},
+      first_year_expenditure = #{firstYearExpenditure,jdbcType=DECIMAL},
+      second_year_expenditure = #{secondYearExpenditure,jdbcType=DECIMAL},
+      third_year_expenditure = #{thirdYearExpenditure,jdbcType=DECIMAL},
       implement = #{implement,jdbcType=VARCHAR},
       technology_innovation = #{technologyInnovation,jdbcType=VARCHAR},
       achievement = #{achievement,jdbcType=VARCHAR},

+ 157 - 3
src/main/java/com/goafanti/common/mapper/OrgAnnualReportMapper.xml

@@ -9,12 +9,13 @@
     <result column="total_tax" property="totalTax" jdbcType="DECIMAL" />
     <result column="income_tax_relief" property="incomeTaxRelief" jdbcType="DECIMAL" />
     <result column="total_export_volume" property="totalExportVolume" jdbcType="DECIMAL" />
+    <result column="basic_research_cost" property="basicResearchCost" jdbcType="DECIMAL" />
     <result column="year" property="year" jdbcType="INTEGER" />
     <result column="state" property="state" jdbcType="INTEGER" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, uid, create_time, last_update_time, total_tax, income_tax_relief, total_export_volume, 
+    id, uid, create_time, last_update_time, total_tax, income_tax_relief, total_export_volume, basic_research_cost,
     year, state, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -30,11 +31,12 @@
   <insert id="insert" parameterType="com.goafanti.common.model.OrgAnnualReport" >
     insert into org_annual_report (id, uid, create_time, 
       last_update_time, total_tax, income_tax_relief, 
-      total_export_volume, year, state, 
+      total_export_volume, basic_research_cost, year, state, 
       deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{lastUpdateTime,jdbcType=TIMESTAMP}, #{totalTax,jdbcType=DECIMAL}, #{incomeTaxRelief,jdbcType=DECIMAL}, 
-      #{totalExportVolume,jdbcType=DECIMAL}, #{year,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
+      #{totalExportVolume,jdbcType=DECIMAL}, #{basicResearchCost,jdbcType=DECIMAL},
+      #{year,jdbcType=INTEGER}, #{state,jdbcType=INTEGER}, 
       #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgAnnualReport" >
@@ -61,6 +63,9 @@
       <if test="totalExportVolume != null" >
         total_export_volume,
       </if>
+      <if test="basicResearchCost != null">
+      	basic_research_cost
+      </if>
       <if test="year != null" >
         year,
       </if>
@@ -93,6 +98,9 @@
       <if test="totalExportVolume != null" >
         #{totalExportVolume,jdbcType=DECIMAL},
       </if>
+      <if test="basicResearchCost != null">
+      	#{basicResearchCost,jdbcType=DECIMAL},
+      </if>
       <if test="year != null" >
         #{year,jdbcType=INTEGER},
       </if>
@@ -125,6 +133,9 @@
       <if test="totalExportVolume != null" >
         total_export_volume = #{totalExportVolume,jdbcType=DECIMAL},
       </if>
+      <if test="basicResearchCost != null" >
+        basic_research_cost = #{basicResearchCost,jdbcType=DECIMAL},
+      </if>
       <if test="year != null" >
         year = #{year,jdbcType=INTEGER},
       </if>
@@ -145,6 +156,7 @@
       total_tax = #{totalTax,jdbcType=DECIMAL},
       income_tax_relief = #{incomeTaxRelief,jdbcType=DECIMAL},
       total_export_volume = #{totalExportVolume,jdbcType=DECIMAL},
+      basic_research_cost = #{basicResearchCost,jdbcType=DECIMAL},
       year = #{year,jdbcType=INTEGER},
       state = #{state,jdbcType=INTEGER},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
@@ -194,4 +206,146 @@
 			#{item}
 		</foreach>
   </update>
+  
+  <select id="selectAnnualReportPropertyRightBoByYearAndUid" resultType="com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo">
+  	select u.id as uid, a.utilityPatent, b.exteriorPatent, c.softwareWorks, d.defensePatent, e.newPlantCariety, f.nationalCrop,
+g.nationalDrug, h.chineseMedicine, i.circuitDesign, j.inventionPatent from 
+(
+select id from user where id = #{1}
+) u LEFT JOIN
+
+(
+	select uid, count(1) as utilityPatent 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 2 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) a on a.uid = u.id  
+LEFT JOIN
+(
+select uid, count(1) as exteriorPatent 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 3 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) b on u.id = b.uid 
+LEFT JOIN
+(
+	select uid, count(1) as softwareWorks 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 4 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) c on u.id = c.uid  
+LEFT JOIN
+(
+select uid, count(1) as defensePatent 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 5 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) d on u.id = d.uid 
+LEFT JOIN
+(
+	select uid, count(1) as newPlantCariety 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 6 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) e on u.id = e.uid  
+LEFT JOIN
+(
+select uid, count(1) as nationalCrop 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 7 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) f on u.id = f.uid 
+LEFT JOIN
+(
+	select uid, count(1) as nationalDrug 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 8 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) g on u.id = g.uid  
+LEFT JOIN
+(
+select uid, count(1) as chineseMedicine 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 9 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) h on u.id = h.uid 
+LEFT JOIN
+(
+	select uid, count(1) as circuitDesign 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 10 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) i on u.id = i.uid  
+LEFT JOIN
+(
+select uid, count(1) as inventionPatent 
+	from org_intellectual_property 
+	where uid = #{1} and catagory = 11 and authorization_date 
+		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
+	and deleted_sign = 0
+) j on u.id = j.uid 
+  </select>
+  
+  <select id="selectAnnualReportTerritoryByYearAndUid" resultType="java.math.BigDecimal">
+  	select   sum(m.territory) as territory from(
+			select uid,  
+			external_abroad_cost as territory
+			 from org_activity_cost 
+       where uid = #{1} and 
+     (start_date >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+      and start_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H')  )
+			or (end_date  >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H') )
+      and end_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H') ) ))
+      and deleted_sign = 0
+		) m
+  </select>
+  
+  <select id="selectAnnualReportMainBoByYearAndUid" resultType="com.goafanti.techservice.cognizance.bo.AnnualReportMainBo">
+		  select u.id as uid, o.unit_name as unitName, o.org_code as orgCode, o.location_province as locationProvince,
+			o.location_city as locationCity, o.location_area as locationArea, o.listed, o.listed_date as listedDate, 
+			o.listed_type as listedType, o.stock_code as stockCode, h.firm_total as firmTotal, h.tech_total as techTotal,
+			h.new_employment as newEmployment, h.graduate_number as graduateNumber,
+			a.total_tax as totalTax, a.income_tax_relief as incomeTaxRelief, a.total_export_volume as totalExportVolume,
+			f.sales_revenue as salesRevenue, f.gross_profit as grossProfit, f.net_asset as netAsset, 
+			c.certificate_number as certificateNumber, c.issuing_date as issuingDate, c.contacts, r.research_cost as researchCost,
+			x.totalRevenue, y.lastYearRevenue from 
+			  (select id from user where id = #{1}) u
+			LEFT JOIN organization_identity o
+			on u.id = o.uid  AND o.audit_status = 5  
+			LEFT JOIN org_human_resource h on h.uid = u.id  AND h.year = #{0} AND h.deleted_sign = 0
+			LEFT JOIN org_annual_report a on a.uid = u.id  AND a.year = #{0}  AND a.deleted_sign = 0
+			LEFT JOIN org_finance f on f.uid = u.id  AND f.year = #{0}  AND f.deleted_sign = 0
+			LEFT JOIN org_cognizance c on c.uid = u.id  AND c.year = #{0} AND c.deleted_sign = 0
+			LEFT JOIN org_ratepay r on r.uid = u.id  AND r.year = #{0} AND r.deleted_sign = 0
+			LEFT JOIN
+			     (SELECT uid,(operating_income + non_operating_income - non_taxable_income) as totalRevenue
+							from org_ratepay where uid = #{1}
+							and year = #{0} and deleted_sign = 0) 
+			      x on x.uid = u.id 
+			LEFT JOIN 
+			     (
+			       SELECT uid, sum(last_year_revenue) as lastYearRevenue
+						from org_tech_product where uid = #{1}
+						and year = #{0} and deleted_sign = 0
+			      )   y on y.uid = u.id 
+  </select>
 </mapper>

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

@@ -11,7 +11,7 @@
     <result column="technical_field1" property="technicalField1" jdbcType="INTEGER" />
     <result column="technical_field2" property="technicalField2" jdbcType="INTEGER" />
     <result column="technical_field3" property="technicalField3" jdbcType="INTEGER" />
-    <result column="basic_research_cost" property="basicResearchCost" jdbcType="INTEGER" />
+    <result column="basic_research_cost" property="basicResearchCost" jdbcType="DECIMAL" />
     <result column="accident" property="accident" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="accept_date" property="acceptDate" jdbcType="TIMESTAMP" />
@@ -48,7 +48,7 @@
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, 
       #{contacts,jdbcType=VARCHAR}, #{comment,jdbcType=VARCHAR}, #{consultant,jdbcType=VARCHAR}, 
       #{technicalField1,jdbcType=INTEGER}, #{technicalField2,jdbcType=INTEGER}, #{technicalField3,jdbcType=INTEGER}, 
-      #{basicResearchCost,jdbcType=INTEGER}, #{accident,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{basicResearchCost,jdbcType=DECIMAL}, #{accident,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{acceptDate,jdbcType=TIMESTAMP}, #{issuingDate,jdbcType=TIMESTAMP}, #{certificateNumber,jdbcType=VARCHAR}, 
       #{certificateUrl,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER}
       )
@@ -143,7 +143,7 @@
         #{technicalField3,jdbcType=INTEGER},
       </if>
       <if test="basicResearchCost != null" >
-        #{basicResearchCost,jdbcType=INTEGER},
+        #{basicResearchCost,jdbcType=DECIMAL},
       </if>
       <if test="accident != null" >
         #{accident,jdbcType=INTEGER},
@@ -202,7 +202,7 @@
         technical_field3 = #{technicalField3,jdbcType=INTEGER},
       </if>
       <if test="basicResearchCost != null" >
-        basic_research_cost = #{basicResearchCost,jdbcType=INTEGER},
+        basic_research_cost = #{basicResearchCost,jdbcType=DECIMAL},
       </if>
       <if test="accident != null" >
         accident = #{accident,jdbcType=INTEGER},
@@ -244,7 +244,7 @@
       technical_field1 = #{technicalField1,jdbcType=INTEGER},
       technical_field2 = #{technicalField2,jdbcType=INTEGER},
       technical_field3 = #{technicalField3,jdbcType=INTEGER},
-      basic_research_cost = #{basicResearchCost,jdbcType=INTEGER},
+      basic_research_cost = #{basicResearchCost,jdbcType=DECIMAL},
       accident = #{accident,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       accept_date = #{acceptDate,jdbcType=TIMESTAMP},
@@ -325,10 +325,16 @@
 			select uid, (internal_labor_cost + internal_direct_cost + internal_depreciation_cost + internal_amortization_cost 
 			+ internal_design_cost + internal_equipment_cost + internal_other_cost +external_total_cost) as cost1, 
 			external_abroad_cost as territory
-			 from org_activity_cost where uid = #{uid,jdbcType=VARCHAR} and start_date >= (select  str_to_date(CONCAT(year,day), '%Y-%m-%d %H')  from (
+			 from org_activity_cost 
+    where uid = #{uid,jdbcType=VARCHAR} and (start_date >= (select  str_to_date(CONCAT(year,day), '%Y-%m-%d %H')  from (
 			SELECT (DATE_FORMAT(NOW(), '%Y')-3) as year ,'-01-01' as day FROM DUAL) x)
-			or end_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(year,day), '%Y-%m-%d %H')  from (
-			SELECT DATE_FORMAT(NOW(), '%Y') as year ,'-01-01' as day FROM DUAL) y) and deleted_sign = 0
+      and start_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(year,day), '%Y-%m-%d %H')  from (
+			SELECT DATE_FORMAT(NOW(), '%Y') as year ,'-01-01' as day FROM DUAL) z) )
+			or (end_date <![CDATA[ < ]]> (select  str_to_date(CONCAT(year,day), '%Y-%m-%d %H')  from (
+			SELECT DATE_FORMAT(NOW(), '%Y') as year ,'-01-01' as day FROM DUAL) y)  and 
+      end_date >= (select  str_to_date(CONCAT(year,day), '%Y-%m-%d %H')  from (
+			SELECT (DATE_FORMAT(NOW(), '%Y')-3) as year ,'-01-01' as day FROM DUAL) k))
+      and deleted_sign = 0
 		) m
 	</select>
 	
@@ -376,7 +382,7 @@
 			) z on z.uid = x.uid
 	</select>
 	
-	<select id="selectLastYearRevenueByUid" parameterType="java.lang.String" resultType="Integer">
+	<select id="selectLastYearRevenueByUid" parameterType="java.lang.String" resultType="java.math.BigDecimal">
 		SELECT sum(last_year_revenue) as lastYearRevenue
 			from org_tech_product where uid = #{uid,jdbcType=VARCHAR}
 			and year = (SELECT (DATE_FORMAT(NOW(), '%Y')-1)  FROM DUAL) and deleted_sign = 0

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

@@ -4,17 +4,17 @@
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgFinance" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="main_business_income" property="mainBusinessIncome" jdbcType="INTEGER" />
-    <result column="management_cost" property="managementCost" jdbcType="INTEGER" />
-    <result column="operating_profit" property="operatingProfit" jdbcType="INTEGER" />
-    <result column="various_tax" property="variousTax" jdbcType="INTEGER" />
-    <result column="current_asset" property="currentAsset" jdbcType="INTEGER" />
-    <result column="net_fixed_asset" property="netFixedAsset" jdbcType="INTEGER" />
-    <result column="total_asset" property="totalAsset" jdbcType="INTEGER" />
-    <result column="net_asset" property="netAsset" jdbcType="INTEGER" />
-    <result column="gross_profit" property="grossProfit" jdbcType="INTEGER" />
-    <result column="net_profit" property="netProfit" jdbcType="INTEGER" />
-    <result column="sales_revenue" property="salesRevenue" jdbcType="INTEGER" />
+    <result column="main_business_income" property="mainBusinessIncome" jdbcType="DECIMAL" />
+    <result column="management_cost" property="managementCost" jdbcType="DECIMAL" />
+    <result column="operating_profit" property="operatingProfit" jdbcType="DECIMAL" />
+    <result column="various_tax" property="variousTax" jdbcType="DECIMAL" />
+    <result column="current_asset" property="currentAsset" jdbcType="DECIMAL" />
+    <result column="net_fixed_asset" property="netFixedAsset" jdbcType="DECIMAL" />
+    <result column="total_asset" property="totalAsset" jdbcType="DECIMAL" />
+    <result column="net_asset" property="netAsset" jdbcType="DECIMAL" />
+    <result column="gross_profit" property="grossProfit" jdbcType="DECIMAL" />
+    <result column="net_profit" property="netProfit" jdbcType="DECIMAL" />
+    <result column="sales_revenue" property="salesRevenue" jdbcType="DECIMAL" />
     <result column="year" property="year" jdbcType="INTEGER" />
     <result column="finance_url" property="financeUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
@@ -40,11 +40,11 @@
       current_asset, net_fixed_asset, total_asset, 
       net_asset, gross_profit, net_profit, 
       sales_revenue, year, finance_url, deleted_sign)
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{mainBusinessIncome,jdbcType=INTEGER}, 
-      #{managementCost,jdbcType=INTEGER}, #{operatingProfit,jdbcType=INTEGER}, #{variousTax,jdbcType=INTEGER}, 
-      #{currentAsset,jdbcType=INTEGER}, #{netFixedAsset,jdbcType=INTEGER}, #{totalAsset,jdbcType=INTEGER}, 
-      #{netAsset,jdbcType=INTEGER}, #{grossProfit,jdbcType=INTEGER}, #{netProfit,jdbcType=INTEGER}, 
-      #{salesRevenue,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, #{financeUrl,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{mainBusinessIncome,jdbcType=DECIMAL}, 
+      #{managementCost,jdbcType=DECIMAL}, #{operatingProfit,jdbcType=DECIMAL}, #{variousTax,jdbcType=DECIMAL}, 
+      #{currentAsset,jdbcType=DECIMAL}, #{netFixedAsset,jdbcType=DECIMAL}, #{totalAsset,jdbcType=DECIMAL}, 
+      #{netAsset,jdbcType=DECIMAL}, #{grossProfit,jdbcType=DECIMAL}, #{netProfit,jdbcType=DECIMAL}, 
+      #{salesRevenue,jdbcType=DECIMAL}, #{year,jdbcType=INTEGER}, #{financeUrl,jdbcType=VARCHAR}, 
       #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgFinance" >
@@ -107,37 +107,37 @@
         #{uid,jdbcType=VARCHAR},
       </if>
       <if test="mainBusinessIncome != null" >
-        #{mainBusinessIncome,jdbcType=INTEGER},
+        #{mainBusinessIncome,jdbcType=DECIMAL},
       </if>
       <if test="managementCost != null" >
-        #{managementCost,jdbcType=INTEGER},
+        #{managementCost,jdbcType=DECIMAL},
       </if>
       <if test="operatingProfit != null" >
-        #{operatingProfit,jdbcType=INTEGER},
+        #{operatingProfit,jdbcType=DECIMAL},
       </if>
       <if test="variousTax != null" >
-        #{variousTax,jdbcType=INTEGER},
+        #{variousTax,jdbcType=DECIMAL},
       </if>
       <if test="currentAsset != null" >
-        #{currentAsset,jdbcType=INTEGER},
+        #{currentAsset,jdbcType=DECIMAL},
       </if>
       <if test="netFixedAsset != null" >
-        #{netFixedAsset,jdbcType=INTEGER},
+        #{netFixedAsset,jdbcType=DECIMAL},
       </if>
       <if test="totalAsset != null" >
-        #{totalAsset,jdbcType=INTEGER},
+        #{totalAsset,jdbcType=DECIMAL},
       </if>
       <if test="netAsset != null" >
-        #{netAsset,jdbcType=INTEGER},
+        #{netAsset,jdbcType=DECIMAL},
       </if>
       <if test="grossProfit != null" >
-        #{grossProfit,jdbcType=INTEGER},
+        #{grossProfit,jdbcType=DECIMAL},
       </if>
       <if test="netProfit != null" >
-        #{netProfit,jdbcType=INTEGER},
+        #{netProfit,jdbcType=DECIMAL},
       </if>
       <if test="salesRevenue != null" >
-        #{salesRevenue,jdbcType=INTEGER},
+        #{salesRevenue,jdbcType=DECIMAL},
       </if>
       <if test="year != null" >
         #{year,jdbcType=INTEGER},
@@ -157,37 +157,37 @@
         uid = #{uid,jdbcType=VARCHAR},
       </if>
       <if test="mainBusinessIncome != null" >
-        main_business_income = #{mainBusinessIncome,jdbcType=INTEGER},
+        main_business_income = #{mainBusinessIncome,jdbcType=DECIMAL},
       </if>
       <if test="managementCost != null" >
-        management_cost = #{managementCost,jdbcType=INTEGER},
+        management_cost = #{managementCost,jdbcType=DECIMAL},
       </if>
       <if test="operatingProfit != null" >
-        operating_profit = #{operatingProfit,jdbcType=INTEGER},
+        operating_profit = #{operatingProfit,jdbcType=DECIMAL},
       </if>
       <if test="variousTax != null" >
-        various_tax = #{variousTax,jdbcType=INTEGER},
+        various_tax = #{variousTax,jdbcType=DECIMAL},
       </if>
       <if test="currentAsset != null" >
-        current_asset = #{currentAsset,jdbcType=INTEGER},
+        current_asset = #{currentAsset,jdbcType=DECIMAL},
       </if>
       <if test="netFixedAsset != null" >
-        net_fixed_asset = #{netFixedAsset,jdbcType=INTEGER},
+        net_fixed_asset = #{netFixedAsset,jdbcType=DECIMAL},
       </if>
       <if test="totalAsset != null" >
-        total_asset = #{totalAsset,jdbcType=INTEGER},
+        total_asset = #{totalAsset,jdbcType=DECIMAL},
       </if>
       <if test="netAsset != null" >
-        net_asset = #{netAsset,jdbcType=INTEGER},
+        net_asset = #{netAsset,jdbcType=DECIMAL},
       </if>
       <if test="grossProfit != null" >
-        gross_profit = #{grossProfit,jdbcType=INTEGER},
+        gross_profit = #{grossProfit,jdbcType=DECIMAL},
       </if>
       <if test="netProfit != null" >
-        net_profit = #{netProfit,jdbcType=INTEGER},
+        net_profit = #{netProfit,jdbcType=DECIMAL},
       </if>
       <if test="salesRevenue != null" >
-        sales_revenue = #{salesRevenue,jdbcType=INTEGER},
+        sales_revenue = #{salesRevenue,jdbcType=DECIMAL},
       </if>
       <if test="year != null" >
         year = #{year,jdbcType=INTEGER},
@@ -205,16 +205,16 @@
     update org_finance
     set uid = #{uid,jdbcType=VARCHAR},
       main_business_income = #{mainBusinessIncome,jdbcType=INTEGER},
-      management_cost = #{managementCost,jdbcType=INTEGER},
-      operating_profit = #{operatingProfit,jdbcType=INTEGER},
-      various_tax = #{variousTax,jdbcType=INTEGER},
-      current_asset = #{currentAsset,jdbcType=INTEGER},
-      net_fixed_asset = #{netFixedAsset,jdbcType=INTEGER},
-      total_asset = #{totalAsset,jdbcType=INTEGER},
-      net_asset = #{netAsset,jdbcType=INTEGER},
-      gross_profit = #{grossProfit,jdbcType=INTEGER},
-      net_profit = #{netProfit,jdbcType=INTEGER},
-      sales_revenue = #{salesRevenue,jdbcType=INTEGER},
+      management_cost = #{managementCost,jdbcType=DECIMAL},
+      operating_profit = #{operatingProfit,jdbcType=DECIMAL},
+      various_tax = #{variousTax,jdbcType=DECIMAL},
+      current_asset = #{currentAsset,jdbcType=DECIMAL},
+      net_fixed_asset = #{netFixedAsset,jdbcType=DECIMAL},
+      total_asset = #{totalAsset,jdbcType=DECIMAL},
+      net_asset = #{netAsset,jdbcType=DECIMAL},
+      gross_profit = #{grossProfit,jdbcType=DECIMAL},
+      net_profit = #{netProfit,jdbcType=DECIMAL},
+      sales_revenue = #{salesRevenue,jdbcType=DECIMAL},
       year = #{year,jdbcType=INTEGER},
       finance_url = #{financeUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}

+ 40 - 40
src/main/java/com/goafanti/common/mapper/OrgRatepayMapper.xml

@@ -4,16 +4,16 @@
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgRatepay" >
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="operating_income" property="operatingIncome" jdbcType="INTEGER" />
-    <result column="management_cost" property="managementCost" jdbcType="INTEGER" />
-    <result column="operating_profit" property="operatingProfit" jdbcType="INTEGER" />
-    <result column="non_operating_income" property="nonOperatingIncome" jdbcType="INTEGER" />
-    <result column="non_taxable_income" property="nonTaxableIncome" jdbcType="INTEGER" />
-    <result column="tax_exempt_income" property="taxExemptIncome" jdbcType="INTEGER" />
-    <result column="subsidy_income" property="subsidyIncome" jdbcType="INTEGER" />
+    <result column="operating_income" property="operatingIncome" jdbcType="DECIMAL" />
+    <result column="management_cost" property="managementCost" jdbcType="DECIMAL" />
+    <result column="operating_profit" property="operatingProfit" jdbcType="DECIMAL" />
+    <result column="non_operating_income" property="nonOperatingIncome" jdbcType="DECIMAL" />
+    <result column="non_taxable_income" property="nonTaxableIncome" jdbcType="DECIMAL" />
+    <result column="tax_exempt_income" property="taxExemptIncome" jdbcType="DECIMAL" />
+    <result column="subsidy_income" property="subsidyIncome" jdbcType="DECIMAL" />
     <result column="year" property="year" jdbcType="INTEGER" />
-    <result column="gross_profit" property="grossProfit" jdbcType="INTEGER" />
-    <result column="research_cost" property="researchCost" jdbcType="INTEGER" />
+    <result column="gross_profit" property="grossProfit" jdbcType="DECIMAL" />
+    <result column="research_cost" property="researchCost" jdbcType="DECIMAL" />
     <result column="tax_return_url" property="taxReturnUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
@@ -36,10 +36,10 @@
       management_cost, operating_profit, non_operating_income, 
       non_taxable_income, tax_exempt_income, subsidy_income, year, gross_profit, research_cost,
       tax_return_url, deleted_sign)
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{operatingIncome,jdbcType=INTEGER}, 
-      #{managementCost,jdbcType=INTEGER}, #{operatingProfit,jdbcType=INTEGER}, #{nonOperatingIncome,jdbcType=INTEGER}, 
-      #{nonTaxableIncome,jdbcType=INTEGER}, #{taxExemptIncome,jdbcType=INTEGER}, #{subsidyIncome,jdbcType=INTEGER}, 
-      #{year,jdbcType=INTEGER}, #{grossProfit,jdbcType=INTEGER}, #{researchCost,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{operatingIncome,jdbcType=DECIMAL}, 
+      #{managementCost,jdbcType=DECIMAL}, #{operatingProfit,jdbcType=DECIMAL}, #{nonOperatingIncome,jdbcType=DECIMAL}, 
+      #{nonTaxableIncome,jdbcType=DECIMAL}, #{taxExemptIncome,jdbcType=DECIMAL}, #{subsidyIncome,jdbcType=DECIMAL}, 
+      #{year,jdbcType=INTEGER}, #{grossProfit,jdbcType=DECIMAL}, #{researchCost,jdbcType=DECIMAL}, 
       #{taxReturnUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgRatepay" >
@@ -96,34 +96,34 @@
         #{uid,jdbcType=VARCHAR},
       </if>
       <if test="operatingIncome != null" >
-        #{operatingIncome,jdbcType=INTEGER},
+        #{operatingIncome,jdbcType=DECIMAL},
       </if>
       <if test="managementCost != null" >
-        #{managementCost,jdbcType=INTEGER},
+        #{managementCost,jdbcType=DECIMAL},
       </if>
       <if test="operatingProfit != null" >
-        #{operatingProfit,jdbcType=INTEGER},
+        #{operatingProfit,jdbcType=DECIMAL},
       </if>
       <if test="nonOperatingIncome != null" >
-        #{nonOperatingIncome,jdbcType=INTEGER},
+        #{nonOperatingIncome,jdbcType=DECIMAL},
       </if>
       <if test="nonTaxableIncome != null" >
-        #{nonTaxableIncome,jdbcType=INTEGER},
+        #{nonTaxableIncome,jdbcType=DECIMAL},
       </if>
       <if test="taxExemptIncome != null" >
-        #{taxExemptIncome,jdbcType=INTEGER},
+        #{taxExemptIncome,jdbcType=DECIMAL},
       </if>
       <if test="subsidyIncome != null" >
-        #{subsidyIncome,jdbcType=INTEGER},
+        #{subsidyIncome,jdbcType=DECIMAL},
       </if>
       <if test="year != null" >
         #{year,jdbcType=INTEGER},
       </if>
       <if test="grossProfit != null" >
-        #{grossProfit,jdbcType=INTEGER},
+        #{grossProfit,jdbcType=DECIMAL},
       </if>
       <if test="researchCost != null" >
-        #{researchCost,jdbcType=INTEGER},
+        #{researchCost,jdbcType=DECIMAL},
       </if>
        <if test="taxReturnUrl != null" >
         #{taxReturnUrl,jdbcType=VARCHAR},
@@ -140,34 +140,34 @@
         uid = #{uid,jdbcType=VARCHAR},
       </if>
       <if test="operatingIncome != null" >
-        operating_income = #{operatingIncome,jdbcType=INTEGER},
+        operating_income = #{operatingIncome,jdbcType=DECIMAL},
       </if>
       <if test="managementCost != null" >
-        management_cost = #{managementCost,jdbcType=INTEGER},
+        management_cost = #{managementCost,jdbcType=DECIMAL},
       </if>
       <if test="operatingProfit != null" >
-        operating_profit = #{operatingProfit,jdbcType=INTEGER},
+        operating_profit = #{operatingProfit,jdbcType=DECIMAL},
       </if>
       <if test="nonOperatingIncome != null" >
-        non_operating_income = #{nonOperatingIncome,jdbcType=INTEGER},
+        non_operating_income = #{nonOperatingIncome,jdbcType=DECIMAL},
       </if>
       <if test="nonTaxableIncome != null" >
-        non_taxable_income = #{nonTaxableIncome,jdbcType=INTEGER},
+        non_taxable_income = #{nonTaxableIncome,jdbcType=DECIMAL},
       </if>
       <if test="taxExemptIncome != null" >
-        tax_exempt_income = #{taxExemptIncome,jdbcType=INTEGER},
+        tax_exempt_income = #{taxExemptIncome,jdbcType=DECIMAL},
       </if>
       <if test="subsidyIncome != null" >
-        subsidy_income = #{subsidyIncome,jdbcType=INTEGER},
+        subsidy_income = #{subsidyIncome,jdbcType=DECIMAL},
       </if>
       <if test="year != null" >
         year = #{year,jdbcType=INTEGER},
       </if>
        <if test="grossProfit != null" >
-        gross_profit = #{grossProfit,jdbcType=INTEGER},
+        gross_profit = #{grossProfit,jdbcType=DECIMAL},
       </if>
        <if test="researchCost != null" >
-        research_cost = #{researchCost,jdbcType=INTEGER},
+        research_cost = #{researchCost,jdbcType=DECIMAL},
       </if>
       <if test="taxReturnUrl != null" >
         tax_return_url = #{taxReturnUrl,jdbcType=VARCHAR},
@@ -181,16 +181,16 @@
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrgRatepay" >
     update org_ratepay
     set uid = #{uid,jdbcType=VARCHAR},
-      operating_income = #{operatingIncome,jdbcType=INTEGER},
-      management_cost = #{managementCost,jdbcType=INTEGER},
-      operating_profit = #{operatingProfit,jdbcType=INTEGER},
-      non_operating_income = #{nonOperatingIncome,jdbcType=INTEGER},
-      non_taxable_income = #{nonTaxableIncome,jdbcType=INTEGER},
-      tax_exempt_income = #{taxExemptIncome,jdbcType=INTEGER},
-      subsidy_income = #{subsidyIncome,jdbcType=INTEGER},
+      operating_income = #{operatingIncome,jdbcType=DECIMAL},
+      management_cost = #{managementCost,jdbcType=DECIMAL},
+      operating_profit = #{operatingProfit,jdbcType=DECIMAL},
+      non_operating_income = #{nonOperatingIncome,jdbcType=DECIMAL},
+      non_taxable_income = #{nonTaxableIncome,jdbcType=DECIMAL},
+      tax_exempt_income = #{taxExemptIncome,jdbcType=DECIMAL},
+      subsidy_income = #{subsidyIncome,jdbcType=DECIMAL},
       year = #{year,jdbcType=INTEGER},
-      gross_profit = #{grossProfit,jdbcType=INTEGER},
-      research_cost = #{researchCost,jdbcType=INTEGER},
+      gross_profit = #{grossProfit,jdbcType=DECIMAL},
+      research_cost = #{researchCost,jdbcType=DECIMAL},
       tax_return_url = #{taxReturnUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}

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

@@ -10,7 +10,7 @@
     <result column="technical_field2" property="technicalField2" jdbcType="INTEGER" />
     <result column="technical_field3" property="technicalField3" jdbcType="INTEGER" />
     <result column="technical_source" property="technicalSource" jdbcType="INTEGER" />
-    <result column="last_year_revenue" property="lastYearRevenue" jdbcType="VARCHAR" />
+    <result column="last_year_revenue" property="lastYearRevenue" jdbcType="DECIMAL" />
     <result column="main_product" property="mainProduct" jdbcType="INTEGER" />
     <result column="intellectual_property_number" property="intellectualPropertyNumber" jdbcType="VARCHAR" />
     <result column="key_technology" property="keyTechnology" jdbcType="VARCHAR" />
@@ -45,7 +45,7 @@
       year, create_time, account_url, deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{serialNumber,jdbcType=VARCHAR}, 
       #{productName,jdbcType=VARCHAR}, #{technicalField1,jdbcType=INTEGER}, #{technicalField2,jdbcType=INTEGER}, 
-      #{technicalField3,jdbcType=INTEGER}, #{technicalSource,jdbcType=INTEGER}, #{lastYearRevenue,jdbcType=VARCHAR}, 
+      #{technicalField3,jdbcType=INTEGER}, #{technicalSource,jdbcType=INTEGER}, #{lastYearRevenue,jdbcType=DECIMAL}, 
       #{mainProduct,jdbcType=INTEGER}, #{intellectualPropertyNumber,jdbcType=VARCHAR}, 
       #{keyTechnology,jdbcType=VARCHAR}, #{competitiveEdge,jdbcType=VARCHAR}, #{conditionEffect,jdbcType=VARCHAR}, 
       #{year,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{accountUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
@@ -134,7 +134,7 @@
         #{technicalSource,jdbcType=INTEGER},
       </if>
       <if test="lastYearRevenue != null" >
-        #{lastYearRevenue,jdbcType=VARCHAR},
+        #{lastYearRevenue,jdbcType=DECIMAL},
       </if>
       <if test="mainProduct != null" >
         #{mainProduct,jdbcType=INTEGER},
@@ -190,7 +190,7 @@
         technical_source = #{technicalSource,jdbcType=INTEGER},
       </if>
       <if test="lastYearRevenue != null" >
-        last_year_revenue = #{lastYearRevenue,jdbcType=VARCHAR},
+        last_year_revenue = #{lastYearRevenue,jdbcType=DECIMAL},
       </if>
       <if test="mainProduct != null" >
         main_product = #{mainProduct,jdbcType=INTEGER},
@@ -231,7 +231,7 @@
       technical_field2 = #{technicalField2,jdbcType=INTEGER},
       technical_field3 = #{technicalField3,jdbcType=INTEGER},
       technical_source = #{technicalSource,jdbcType=INTEGER},
-      last_year_revenue = #{lastYearRevenue,jdbcType=VARCHAR},
+      last_year_revenue = #{lastYearRevenue,jdbcType=DECIMAL},
       main_product = #{mainProduct,jdbcType=INTEGER},
       intellectual_property_number = #{intellectualPropertyNumber,jdbcType=VARCHAR},
       key_technology = #{keyTechnology,jdbcType=VARCHAR},

+ 38 - 36
src/main/java/com/goafanti/common/model/OrgActivity.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.model;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -69,22 +70,22 @@ public class OrgActivity {
     /**
     * 研发经费总预算(万元)
     */
-    private Integer budget;
+    private BigDecimal budget;
 
     /**
     * 第一年研发经费支出(万元)
     */
-    private Integer firstYearExpenditure;
+    private BigDecimal firstYearExpenditure;
 
     /**
     * 第二年研发经费支出(万元)
     */
-    private Integer secondYearExpenditure;
+    private BigDecimal secondYearExpenditure;
 
     /**
     * 第三年研发经费支出(万元)
     */
-    private Integer thirdYearExpenditure;
+    private BigDecimal thirdYearExpenditure;
 
     /**
     * 目的及组织实施方式
@@ -208,37 +209,6 @@ public class OrgActivity {
         this.intellectualPropertyNumber = intellectualPropertyNumber;
     }
 
-    public Integer getBudget() {
-        return budget;
-    }
-
-    public void setBudget(Integer budget) {
-        this.budget = budget;
-    }
-
-    public Integer getFirstYearExpenditure() {
-        return firstYearExpenditure;
-    }
-
-    public void setFirstYearExpenditure(Integer firstYearExpenditure) {
-        this.firstYearExpenditure = firstYearExpenditure;
-    }
-
-    public Integer getSecondYearExpenditure() {
-        return secondYearExpenditure;
-    }
-
-    public void setSecondYearExpenditure(Integer secondYearExpenditure) {
-        this.secondYearExpenditure = secondYearExpenditure;
-    }
-
-    public Integer getThirdYearExpenditure() {
-        return thirdYearExpenditure;
-    }
-
-    public void setThirdYearExpenditure(Integer thirdYearExpenditure) {
-        this.thirdYearExpenditure = thirdYearExpenditure;
-    }
 
     public String getImplement() {
         return implement;
@@ -266,7 +236,39 @@ public class OrgActivity {
     
     
     
-    public Integer getProjectMode() {
+    public BigDecimal getBudget() {
+		return budget;
+	}
+
+	public void setBudget(BigDecimal budget) {
+		this.budget = budget;
+	}
+
+	public BigDecimal getFirstYearExpenditure() {
+		return firstYearExpenditure;
+	}
+
+	public void setFirstYearExpenditure(BigDecimal firstYearExpenditure) {
+		this.firstYearExpenditure = firstYearExpenditure;
+	}
+
+	public BigDecimal getSecondYearExpenditure() {
+		return secondYearExpenditure;
+	}
+
+	public void setSecondYearExpenditure(BigDecimal secondYearExpenditure) {
+		this.secondYearExpenditure = secondYearExpenditure;
+	}
+
+	public BigDecimal getThirdYearExpenditure() {
+		return thirdYearExpenditure;
+	}
+
+	public void setThirdYearExpenditure(BigDecimal thirdYearExpenditure) {
+		this.thirdYearExpenditure = thirdYearExpenditure;
+	}
+
+	public Integer getProjectMode() {
 		return projectMode;
 	}
 

+ 67 - 64
src/main/java/com/goafanti/common/model/OrgActivityCost.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.model;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -21,47 +22,47 @@ public class OrgActivityCost {
     /**
     * 内部人员人工费用(万元)
     */
-    private Integer internalLaborCost;
+    private BigDecimal internalLaborCost;
 
     /**
     * 内部直接投入费用(万元)
     */
-    private Integer internalDirectCost;
+    private BigDecimal internalDirectCost;
 
     /**
     * 内部折旧费用与长期待摊费用(万元)
     */
-    private Integer internalDepreciationCost;
+    private BigDecimal internalDepreciationCost;
 
     /**
     * 内部无形资产摊销费用(万元)
     */
-    private Integer internalAmortizationCost;
+    private BigDecimal internalAmortizationCost;
 
     /**
     * 内部设计费用(万元)
     */
-    private Integer internalDesignCost;
+    private BigDecimal internalDesignCost;
 
     /**
     * 内部装备调试费用与实验费用(万元)
     */
-    private Integer internalEquipmentCost;
+    private BigDecimal internalEquipmentCost;
 
     /**
     * 内部其他费用(万元)
     */
-    private Integer internalOtherCost;
+    private BigDecimal internalOtherCost;
 
     /**
     * 委托外部研究开发总费用(万元)
     */
-    private Integer externalTotalCost;
+    private BigDecimal externalTotalCost;
 
     /**
     * 委托外部境内的外部研发费用(万元)
     */
-    private Integer externalAbroadCost;
+    private BigDecimal externalAbroadCost;
 
     /**
     * 企业填报人
@@ -124,79 +125,81 @@ public class OrgActivityCost {
         this.activityNumber = activityNumber;
     }
 
-    public Integer getInternalLaborCost() {
-        return internalLaborCost;
-    }
+    
+    
+    public BigDecimal getInternalLaborCost() {
+		return internalLaborCost;
+	}
 
-    public void setInternalLaborCost(Integer internalLaborCost) {
-        this.internalLaborCost = internalLaborCost;
-    }
+	public void setInternalLaborCost(BigDecimal internalLaborCost) {
+		this.internalLaborCost = internalLaborCost;
+	}
 
-    public Integer getInternalDirectCost() {
-        return internalDirectCost;
-    }
+	public BigDecimal getInternalDirectCost() {
+		return internalDirectCost;
+	}
 
-    public void setInternalDirectCost(Integer internalDirectCost) {
-        this.internalDirectCost = internalDirectCost;
-    }
+	public void setInternalDirectCost(BigDecimal internalDirectCost) {
+		this.internalDirectCost = internalDirectCost;
+	}
 
-    public Integer getInternalDepreciationCost() {
-        return internalDepreciationCost;
-    }
+	public BigDecimal getInternalDepreciationCost() {
+		return internalDepreciationCost;
+	}
 
-    public void setInternalDepreciationCost(Integer internalDepreciationCost) {
-        this.internalDepreciationCost = internalDepreciationCost;
-    }
+	public void setInternalDepreciationCost(BigDecimal internalDepreciationCost) {
+		this.internalDepreciationCost = internalDepreciationCost;
+	}
 
-    public Integer getInternalAmortizationCost() {
-        return internalAmortizationCost;
-    }
+	public BigDecimal getInternalAmortizationCost() {
+		return internalAmortizationCost;
+	}
 
-    public void setInternalAmortizationCost(Integer internalAmortizationCost) {
-        this.internalAmortizationCost = internalAmortizationCost;
-    }
+	public void setInternalAmortizationCost(BigDecimal internalAmortizationCost) {
+		this.internalAmortizationCost = internalAmortizationCost;
+	}
 
-    public Integer getInternalDesignCost() {
-        return internalDesignCost;
-    }
+	public BigDecimal getInternalDesignCost() {
+		return internalDesignCost;
+	}
 
-    public void setInternalDesignCost(Integer internalDesignCost) {
-        this.internalDesignCost = internalDesignCost;
-    }
+	public void setInternalDesignCost(BigDecimal internalDesignCost) {
+		this.internalDesignCost = internalDesignCost;
+	}
 
-    public Integer getInternalEquipmentCost() {
-        return internalEquipmentCost;
-    }
+	public BigDecimal getInternalEquipmentCost() {
+		return internalEquipmentCost;
+	}
 
-    public void setInternalEquipmentCost(Integer internalEquipmentCost) {
-        this.internalEquipmentCost = internalEquipmentCost;
-    }
+	public void setInternalEquipmentCost(BigDecimal internalEquipmentCost) {
+		this.internalEquipmentCost = internalEquipmentCost;
+	}
 
-    public Integer getInternalOtherCost() {
-        return internalOtherCost;
-    }
+	public BigDecimal getInternalOtherCost() {
+		return internalOtherCost;
+	}
 
-    public void setInternalOtherCost(Integer internalOtherCost) {
-        this.internalOtherCost = internalOtherCost;
-    }
+	public void setInternalOtherCost(BigDecimal internalOtherCost) {
+		this.internalOtherCost = internalOtherCost;
+	}
 
-    public Integer getExternalTotalCost() {
-        return externalTotalCost;
-    }
+	public BigDecimal getExternalTotalCost() {
+		return externalTotalCost;
+	}
 
-    public void setExternalTotalCost(Integer externalTotalCost) {
-        this.externalTotalCost = externalTotalCost;
-    }
+	public void setExternalTotalCost(BigDecimal externalTotalCost) {
+		this.externalTotalCost = externalTotalCost;
+	}
 
-    public Integer getExternalAbroadCost() {
-        return externalAbroadCost;
-    }
+	public BigDecimal getExternalAbroadCost() {
+		return externalAbroadCost;
+	}
 
-    public void setExternalAbroadCost(Integer externalAbroadCost) {
-        this.externalAbroadCost = externalAbroadCost;
-    }
+	public void setExternalAbroadCost(BigDecimal externalAbroadCost) {
+		this.externalAbroadCost = externalAbroadCost;
+	}
 
-    public String getEnterpriseFiller() {
+	public String getEnterpriseFiller() {
         return enterpriseFiller;
     }
 

+ 15 - 2
src/main/java/com/goafanti/common/model/OrgAnnualReport.java

@@ -20,7 +20,7 @@ public class OrgAnnualReport {
     private Date createTime;
 
     /**
-    * 最近新时间
+    * 最近新时间
     */
     private Date lastUpdateTime;
 
@@ -38,6 +38,11 @@ public class OrgAnnualReport {
     * 出口创汇总额(万元)
     */
     private BigDecimal totalExportVolume;
+    
+    /**
+     * 基础研究投入费用
+     */
+    private BigDecimal basicResearchCost;
 
     /**
     * 年份
@@ -110,7 +115,15 @@ public class OrgAnnualReport {
         this.totalExportVolume = totalExportVolume;
     }
 
-    public Integer getYear() {
+	public BigDecimal getBasicResearchCost() {
+		return basicResearchCost;
+	}
+
+	public void setBasicResearchCost(BigDecimal basicResearchCost) {
+		this.basicResearchCost = basicResearchCost;
+	}
+
+	public Integer getYear() {
         return year;
     }
 

+ 81 - 78
src/main/java/com/goafanti/common/model/OrgFinance.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -13,57 +15,57 @@ public class OrgFinance {
     /**
     * 主营业务收入
      (万元)
     */
-    private Integer mainBusinessIncome;
+    private BigDecimal mainBusinessIncome;
 
     /**
     * 管理费用(万元)
     */
-    private Integer managementCost;
+    private BigDecimal managementCost;
 
     /**
     * 营业利润(万元)
     */
-    private Integer operatingProfit;
+    private BigDecimal operatingProfit;
 
     /**
     * 支付的各项税费(万元)
     */
-    private Integer variousTax;
+    private BigDecimal variousTax;
 
     /**
     * 流动资产
     */
-    private Integer currentAsset;
+    private BigDecimal currentAsset;
 
     /**
     * 固定资产净额
		(万元)
     */
-    private Integer netFixedAsset;
+    private BigDecimal netFixedAsset;
 
     /**
     * 资产总额(万元)
     */
-    private Integer totalAsset;
+    private BigDecimal totalAsset;
 
     /**
     * 所有者权益合计(万元)
     */
-    private Integer netAsset;
+    private BigDecimal netAsset;
 
     /**
     * 利润总额(万元)
     */
-    private Integer grossProfit;
+    private BigDecimal grossProfit;
 
     /**
     * 净利润(万元)
     */
-    private Integer netProfit;
+    private BigDecimal netProfit;
 
     /**
     * 销售收入(万元)
     */
-    private Integer salesRevenue;
+    private BigDecimal salesRevenue;
     
     /**
      * 年份
@@ -96,95 +98,96 @@ public class OrgFinance {
         this.uid = uid;
     }
 
-    public Integer getMainBusinessIncome() {
-        return mainBusinessIncome;
-    }
 
-    public void setMainBusinessIncome(Integer mainBusinessIncome) {
-        this.mainBusinessIncome = mainBusinessIncome;
-    }
+    public BigDecimal getMainBusinessIncome() {
+		return mainBusinessIncome;
+	}
 
-    public Integer getManagementCost() {
-        return managementCost;
-    }
+	public void setMainBusinessIncome(BigDecimal mainBusinessIncome) {
+		this.mainBusinessIncome = mainBusinessIncome;
+	}
 
-    public void setManagementCost(Integer managementCost) {
-        this.managementCost = managementCost;
-    }
+	public BigDecimal getManagementCost() {
+		return managementCost;
+	}
 
-    public Integer getOperatingProfit() {
-        return operatingProfit;
-    }
+	public void setManagementCost(BigDecimal managementCost) {
+		this.managementCost = managementCost;
+	}
 
-    public void setOperatingProfit(Integer operatingProfit) {
-        this.operatingProfit = operatingProfit;
-    }
+	public BigDecimal getOperatingProfit() {
+		return operatingProfit;
+	}
 
-    public Integer getVariousTax() {
-        return variousTax;
-    }
+	public void setOperatingProfit(BigDecimal operatingProfit) {
+		this.operatingProfit = operatingProfit;
+	}
 
-    public void setVariousTax(Integer variousTax) {
-        this.variousTax = variousTax;
-    }
+	public BigDecimal getVariousTax() {
+		return variousTax;
+	}
 
-    public Integer getCurrentAsset() {
-        return currentAsset;
-    }
+	public void setVariousTax(BigDecimal variousTax) {
+		this.variousTax = variousTax;
+	}
 
-    public void setCurrentAsset(Integer currentAsset) {
-        this.currentAsset = currentAsset;
-    }
+	public BigDecimal getCurrentAsset() {
+		return currentAsset;
+	}
 
-    public Integer getNetFixedAsset() {
-        return netFixedAsset;
-    }
+	public void setCurrentAsset(BigDecimal currentAsset) {
+		this.currentAsset = currentAsset;
+	}
 
-    public void setNetFixedAsset(Integer netFixedAsset) {
-        this.netFixedAsset = netFixedAsset;
-    }
+	public BigDecimal getNetFixedAsset() {
+		return netFixedAsset;
+	}
 
-    public Integer getTotalAsset() {
-        return totalAsset;
-    }
+	public void setNetFixedAsset(BigDecimal netFixedAsset) {
+		this.netFixedAsset = netFixedAsset;
+	}
 
-    public void setTotalAsset(Integer totalAsset) {
-        this.totalAsset = totalAsset;
-    }
+	public BigDecimal getTotalAsset() {
+		return totalAsset;
+	}
 
-    public Integer getNetAsset() {
-        return netAsset;
-    }
+	public void setTotalAsset(BigDecimal totalAsset) {
+		this.totalAsset = totalAsset;
+	}
 
-    public void setNetAsset(Integer netAsset) {
-        this.netAsset = netAsset;
-    }
+	public BigDecimal getNetAsset() {
+		return netAsset;
+	}
 
-    public Integer getGrossProfit() {
-        return grossProfit;
-    }
+	public void setNetAsset(BigDecimal netAsset) {
+		this.netAsset = netAsset;
+	}
 
-    public void setGrossProfit(Integer grossProfit) {
-        this.grossProfit = grossProfit;
-    }
+	public BigDecimal getGrossProfit() {
+		return grossProfit;
+	}
 
-    public Integer getNetProfit() {
-        return netProfit;
-    }
+	public void setGrossProfit(BigDecimal grossProfit) {
+		this.grossProfit = grossProfit;
+	}
 
-    public void setNetProfit(Integer netProfit) {
-        this.netProfit = netProfit;
-    }
+	public BigDecimal getNetProfit() {
+		return netProfit;
+	}
 
-    public Integer getSalesRevenue() {
-        return salesRevenue;
-    }
+	public void setNetProfit(BigDecimal netProfit) {
+		this.netProfit = netProfit;
+	}
 
-    public void setSalesRevenue(Integer salesRevenue) {
-        this.salesRevenue = salesRevenue;
-    }
+	public BigDecimal getSalesRevenue() {
+		return salesRevenue;
+	}
+
+	public void setSalesRevenue(BigDecimal salesRevenue) {
+		this.salesRevenue = salesRevenue;
+	}
 
-    public String getFinanceUrl() {
+	public String getFinanceUrl() {
         return financeUrl;
     }
 

+ 72 - 67
src/main/java/com/goafanti/common/model/OrgRatepay.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -13,36 +15,36 @@ public class OrgRatepay {
     /**
     * 营业收入(万元)
     */
-    private Integer operatingIncome;
+    private BigDecimal operatingIncome;
 
     /**
     * 管理费用(万元)
     */
-    private Integer managementCost;
+    private BigDecimal managementCost;
 
     /**
     * 营业利润
(万元)
     */
-    private Integer operatingProfit;
+    private BigDecimal operatingProfit;
 
     /**
     * 营业外收入(万元)
     */
-    private Integer nonOperatingIncome;
+    private BigDecimal nonOperatingIncome;
 
     /**
     * 不征税收入(万元)
    */
-    private Integer nonTaxableIncome;
+    private BigDecimal nonTaxableIncome;
 
     /**
     * 免税收入(万元)
     */
-    private Integer taxExemptIncome;
+    private BigDecimal taxExemptIncome;
 
     /**
     * 政府补助收入(万元)
     */
-    private Integer subsidyIncome;
+    private BigDecimal subsidyIncome;
     
     /**
      * 年份
@@ -52,12 +54,12 @@ public class OrgRatepay {
     /**
      * 利润总额
      */
-    private Integer grossProfit;
+    private BigDecimal grossProfit;
     
     /**
      * 研发费用
      */
-    private Integer researchCost;
+    private BigDecimal researchCost;
     
 
     /**
@@ -86,63 +88,81 @@ public class OrgRatepay {
         this.uid = uid;
     }
 
-    public Integer getOperatingIncome() {
-        return operatingIncome;
-    }
+   
 
-    public void setOperatingIncome(Integer operatingIncome) {
-        this.operatingIncome = operatingIncome;
-    }
+    public BigDecimal getOperatingIncome() {
+		return operatingIncome;
+	}
 
-    public Integer getManagementCost() {
-        return managementCost;
-    }
+	public void setOperatingIncome(BigDecimal operatingIncome) {
+		this.operatingIncome = operatingIncome;
+	}
 
-    public void setManagementCost(Integer managementCost) {
-        this.managementCost = managementCost;
-    }
+	public BigDecimal getManagementCost() {
+		return managementCost;
+	}
 
-    public Integer getOperatingProfit() {
-        return operatingProfit;
-    }
+	public void setManagementCost(BigDecimal managementCost) {
+		this.managementCost = managementCost;
+	}
 
-    public void setOperatingProfit(Integer operatingProfit) {
-        this.operatingProfit = operatingProfit;
-    }
+	public BigDecimal getOperatingProfit() {
+		return operatingProfit;
+	}
 
-    public Integer getNonOperatingIncome() {
-        return nonOperatingIncome;
-    }
+	public void setOperatingProfit(BigDecimal operatingProfit) {
+		this.operatingProfit = operatingProfit;
+	}
 
-    public void setNonOperatingIncome(Integer nonOperatingIncome) {
-        this.nonOperatingIncome = nonOperatingIncome;
-    }
+	public BigDecimal getNonOperatingIncome() {
+		return nonOperatingIncome;
+	}
 
-    public Integer getNonTaxableIncome() {
-        return nonTaxableIncome;
-    }
+	public void setNonOperatingIncome(BigDecimal nonOperatingIncome) {
+		this.nonOperatingIncome = nonOperatingIncome;
+	}
 
-    public void setNonTaxableIncome(Integer nonTaxableIncome) {
-        this.nonTaxableIncome = nonTaxableIncome;
-    }
+	public BigDecimal getNonTaxableIncome() {
+		return nonTaxableIncome;
+	}
 
-    public Integer getTaxExemptIncome() {
-        return taxExemptIncome;
-    }
+	public void setNonTaxableIncome(BigDecimal nonTaxableIncome) {
+		this.nonTaxableIncome = nonTaxableIncome;
+	}
 
-    public void setTaxExemptIncome(Integer taxExemptIncome) {
-        this.taxExemptIncome = taxExemptIncome;
-    }
+	public BigDecimal getTaxExemptIncome() {
+		return taxExemptIncome;
+	}
 
-    public Integer getSubsidyIncome() {
-        return subsidyIncome;
-    }
+	public void setTaxExemptIncome(BigDecimal taxExemptIncome) {
+		this.taxExemptIncome = taxExemptIncome;
+	}
 
-    public void setSubsidyIncome(Integer subsidyIncome) {
-        this.subsidyIncome = subsidyIncome;
-    }
+	public BigDecimal getSubsidyIncome() {
+		return subsidyIncome;
+	}
+
+	public void setSubsidyIncome(BigDecimal subsidyIncome) {
+		this.subsidyIncome = subsidyIncome;
+	}
+
+	public BigDecimal getGrossProfit() {
+		return grossProfit;
+	}
+
+	public void setGrossProfit(BigDecimal grossProfit) {
+		this.grossProfit = grossProfit;
+	}
+
+	public BigDecimal getResearchCost() {
+		return researchCost;
+	}
+
+	public void setResearchCost(BigDecimal researchCost) {
+		this.researchCost = researchCost;
+	}
 
-    public String getTaxReturnUrl() {
+	public String getTaxReturnUrl() {
         return taxReturnUrl;
     }
 
@@ -169,23 +189,8 @@ public class OrgRatepay {
 	
 	
     
-	public Integer getGrossProfit() {
-		return grossProfit;
-	}
-
-	public void setGrossProfit(Integer grossProfit) {
-		this.grossProfit = grossProfit;
-	}
 
 
-	public Integer getResearchCost() {
-		return researchCost;
-	}
-
-	public void setResearchCost(Integer researchCost) {
-		this.researchCost = researchCost;
-	}
-
 	//企业纳税申报表
 	public String getTaxReturnDownloadFileName(){
 		if (StringUtils.isBlank(this.taxReturnUrl)){

+ 12 - 9
src/main/java/com/goafanti/common/model/OrgTechProduct.java

@@ -1,10 +1,11 @@
 package com.goafanti.common.model;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
  * 上年度高新技术产品(服务)
  */
@@ -46,7 +47,7 @@ public class OrgTechProduct {
     /**
     * 上年度销售收入
     */
-    private String lastYearRevenue;
+    private BigDecimal lastYearRevenue;
 
     /**
     * 是否是主要产品(服务)
@@ -162,15 +163,17 @@ public class OrgTechProduct {
         this.technicalSource = technicalSource;
     }
 
-    public String getLastYearRevenue() {
-        return lastYearRevenue;
-    }
+   
 
-    public void setLastYearRevenue(String lastYearRevenue) {
-        this.lastYearRevenue = lastYearRevenue;
-    }
+    public BigDecimal getLastYearRevenue() {
+		return lastYearRevenue;
+	}
+
+	public void setLastYearRevenue(BigDecimal lastYearRevenue) {
+		this.lastYearRevenue = lastYearRevenue;
+	}
 
-    public Integer getMainProduct() {
+	public Integer getMainProduct() {
         return mainProduct;
     }
 

+ 105 - 30
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportBo.java

@@ -1,4 +1,11 @@
 package com.goafanti.techservice.cognizance.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
 /**
  * 企业年报
  */
@@ -38,6 +45,31 @@ public class AnnualReportBo {
 	private String certificateNumber;
 	
 	/**
+	 * 高企认定时间
+	 */
+	private Date issuingDate;
+	
+	 /**
+     * 是否上市
+     */
+    private Integer listed;
+    
+    /**
+     * 上市时间
+     */
+    private Date listedDate;
+    
+    /**
+     * 上市类型
+     */
+    private Integer listedType;
+    
+    /**
+     * 股票代码
+     */
+    private String stockCode; 
+	
+	/**
 	 * 企业联系人及联系方式
 	 */
 	private String contacts;
@@ -68,27 +100,27 @@ public class AnnualReportBo {
 	private Integer nationalDrug;
 	
 	/**
-	 * 国家一级中药保护品种
+	 * 国家一级中药保护品种
 	 */
 	private Integer chineseMedicine;
 	
 	/**
-	 * 实用新型
+	 * 实用新型专利数
 	 */
 	private Integer utilityPatent;
 	
 	/**
-	 * 集成电路布图设计专有权
+	 * 集成电路布图设计专有权
 	 */
 	private Integer circuitDesign;
 	
 	/**
-	 * 外观设计
+	 * 外观设计专利数
 	 */
 	private Integer exteriorPatent;
 	
 	/**
-	 * 软件著作权
+	 * 软件著作权
 	 */
 	private Integer softwareWorks;
 	
@@ -115,42 +147,42 @@ public class AnnualReportBo {
     /**
 	 * 企业总收入
 	 */
-	private Integer totalRevenue;
+	private BigDecimal totalRevenue;
 	
 	 /**
 	  * 销售收入(万元)
 	 */
-	private Integer salesRevenue; 
+	private BigDecimal salesRevenue; 
 	
 	/**
 	 * 所有者权益合计(万元)
 	*/
-	private Integer netAsset;
+	private BigDecimal netAsset;
 	
 	/**
-	 * 近一年高新技术产品(服务)收入
+	 * 高新技术产品(服务)收入
 	 */
-	private Integer lastYearRevenue;
+	private BigDecimal lastYearRevenue;
 	
 	/**
      * 利润总额
      */
-    private Integer grossProfit;
+    private BigDecimal grossProfit;
     
     /**
 	 * 研发费用总额
 	 */
-	private Integer researchCost;
+	private BigDecimal researchCost;
     
     /**
 	 * 在中国境内研发费用
 	 */
-	private Integer territory;
+	private BigDecimal territory;
 	
 	/**
 	 * 基础研究投入费用
 	 */
-	private Integer basicResearchCost;
+	private BigDecimal basicResearchCost;
 
 	public String getUid() {
 		return uid;
@@ -199,6 +231,48 @@ public class AnnualReportBo {
 	public void setLocationArea(String locationArea) {
 		this.locationArea = locationArea;
 	}
+	
+	public Date getIssuingDate() {
+		return issuingDate;
+	}
+
+	public void setIssuingDate(Date issuingDate) {
+		this.issuingDate = issuingDate;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getListed() {
+		return listed;
+	}
+
+	public void setListed(Integer listed) {
+		this.listed = listed;
+	}
+
+	public Date getListedDate() {
+		return listedDate;
+	}
+
+	public void setListedDate(Date listedDate) {
+		this.listedDate = listedDate;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getListedType() {
+		return listedType;
+	}
+
+	public void setListedType(Integer listedType) {
+		this.listedType = listedType;
+	}
+
+	public String getStockCode() {
+		return stockCode;
+	}
+
+	public void setStockCode(String stockCode) {
+		this.stockCode = stockCode;
+	}
 
 	public String getCertificateNumber() {
 		return certificateNumber;
@@ -328,69 +402,70 @@ public class AnnualReportBo {
 		this.graduateNumber = graduateNumber;
 	}
 
-	public Integer getTotalRevenue() {
+	public BigDecimal getTotalRevenue() {
 		return totalRevenue;
 	}
 
-	public void setTotalRevenue(Integer totalRevenue) {
+	public void setTotalRevenue(BigDecimal totalRevenue) {
 		this.totalRevenue = totalRevenue;
 	}
 
-	public Integer getSalesRevenue() {
+	public BigDecimal getSalesRevenue() {
 		return salesRevenue;
 	}
 
-	public void setSalesRevenue(Integer salesRevenue) {
+	public void setSalesRevenue(BigDecimal salesRevenue) {
 		this.salesRevenue = salesRevenue;
 	}
 
-	public Integer getNetAsset() {
+	public BigDecimal getNetAsset() {
 		return netAsset;
 	}
 
-	public void setNetAsset(Integer netAsset) {
+	public void setNetAsset(BigDecimal netAsset) {
 		this.netAsset = netAsset;
 	}
 
-	public Integer getLastYearRevenue() {
+	public BigDecimal getLastYearRevenue() {
 		return lastYearRevenue;
 	}
 
-	public void setLastYearRevenue(Integer lastYearRevenue) {
+	public void setLastYearRevenue(BigDecimal lastYearRevenue) {
 		this.lastYearRevenue = lastYearRevenue;
 	}
 
-	public Integer getGrossProfit() {
+	public BigDecimal getGrossProfit() {
 		return grossProfit;
 	}
 
-	public void setGrossProfit(Integer grossProfit) {
+	public void setGrossProfit(BigDecimal grossProfit) {
 		this.grossProfit = grossProfit;
 	}
 
-	public Integer getResearchCost() {
+	public BigDecimal getResearchCost() {
 		return researchCost;
 	}
 
-	public void setResearchCost(Integer researchCost) {
+	public void setResearchCost(BigDecimal researchCost) {
 		this.researchCost = researchCost;
 	}
 
-	public Integer getTerritory() {
+	public BigDecimal getTerritory() {
 		return territory;
 	}
 
-	public void setTerritory(Integer territory) {
+	public void setTerritory(BigDecimal territory) {
 		this.territory = territory;
 	}
 
-	public Integer getBasicResearchCost() {
+	public BigDecimal getBasicResearchCost() {
 		return basicResearchCost;
 	}
 
-	public void setBasicResearchCost(Integer basicResearchCost) {
+	public void setBasicResearchCost(BigDecimal basicResearchCost) {
 		this.basicResearchCost = basicResearchCost;
 	}
+
 	
 	
 }

+ 270 - 0
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportMainBo.java

@@ -0,0 +1,270 @@
+package com.goafanti.techservice.cognizance.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+ * 年报详情主要信息
+ */
+public class AnnualReportMainBo {
+	private String uid;
+	
+	private String unitName;
+	
+	private String orgCode;
+	
+	private String locationProvince;
+	
+	private String locationCity;
+	
+	private String locationArea;
+	
+	private Integer listed;
+	
+	private Date listedDate;
+	
+	private Integer listedType;
+	
+	private String stockCode;
+	
+	private Integer firmTotal;
+	
+	private Integer techTotal;
+	
+	private Integer newEmployment;
+	
+	private Integer graduateNumber;
+	
+	private BigDecimal totalTax;
+	
+	private BigDecimal incomeTaxRelief;
+	
+	private BigDecimal totalExportVolume;
+	
+	private BigDecimal salesRevenue;
+	
+	private BigDecimal grossProfit;
+	
+	private BigDecimal netAsset;
+	
+	private String certificateNumber;
+	
+	private Date issuingDate;
+	
+	private String contacts;
+	
+	private BigDecimal researchCost;
+	
+	private BigDecimal totalRevenue;
+	
+	private BigDecimal lastYearRevenue;
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String 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 getListed() {
+		return listed;
+	}
+
+	public void setListed(Integer listed) {
+		this.listed = listed;
+	}
+
+	public Date getListedDate() {
+		return listedDate;
+	}
+
+	public void setListedDate(Date listedDate) {
+		this.listedDate = listedDate;
+	}
+
+	public Integer getListedType() {
+		return listedType;
+	}
+
+	public void setListedType(Integer listedType) {
+		this.listedType = listedType;
+	}
+
+	public String getStockCode() {
+		return stockCode;
+	}
+
+	public void setStockCode(String stockCode) {
+		this.stockCode = stockCode;
+	}
+
+	public Integer getFirmTotal() {
+		return firmTotal;
+	}
+
+	public void setFirmTotal(Integer firmTotal) {
+		this.firmTotal = firmTotal;
+	}
+
+	public Integer getTechTotal() {
+		return techTotal;
+	}
+
+	public void setTechTotal(Integer techTotal) {
+		this.techTotal = techTotal;
+	}
+
+	public Integer getNewEmployment() {
+		return newEmployment;
+	}
+
+	public void setNewEmployment(Integer newEmployment) {
+		this.newEmployment = newEmployment;
+	}
+
+	public Integer getGraduateNumber() {
+		return graduateNumber;
+	}
+
+	public void setGraduateNumber(Integer graduateNumber) {
+		this.graduateNumber = graduateNumber;
+	}
+
+	public BigDecimal getTotalTax() {
+		return totalTax;
+	}
+
+	public void setTotalTax(BigDecimal totalTax) {
+		this.totalTax = totalTax;
+	}
+
+	public BigDecimal getIncomeTaxRelief() {
+		return incomeTaxRelief;
+	}
+
+	public void setIncomeTaxRelief(BigDecimal incomeTaxRelief) {
+		this.incomeTaxRelief = incomeTaxRelief;
+	}
+
+	public BigDecimal getTotalExportVolume() {
+		return totalExportVolume;
+	}
+
+	public void setTotalExportVolume(BigDecimal totalExportVolume) {
+		this.totalExportVolume = totalExportVolume;
+	}
+
+	public BigDecimal getSalesRevenue() {
+		return salesRevenue;
+	}
+
+	public void setSalesRevenue(BigDecimal salesRevenue) {
+		this.salesRevenue = salesRevenue;
+	}
+
+	public BigDecimal getGrossProfit() {
+		return grossProfit;
+	}
+
+	public void setGrossProfit(BigDecimal grossProfit) {
+		this.grossProfit = grossProfit;
+	}
+
+	public BigDecimal getNetAsset() {
+		return netAsset;
+	}
+
+	public void setNetAsset(BigDecimal netAsset) {
+		this.netAsset = netAsset;
+	}
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+
+	public Date getIssuingDate() {
+		return issuingDate;
+	}
+
+	public void setIssuingDate(Date issuingDate) {
+		this.issuingDate = issuingDate;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public BigDecimal getResearchCost() {
+		return researchCost;
+	}
+
+	public void setResearchCost(BigDecimal researchCost) {
+		this.researchCost = researchCost;
+	}
+
+	public BigDecimal getTotalRevenue() {
+		return totalRevenue;
+	}
+
+	public void setTotalRevenue(BigDecimal totalRevenue) {
+		this.totalRevenue = totalRevenue;
+	}
+
+	public BigDecimal getLastYearRevenue() {
+		return lastYearRevenue;
+	}
+
+	public void setLastYearRevenue(BigDecimal lastYearRevenue) {
+		this.lastYearRevenue = lastYearRevenue;
+	}
+	
+	
+}

+ 146 - 0
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportPropertyRightBo.java

@@ -0,0 +1,146 @@
+package com.goafanti.techservice.cognizance.bo;
+
+public class AnnualReportPropertyRightBo {
+	private String uid;
+	
+	/**
+	 * 发明专利数
+	 */
+	private Integer inventionPatent;
+	
+	/**
+	 * 国防专利数
+	 */
+	private Integer defensePatent;
+	
+	/**
+	 * 国家级农作物品种数
+	 */
+	private Integer nationalCrop;
+	
+	/**
+	 * 植物新品种数
+	 */
+	private Integer newPlantCariety;
+	
+	/**
+	 * 国家新药数
+	 */
+	private Integer nationalDrug;
+	
+	/**
+	 * 国家一级中药保护品种数
+	 */
+	private Integer chineseMedicine;
+	
+	/**
+	 * 实用新型专利数
+	 */
+	private Integer utilityPatent;
+	
+	/**
+	 * 集成电路布图设计专有权数
+	 */
+	private Integer circuitDesign;
+	
+	/**
+	 * 外观设计专利数
+	 */
+	private Integer exteriorPatent;
+	
+	/**
+	 * 软件著作权数
+	 */
+	private Integer softwareWorks;
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public Integer getInventionPatent() {
+		return inventionPatent;
+	}
+
+	public void setInventionPatent(Integer inventionPatent) {
+		this.inventionPatent = inventionPatent;
+	}
+
+	public Integer getDefensePatent() {
+		return defensePatent;
+	}
+
+	public void setDefensePatent(Integer defensePatent) {
+		this.defensePatent = defensePatent;
+	}
+
+	public Integer getNationalCrop() {
+		return nationalCrop;
+	}
+
+	public void setNationalCrop(Integer nationalCrop) {
+		this.nationalCrop = nationalCrop;
+	}
+
+	public Integer getNewPlantCariety() {
+		return newPlantCariety;
+	}
+
+	public void setNewPlantCariety(Integer newPlantCariety) {
+		this.newPlantCariety = newPlantCariety;
+	}
+
+	public Integer getNationalDrug() {
+		return nationalDrug;
+	}
+
+	public void setNationalDrug(Integer nationalDrug) {
+		this.nationalDrug = nationalDrug;
+	}
+
+	public Integer getChineseMedicine() {
+		return chineseMedicine;
+	}
+
+	public void setChineseMedicine(Integer chineseMedicine) {
+		this.chineseMedicine = chineseMedicine;
+	}
+
+	public Integer getUtilityPatent() {
+		return utilityPatent;
+	}
+
+	public void setUtilityPatent(Integer utilityPatent) {
+		this.utilityPatent = utilityPatent;
+	}
+
+	public Integer getCircuitDesign() {
+		return circuitDesign;
+	}
+
+	public void setCircuitDesign(Integer circuitDesign) {
+		this.circuitDesign = circuitDesign;
+	}
+
+	public Integer getExteriorPatent() {
+		return exteriorPatent;
+	}
+
+	public void setExteriorPatent(Integer exteriorPatent) {
+		this.exteriorPatent = exteriorPatent;
+	}
+
+	public Integer getSoftwareWorks() {
+		return softwareWorks;
+	}
+
+	public void setSoftwareWorks(Integer softwareWorks) {
+		this.softwareWorks = softwareWorks;
+	} 
+	
+	
+
+}

+ 6 - 3
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceCatagoryBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.techservice.cognizance.bo;
 
+import java.math.BigDecimal;
+
 public class CognizanceCatagoryBo {
 	private String uid;
 	
@@ -11,7 +13,7 @@ public class CognizanceCatagoryBo {
 	
 	private Integer techTotal;
 	
-	private Integer totalRevenue;
+	private BigDecimal totalRevenue;
 
 	public String getUid() {
 		return uid;
@@ -53,15 +55,16 @@ public class CognizanceCatagoryBo {
 		this.techTotal = techTotal;
 	}
 
-	public Integer getTotalRevenue() {
+	public BigDecimal getTotalRevenue() {
 		return totalRevenue;
 	}
 
-	public void setTotalRevenue(Integer totalRevenue) {
+	public void setTotalRevenue(BigDecimal totalRevenue) {
 		this.totalRevenue = totalRevenue;
 	}
 
 	
 	
 	
+	
 }

+ 46 - 43
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceDetailBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.techservice.cognizance.bo;
 
+import java.math.BigDecimal;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
@@ -69,72 +71,72 @@ public class CognizanceDetailBo {
 	/**
 	 * 第一年所有者权益(净资产)
 	 */
-	private Integer netAsset1;
+	private BigDecimal netAsset1;
 	
 	/**
 	 * 第一年销售收入
 	 */
-	private Integer salesRevenue1;
+	private BigDecimal salesRevenue1;
 	
 	/**
 	 * 第一年利润总额
 	 */
-	private Integer grossProfit1;
+	private BigDecimal grossProfit1;
 	
 	/**
 	 * 第二年所有者权益(净资产)
 	 */
-	private Integer netAsset2;
+	private BigDecimal netAsset2;
 	
 	/**
 	 * 第二年销售收入
 	 */
-	private Integer salesRevenue2;
+	private BigDecimal salesRevenue2;
 	
 	/**
 	 * 第二年利润总额
 	 */
-	private Integer grossProfit2;
+	private BigDecimal grossProfit2;
 	
 	/**
 	 * 第三年所有者权益(净资产)
 	 */
-	private Integer netAsset3;
+	private BigDecimal netAsset3;
 	
 	/**
 	 * 第三年销售收入
 	 */
-	private Integer salesRevenue3;
+	private BigDecimal salesRevenue3;
 	
 	/**
 	 * 第三年利润总额
 	 */
-	private Integer grossProfit3;
+	private BigDecimal grossProfit3;
 	
 	/**
 	 * 近三年研发费用总额
 	 */
-	private Integer researchCost;
+	private BigDecimal researchCost;
 	
 	/**
 	 * 在中国境内研发费用
 	 */
-	private Integer territory;
+	private BigDecimal territory;
 	
 	/**
 	 * 基础研究投入费用
 	 */
-	private Integer basicResearchCost;
+	private BigDecimal basicResearchCost;
 	
 	/**
 	 * 近一年企业总收入
 	 */
-	private Integer totalRevenue;
+	private BigDecimal totalRevenue;
 	
 	/**
 	 * 近一年高新技术产品(服务)收入
 	 */
-	private Integer lastYearRevenue;
+	private BigDecimal lastYearRevenue;
 	
 	/**
 	 * 申请认定前一年内是否发生过重大安全、重大质量或严重环境违法行为
@@ -248,118 +250,119 @@ public class CognizanceDetailBo {
 		this.techTotal = techTotal;
 	}
 
-	public Integer getNetAsset1() {
+	
+	public BigDecimal getNetAsset1() {
 		return netAsset1;
 	}
 
-	public void setNetAsset1(Integer netAsset1) {
+	public void setNetAsset1(BigDecimal netAsset1) {
 		this.netAsset1 = netAsset1;
 	}
 
-	public Integer getSalesRevenue1() {
+	public BigDecimal getSalesRevenue1() {
 		return salesRevenue1;
 	}
 
-	public void setSalesRevenue1(Integer salesRevenue1) {
+	public void setSalesRevenue1(BigDecimal salesRevenue1) {
 		this.salesRevenue1 = salesRevenue1;
 	}
 
-	public Integer getGrossProfit1() {
+	public BigDecimal getGrossProfit1() {
 		return grossProfit1;
 	}
 
-	public void setGrossProfit1(Integer grossProfit1) {
+	public void setGrossProfit1(BigDecimal grossProfit1) {
 		this.grossProfit1 = grossProfit1;
 	}
 
-	public Integer getNetAsset2() {
+	public BigDecimal getNetAsset2() {
 		return netAsset2;
 	}
 
-	public void setNetAsset2(Integer netAsset2) {
+	public void setNetAsset2(BigDecimal netAsset2) {
 		this.netAsset2 = netAsset2;
 	}
 
-	public Integer getSalesRevenue2() {
+	public BigDecimal getSalesRevenue2() {
 		return salesRevenue2;
 	}
 
-	public void setSalesRevenue2(Integer salesRevenue2) {
+	public void setSalesRevenue2(BigDecimal salesRevenue2) {
 		this.salesRevenue2 = salesRevenue2;
 	}
 
-	public Integer getGrossProfit2() {
+	public BigDecimal getGrossProfit2() {
 		return grossProfit2;
 	}
 
-	public void setGrossProfit2(Integer grossProfit2) {
+	public void setGrossProfit2(BigDecimal grossProfit2) {
 		this.grossProfit2 = grossProfit2;
 	}
 
-	public Integer getNetAsset3() {
+	public BigDecimal getNetAsset3() {
 		return netAsset3;
 	}
 
-	public void setNetAsset3(Integer netAsset3) {
+	public void setNetAsset3(BigDecimal netAsset3) {
 		this.netAsset3 = netAsset3;
 	}
 
-	public Integer getSalesRevenue3() {
+	public BigDecimal getSalesRevenue3() {
 		return salesRevenue3;
 	}
 
-	public void setSalesRevenue3(Integer salesRevenue3) {
+	public void setSalesRevenue3(BigDecimal salesRevenue3) {
 		this.salesRevenue3 = salesRevenue3;
 	}
 
-	public Integer getGrossProfit3() {
+	public BigDecimal getGrossProfit3() {
 		return grossProfit3;
 	}
 
-	public void setGrossProfit3(Integer grossProfit3) {
+	public void setGrossProfit3(BigDecimal grossProfit3) {
 		this.grossProfit3 = grossProfit3;
 	}
 
-	public Integer getResearchCost() {
+	public BigDecimal getResearchCost() {
 		return researchCost;
 	}
 
-	public void setResearchCost(Integer researchCost) {
+	public void setResearchCost(BigDecimal researchCost) {
 		this.researchCost = researchCost;
 	}
 
-	public Integer getTerritory() {
+	public BigDecimal getTerritory() {
 		return territory;
 	}
 
-	public void setTerritory(Integer territory) {
+	public void setTerritory(BigDecimal territory) {
 		this.territory = territory;
 	}
 
-	public Integer getBasicResearchCost() {
+	public BigDecimal getBasicResearchCost() {
 		return basicResearchCost;
 	}
 
-	public void setBasicResearchCost(Integer basicResearchCost) {
+	public void setBasicResearchCost(BigDecimal basicResearchCost) {
 		this.basicResearchCost = basicResearchCost;
 	}
 
-	public Integer getTotalRevenue() {
+	public BigDecimal getTotalRevenue() {
 		return totalRevenue;
 	}
 
-	public void setTotalRevenue(Integer totalRevenue) {
+	public void setTotalRevenue(BigDecimal totalRevenue) {
 		this.totalRevenue = totalRevenue;
 	}
 
-	public Integer getLastYearRevenue() {
+	public BigDecimal getLastYearRevenue() {
 		return lastYearRevenue;
 	}
 
-	public void setLastYearRevenue(Integer lastYearRevenue) {
+	public void setLastYearRevenue(BigDecimal lastYearRevenue) {
 		this.lastYearRevenue = lastYearRevenue;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAccident() {
 		return accident;

+ 30 - 27
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceManageCostBo.java

@@ -1,25 +1,27 @@
 package com.goafanti.techservice.cognizance.bo;
 
+import java.math.BigDecimal;
+
 public class CognizanceManageCostBo {
 	private String uid;
 	
-	private Integer netAsset1;
+	private BigDecimal netAsset1;
 	
-	private Integer salesRevenue1;
+	private BigDecimal salesRevenue1;
 	
-	private Integer grossProfit1;
+	private BigDecimal grossProfit1;
 	
-	private Integer netAsset2;
+	private BigDecimal netAsset2;
 	
-	private Integer salesRevenue2;
+	private BigDecimal salesRevenue2;
 	
-	private Integer grossProfit2;
+	private BigDecimal grossProfit2;
 	
-	private Integer netAsset3;
+	private BigDecimal netAsset3;
 	
-	private Integer salesRevenue3;
+	private BigDecimal salesRevenue3;
 	
-	private Integer grossProfit3;
+	private BigDecimal grossProfit3;
 
 	public String getUid() {
 		return uid;
@@ -29,77 +31,78 @@ public class CognizanceManageCostBo {
 		this.uid = uid;
 	}
 
-	public Integer getNetAsset1() {
+	public BigDecimal getNetAsset1() {
 		return netAsset1;
 	}
 
-	public void setNetAsset1(Integer netAsset1) {
+	public void setNetAsset1(BigDecimal netAsset1) {
 		this.netAsset1 = netAsset1;
 	}
 
-	public Integer getSalesRevenue1() {
+	public BigDecimal getSalesRevenue1() {
 		return salesRevenue1;
 	}
 
-	public void setSalesRevenue1(Integer salesRevenue1) {
+	public void setSalesRevenue1(BigDecimal salesRevenue1) {
 		this.salesRevenue1 = salesRevenue1;
 	}
 
-	public Integer getGrossProfit1() {
+	public BigDecimal getGrossProfit1() {
 		return grossProfit1;
 	}
 
-	public void setGrossProfit1(Integer grossProfit1) {
+	public void setGrossProfit1(BigDecimal grossProfit1) {
 		this.grossProfit1 = grossProfit1;
 	}
 
-	public Integer getNetAsset2() {
+	public BigDecimal getNetAsset2() {
 		return netAsset2;
 	}
 
-	public void setNetAsset2(Integer netAsset2) {
+	public void setNetAsset2(BigDecimal netAsset2) {
 		this.netAsset2 = netAsset2;
 	}
 
-	public Integer getSalesRevenue2() {
+	public BigDecimal getSalesRevenue2() {
 		return salesRevenue2;
 	}
 
-	public void setSalesRevenue2(Integer salesRevenue2) {
+	public void setSalesRevenue2(BigDecimal salesRevenue2) {
 		this.salesRevenue2 = salesRevenue2;
 	}
 
-	public Integer getGrossProfit2() {
+	public BigDecimal getGrossProfit2() {
 		return grossProfit2;
 	}
 
-	public void setGrossProfit2(Integer grossProfit2) {
+	public void setGrossProfit2(BigDecimal grossProfit2) {
 		this.grossProfit2 = grossProfit2;
 	}
 
-	public Integer getNetAsset3() {
+	public BigDecimal getNetAsset3() {
 		return netAsset3;
 	}
 
-	public void setNetAsset3(Integer netAsset3) {
+	public void setNetAsset3(BigDecimal netAsset3) {
 		this.netAsset3 = netAsset3;
 	}
 
-	public Integer getSalesRevenue3() {
+	public BigDecimal getSalesRevenue3() {
 		return salesRevenue3;
 	}
 
-	public void setSalesRevenue3(Integer salesRevenue3) {
+	public void setSalesRevenue3(BigDecimal salesRevenue3) {
 		this.salesRevenue3 = salesRevenue3;
 	}
 
-	public Integer getGrossProfit3() {
+	public BigDecimal getGrossProfit3() {
 		return grossProfit3;
 	}
 
-	public void setGrossProfit3(Integer grossProfit3) {
+	public void setGrossProfit3(BigDecimal grossProfit3) {
 		this.grossProfit3 = grossProfit3;
 	}
+
 	
 	
 }

+ 6 - 3
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceOrgInfoBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.techservice.cognizance.bo;
 
+import java.math.BigDecimal;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
@@ -22,7 +24,7 @@ public class CognizanceOrgInfoBo {
 	
 	private Integer technicalField3;
 	
-	private Integer basicResearchCost;
+	private BigDecimal basicResearchCost;
 	
 	private Integer accient;
 
@@ -101,11 +103,12 @@ public class CognizanceOrgInfoBo {
 		this.technicalField3 = technicalField3;
 	}
 
-	public Integer getBasicResearchCost() {
+
+	public BigDecimal getBasicResearchCost() {
 		return basicResearchCost;
 	}
 
-	public void setBasicResearchCost(Integer basicResearchCost) {
+	public void setBasicResearchCost(BigDecimal basicResearchCost) {
 		this.basicResearchCost = basicResearchCost;
 	}
 

+ 9 - 6
src/main/java/com/goafanti/techservice/cognizance/bo/CognizanceResearchCostBo.java

@@ -1,11 +1,13 @@
 package com.goafanti.techservice.cognizance.bo;
 
+import java.math.BigDecimal;
+
 public class CognizanceResearchCostBo {
 	private String uid;
 	
-	private Integer researchCost;
+	private BigDecimal researchCost;
 	
-	private Integer territory;
+	private BigDecimal territory;
 
 	public String getUid() {
 		return uid;
@@ -15,21 +17,22 @@ public class CognizanceResearchCostBo {
 		this.uid = uid;
 	}
 
-	public Integer getResearchCost() {
+	public BigDecimal getResearchCost() {
 		return researchCost;
 	}
 
-	public void setResearchCost(Integer researchCost) {
+	public void setResearchCost(BigDecimal researchCost) {
 		this.researchCost = researchCost;
 	}
 
-	public Integer getTerritory() {
+	public BigDecimal getTerritory() {
 		return territory;
 	}
 
-	public void setTerritory(Integer territory) {
+	public void setTerritory(BigDecimal territory) {
 		this.territory = territory;
 	}
+
 	
 	
 

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

@@ -23,6 +23,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
+import com.goafanti.common.model.OrgAnnualReport;
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.common.model.OrgFinance;
 import com.goafanti.common.model.OrgHonorDatum;
@@ -40,6 +41,7 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
 import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
 import com.goafanti.techservice.cognizance.service.OrgActivityService;
 import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
@@ -929,9 +931,51 @@ public class CognizanceApiController extends BaseApiController {
 		return res;
 	}
 	
+	/**
+	 * 企业年报详情
+	 * @param uid
+	 * @param year
+	 * @return
+	 */
 	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
-	public Result annualReportDetail(){
+	public Result annualReportDetail(String uid, String year){
+		Result res = new Result();
+		
+		//AnnualReportPropertyRightBo o = orgAnnualReportService.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+		//BigDecimal o1 = orgAnnualReportService.selectAnnualReportTerritoryByYearAndUid(year, uid);
+		AnnualReportMainBo o2 = orgAnnualReportService.selectAnnualReportMainBoByYearAndUid(year, uid);
+		res.setData(o2);
+		//res.setData(handleAnnualReport(uid, year));
+		return res;
+	}
+	
+	/*private AnnualReportBo handleAnnualReport(String uid, String year) {
+		// TODO Auto-generated method stub
+		return null;
+	}*/
+
+	/**
+	 * 高企年报新增+修改
+	 * @param orgAnnualReport
+	 * @return
+	 */
+	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
+	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport){
 		Result res = new Result();
+		if (null == orgAnnualReport.getId()){
+			orgAnnualReport.setId(UUID.randomUUID().toString());
+			orgAnnualReport.setUid(TokenManager.getUserId());
+			Calendar now = Calendar.getInstance();
+			now.set(Calendar.MILLISECOND, 0);
+			orgAnnualReport.setCreateTime(now.getTime());
+			orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
+			orgAnnualReportService.insert(orgAnnualReport);
+		} else {
+			Calendar now = Calendar.getInstance();
+			now.set(Calendar.MILLISECOND, 0);
+			orgAnnualReport.setLastUpdateTime(now.getTime());
+			orgAnnualReportService.updateByPrimaryKeySelective(orgAnnualReport);
+		}
 		return res;
 	}
 	

+ 13 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgAnnualReportService.java

@@ -1,9 +1,12 @@
 package com.goafanti.techservice.cognizance.service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.goafanti.common.model.OrgAnnualReport;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 
 public interface OrgAnnualReportService {
 
@@ -11,4 +14,14 @@ public interface OrgAnnualReportService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
+	OrgAnnualReport insert(OrgAnnualReport orgAnnualReport);
+
+	int updateByPrimaryKeySelective(OrgAnnualReport orgAnnualReport);
+
+	AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(String year, String uid);
+
+	BigDecimal selectAnnualReportTerritoryByYearAndUid(String year, String uid);
+
+	AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(String year, String uid);
+
 }

+ 3 - 1
src/main/java/com/goafanti/techservice/cognizance/service/OrgCognizanceService.java

@@ -1,5 +1,7 @@
 package com.goafanti.techservice.cognizance.service;
 
+import java.math.BigDecimal;
+
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techservice.cognizance.bo.CognizanceBo;
@@ -22,7 +24,7 @@ public interface OrgCognizanceService {
 
 	CognizanceCatagoryBo selectCognizanceCatagoryBoByUid(String uid);
 
-	Integer selectLastYearRevenueByUid(String uid);
+	BigDecimal selectLastYearRevenueByUid(String uid);
 
 	int updateByPrimaryKeySelective(OrgCognizance cog);
 

+ 30 - 0
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.techservice.cognizance.service.impl;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -12,6 +13,8 @@ import com.goafanti.common.dao.OrgAnnualReportMapper;
 import com.goafanti.common.model.OrgAnnualReport;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
 @Service
 public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMapper> implements OrgAnnualReportService {
@@ -51,4 +54,31 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 	public int batchDeleteByPrimaryKey(List<String> id) {
 		return orgAnnualReportMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public OrgAnnualReport insert(OrgAnnualReport orgAnnualReport) {
+		orgAnnualReportMapper.insertSelective(orgAnnualReport);
+		return orgAnnualReport;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgAnnualReport orgAnnualReport) {
+		return orgAnnualReportMapper.updateByPrimaryKeySelective(orgAnnualReport);
+	}
+
+	@Override
+	public AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(String year, String uid) {
+		// TODO Auto-generated method stub
+		return orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+	}
+
+	@Override
+	public BigDecimal selectAnnualReportTerritoryByYearAndUid(String year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
+	}
+
+	@Override
+	public AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(String year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
+	}
 }

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

@@ -1,5 +1,6 @@
 package com.goafanti.techservice.cognizance.service.impl;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -74,7 +75,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 	}
 
 	@Override
-	public Integer selectLastYearRevenueByUid(String uid) {
+	public BigDecimal selectLastYearRevenueByUid(String uid) {
 		return orgCognizanceMapper.selectLastYearRevenueByUid(uid);
 	}