Antiloveg 8 yıl önce
ebeveyn
işleme
3f25215dff

+ 19 - 0
schema/2017-04-13.sql

@@ -2,5 +2,24 @@
 alter table `org_activity_cost`
 add COLUMN `year` INT(4) NULL COMMENT '年份' after `uid`;
 
+CREATE TABLE `org_cognizance_proportion` (
+  `id` VARCHAR(36) NOT NULL,
+  `uid` VARCHAR(36) NOT NULL,
+  `institution` INT(1) NULL COMMENT '企业研发机构',
+  `activity` INT(1) NULL COMMENT '研发活动',
+  `activity_cost` INT(1) NULL COMMENT '研发活动费用详情',
+  `tech_project` INT(1) NULL COMMENT '高新技术产品',
+  `intellectual_property` INT(1) NULL COMMENT '知识产权',
+  `achievement` INT(1) NULL COMMENT '科技成果转化',
+  `ratepay` INT(1) NULL COMMENT '企业所得税纳税申报表',
+  `finance` INT(1) NULL COMMENT '财务报表',
+  `human_resource` INT(1) NULL COMMENT '企业人员情况',
+  `honor_datum` INT(1) NULL COMMENT '企业荣誉及其他证明材料',
+  `standard` INT(1) NULL COMMENT '标准制定情况',
+  `ability` INT(1) NULL COMMENT '企业创新能力',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '高企培育进度权重表';
+
 
 

+ 59 - 24
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -50,6 +50,7 @@ import com.goafanti.cognizance.service.OrgActivityCostService;
 import com.goafanti.cognizance.service.OrgActivityService;
 import com.goafanti.cognizance.service.OrgAnnualReportService;
 import com.goafanti.cognizance.service.OrgCognizanceLogService;
+import com.goafanti.cognizance.service.OrgCognizanceProportionService;
 import com.goafanti.cognizance.service.OrgCognizanceService;
 import com.goafanti.cognizance.service.OrgFinanceService;
 import com.goafanti.cognizance.service.OrgHonorDatumService;
@@ -179,11 +180,28 @@ public class AdminApiController extends CertifyApiController {
 	private PatentInfoService				patentInfoService;
 	@Resource
 	private CopyrightInfoService			copyrightInfoService;
-
+	@Resource
+	private OrgCognizanceProportionService orgCognizanceProportionService;
+	
 	/**
-	 * 
+	 * 高企培育资料完成情况(比重)
+	 * @param uid
+	 * @return
 	 */
+	@RequestMapping(value = "/proportion", method = RequestMethod.GET)
+	public Result proportion(String uid){
+		Result res = new Result();
+		if (StringUtils.isBlank(uid)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户ID"));
+			return res;
+		}
+		res.setData(orgCognizanceProportionService.selectByUid(uid));
+		return res;
+	}
 
+	/**
+	 * 管理员角色
+	 */
 	@RequestMapping(value = "/role", method = RequestMethod.GET)
 	public Result getRole(String uid) {
 		Result res = new Result();
@@ -1284,7 +1302,7 @@ public class AdminApiController extends CertifyApiController {
 			fileName = pi.getPatentWritingDownloadFileName();
 			downloadUrl = pi.getPatentWritingUrl();
 		} else if (IntellectualPropertyType.COPYRIGHT.getCode() == type) {
-			CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(id);
+			CopyrightInfoDetail ci = copyrightInfoService.findByPrimaryKey(olp.getPid());
 			if (null == ci) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "知识产权ID及TYPE"));
 				return res;
@@ -1641,7 +1659,7 @@ public class AdminApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/activityCostList", method = RequestMethod.POST)
 	public Result activityCostList(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
-			String pageNo, String pageSize, String uid) throws ParseException {
+			String pageNo, String pageSize, String uid, Integer year) throws ParseException {
 		Result res = new Result();
 
 		if (StringUtils.isBlank(uid)) {
@@ -1661,7 +1679,7 @@ public class AdminApiController extends CertifyApiController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		res.setData(orgActivityCostService.listOrgActivityCost(activityNumber, startDateFormattedDate,
-				endDateFormattedDate, pNo, pSize, uid));
+				endDateFormattedDate, pNo, pSize, uid, year));
 		return res;
 	}
 
@@ -1687,6 +1705,16 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(orgActivityCost.getAid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到研发活动", "研发活动ID"));
+			return res;
+		}
+
+		if (null == orgActivityCost.getYear()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到年份", "年份"));
+			return res;
+		}
+
 		if (!checkCertify(res, orgActivityCost.getUid()).getError().isEmpty()) {
 			return res;
 		}
@@ -1694,6 +1722,8 @@ public class AdminApiController extends CertifyApiController {
 			try {
 				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业填报人签字日期"));
+				return res;
 			}
 		}
 
@@ -1701,16 +1731,31 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(orgActivityCost, oac);
 
 		if (StringUtils.isBlank(oac.getId())) {
-			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(), oac.getUid())) {
-				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
+			if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
 				return res;
 			}
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
-			oac.setStartDate(null == ac.getStartDate() ? null : ac.getStartDate());
-			oac.setEndDate(null == ac.getEndDate() ? null : ac.getEndDate());
-			oac.setId(UUID.randomUUID().toString());
-			oac.setDeletedSign(0);
-			orgActivityCostService.insert(oac);
+			if (null != ac) {
+				Calendar c = Calendar.getInstance();
+				c.setTime(ac.getStartDate());
+				Integer s = c.get(Calendar.YEAR);
+				c.setTime(ac.getEndDate());
+				Integer e = c.get(Calendar.YEAR);
+				if (oac.getYear() < s || oac.getYear() > e) {
+					res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
+					return res;
+				}
+
+				oac.setStartDate(null == ac.getStartDate() ? null : ac.getStartDate());
+				oac.setEndDate(null == ac.getEndDate() ? null : ac.getEndDate());
+				oac.setId(UUID.randomUUID().toString());
+				oac.setDeletedSign(0);
+				orgActivityCostService.insert(oac);
+			} else {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到研发活动", "研发活动ID"));
+				return res;
+			}
 		} else {
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
@@ -2026,6 +2071,7 @@ public class AdminApiController extends CertifyApiController {
 
 	/**
 	 * 财务报表详情(获取同年度纳税申报表重复数据)
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/financeDetail", method = RequestMethod.GET)
@@ -3312,17 +3358,6 @@ public class AdminApiController extends CertifyApiController {
 	 * null){ flag = true; } } }
 	 */
 
-	/*
-	 * 高企相关材料上传
-	 * 
-	 * @RequestMapping(value = "/upload", method = RequestMethod.POST) public
-	 * Result cognizanceFile(HttpServletRequest req, String sign, String uid) {
-	 * Result res = new Result();
-	 * 
-	 * if (StringUtils.isBlank(uid)) {
-	 * res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户",
-	 * "用户")); return res; } res.setData(handleFiles(res, "/cognizance/", true,
-	 * req, sign, uid)); return res; }
-	 */
+
 
 }

+ 2 - 1
src/main/java/com/goafanti/cognizance/bo/CognizanceDetailBo.java

@@ -382,7 +382,8 @@ public class CognizanceDetailBo {
 	public void setAccident(Integer accident) {
 		this.accident = accident;
 	}
-
+	
+	@JsonFormat(shape = Shape.STRING)
 	public Integer getLargeOrder() {
 		return largeOrder;
 	}

+ 14 - 0
src/main/java/com/goafanti/cognizance/bo/InputOrgActivityCost.java

@@ -19,6 +19,10 @@ public class InputOrgActivityCost {
 	
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		uid;
+	
+	@Max(value = 3000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 2000, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer year;
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		activityNumber;
@@ -100,6 +104,16 @@ public class InputOrgActivityCost {
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+	
+	
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
 
 	public String getActivityNumber() {
 		return activityNumber;

+ 2 - 2
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1330,7 +1330,7 @@ public class CognizanceApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/activityCostList", method = RequestMethod.POST)
 	public Result activityCostList(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
-			String pageNo, String pageSize) throws ParseException {
+			String pageNo, String pageSize, Integer year) throws ParseException {
 		Result res = new Result();
 
 		if (!checkUserLogin(res)) {
@@ -1346,7 +1346,7 @@ public class CognizanceApiController extends CertifyApiController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		res.setData(orgActivityCostService.listOrgActivityCost(activityNumber, startDateFormattedDate,
-				endDateFormattedDate, pNo, pSize, TokenManager.getUserId()));
+				endDateFormattedDate, pNo, pSize, TokenManager.getUserId(), year));
 		return res;
 	}
 

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

@@ -9,7 +9,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 public interface OrgActivityCostService {
 
 	Pagination<OrgActivityCost> listOrgActivityCost(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
-			Integer pNo, Integer pSize, String userId) throws ParseException;
+			Integer pNo, Integer pSize, String userId, Integer year) throws ParseException;
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
@@ -25,4 +25,6 @@ public interface OrgActivityCostService {
 
 	OrgActivityCost selectByPrimaryKey(String id);
 
+	OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year);
+
 }

+ 9 - 0
src/main/java/com/goafanti/cognizance/service/OrgCognizanceProportionService.java

@@ -0,0 +1,9 @@
+package com.goafanti.cognizance.service;
+
+import com.goafanti.common.model.OrgCognizanceProportion;
+
+public interface OrgCognizanceProportionService {
+
+	OrgCognizanceProportion selectByUid(String uid);
+
+}

+ 11 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -25,7 +25,7 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OrgActivityCost> listOrgActivityCost(String activityNumber, String sDate,
-			String eDate, Integer pageNo, Integer pageSize, String uid) throws ParseException {
+			String eDate, Integer pageNo, Integer pageSize, String uid, Integer year) throws ParseException {
 		Map<String, Object> params = new HashMap<>();
 		
 		Date startDate = null;
@@ -35,6 +35,10 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 			params.put("activityNumber", activityNumber);
 		}
 		
+		if (year != null){
+			params.put("year", year);
+		}
+		
 		if (!StringUtils.isBlank(sDate)){
 			startDate = DateUtils.parseDate(sDate, AFTConstants.YYYYMMDD);
 			params.put("startDate", startDate);
@@ -102,4 +106,10 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 	public OrgActivityCost selectByPrimaryKey(String id) {
 		return orgActivityCostMapper.selectByPrimaryKey(id);
 	}
+
+
+	@Override
+	public OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year) {
+		return orgActivityCostMapper.selectOrgActivityCostByAidAndYear(aid, year);
+	}
 }

+ 19 - 0
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceProportionServiceImpl.java

@@ -0,0 +1,19 @@
+package com.goafanti.cognizance.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.cognizance.service.OrgCognizanceProportionService;
+import com.goafanti.common.dao.OrgCognizanceProportionMapper;
+import com.goafanti.common.model.OrgCognizanceProportion;
+@Service
+public class OrgCognizanceProportionServiceImpl implements OrgCognizanceProportionService{
+	@Autowired
+	private OrgCognizanceProportionMapper orgCognizanceProportionMapper;
+
+	@Override
+	public OrgCognizanceProportion selectByUid(String uid) {
+		return orgCognizanceProportionMapper.selectByUid(uid);
+	}
+
+}

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgActivityCostMapper.java

@@ -24,4 +24,6 @@ public interface OrgActivityCostMapper {
 	int batchDeleteByAid(List<String> aid);
 
 	OrgActivityCost selectOrgActivityCostByUidAndAid(String aid, String uid);
+
+	OrgActivityCost selectOrgActivityCostByAidAndYear(String aid, Integer year);
 }

+ 19 - 0
src/main/java/com/goafanti/common/dao/OrgCognizanceProportionMapper.java

@@ -0,0 +1,19 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrgCognizanceProportion;
+
+public interface OrgCognizanceProportionMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrgCognizanceProportion record);
+
+    int insertSelective(OrgCognizanceProportion record);
+
+    OrgCognizanceProportion selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrgCognizanceProportion record);
+
+    int updateByPrimaryKey(OrgCognizanceProportion record);
+
+	OrgCognizanceProportion selectByUid(String uid);
+}

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

@@ -5,6 +5,7 @@
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="aid" property="aid" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="year" property="year" jdbcType="INTEGER" />
     <result column="activity_number" property="activityNumber" jdbcType="VARCHAR" />
     <result column="internal_labor_cost" property="internalLaborCost" jdbcType="DECIMAL" />
     <result column="internal_direct_cost" property="internalDirectCost" jdbcType="DECIMAL" />
@@ -24,7 +25,7 @@
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, aid, uid, activity_number, internal_labor_cost, internal_direct_cost, internal_depreciation_cost, 
+    id, aid, uid, year, activity_number, internal_labor_cost, internal_direct_cost, internal_depreciation_cost, 
     internal_amortization_cost, internal_design_cost, internal_equipment_cost, internal_other_cost, 
     external_total_cost, external_abroad_cost, enterprise_filler, sign_date, sort_number, 
     start_date, end_date, account_url, deleted_sign
@@ -40,7 +41,7 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.OrgActivityCost" >
-    insert into org_activity_cost (id, aid, uid, 
+    insert into org_activity_cost (id, aid, uid, year,
       activity_number, internal_labor_cost, internal_direct_cost, 
       internal_depreciation_cost, internal_amortization_cost, 
       internal_design_cost, internal_equipment_cost, 
@@ -48,7 +49,7 @@
       enterprise_filler, sign_date, sort_number, 
       start_date, end_date, account_url, deleted_sign
       )
-    values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{year,jdbcType=INTEGER},
       #{activityNumber,jdbcType=VARCHAR}, #{internalLaborCost,jdbcType=DECIMAL}, #{internalDirectCost,jdbcType=DECIMAL}, 
       #{internalDepreciationCost,jdbcType=DECIMAL}, #{internalAmortizationCost,jdbcType=DECIMAL}, 
       #{internalDesignCost,jdbcType=DECIMAL}, #{internalEquipmentCost,jdbcType=DECIMAL}, 
@@ -69,6 +70,9 @@
       <if test="uid != null" >
         uid,
       </if>
+      <if test="year != null" >
+        year,
+      </if>
       <if test="activityNumber != null" >
         activity_number,
       </if>
@@ -131,7 +135,10 @@
       <if test="uid != null" >
         #{uid,jdbcType=VARCHAR},
       </if>
-      <if test="activityNumber != null" >
+      <if test="year != null" >
+        #{year,jdbcType=INTEGER},
+      </if>
+       <if test="activityNumber != null" >
         #{activityNumber,jdbcType=VARCHAR},
       </if>
       <if test="internalLaborCost != null" >
@@ -193,6 +200,9 @@
       <if test="uid != null" >
         uid = #{uid,jdbcType=VARCHAR},
       </if>
+      <if test="year != null" >
+        year = #{year,jdbcType=INTEGER},
+      </if>
       <if test="activityNumber != null" >
         activity_number = #{activityNumber,jdbcType=VARCHAR},
       </if>
@@ -251,6 +261,7 @@
     update org_activity_cost
     set aid = #{aid,jdbcType=VARCHAR},
       uid = #{uid,jdbcType=VARCHAR},
+      year = #{year,jdbcType=INTEGER},
       activity_number = #{activityNumber,jdbcType=VARCHAR},
       internal_labor_cost = #{internalLaborCost,jdbcType=DECIMAL},
       internal_direct_cost = #{internalDirectCost,jdbcType=DECIMAL},
@@ -279,6 +290,9 @@
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
+	<if test="year != null">
+		and year = #{year,jdbcType=INTEGER}
+	</if>
     <if test="activityNumber != null">
     	and  activity_number = #{activityNumber,jdbcType=VARCHAR}
     </if>
@@ -304,6 +318,9 @@
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
+	<if test="year != null">
+		and year = #{year,jdbcType=INTEGER}
+	</if>
     <if test="activityNumber != null">
     	and  activity_number = #{activityNumber,jdbcType=VARCHAR}
     </if>
@@ -347,4 +364,11 @@
     from org_activity_cost
     where aid = #{0} and uid = #{1} and deleted_sign = 0
   </select>
+  
+   <select id="selectOrgActivityCostByAidAndYear" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_activity_cost
+    where aid = #{0} and year = #{1} and deleted_sign = 0
+  </select>
 </mapper>

+ 206 - 0
src/main/java/com/goafanti/common/mapper/OrgCognizanceProportionMapper.xml

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.goafanti.common.dao.OrgCognizanceProportionMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgCognizanceProportion" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="institution" property="institution" jdbcType="INTEGER" />
+    <result column="activity" property="activity" jdbcType="INTEGER" />
+    <result column="activity_cost" property="activityCost" jdbcType="INTEGER" />
+    <result column="tech_project" property="techProject" jdbcType="INTEGER" />
+    <result column="intellectual_property" property="intellectualProperty" jdbcType="INTEGER" />
+    <result column="achievement" property="achievement" jdbcType="INTEGER" />
+    <result column="ratepay" property="ratepay" jdbcType="INTEGER" />
+    <result column="finance" property="finance" jdbcType="INTEGER" />
+    <result column="human_resource" property="humanResource" jdbcType="INTEGER" />
+    <result column="honor_datum" property="honorDatum" jdbcType="INTEGER" />
+    <result column="standard" property="standard" jdbcType="INTEGER" />
+    <result column="ability" property="ability" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, institution, activity, activity_cost, tech_project, intellectual_property, 
+    achievement, ratepay, finance, human_resource, honor_datum, standard, ability
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_cognizance_proportion
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from org_cognizance_proportion
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrgCognizanceProportion" >
+    insert into org_cognizance_proportion (id, uid, institution, 
+      activity, activity_cost, tech_project, 
+      intellectual_property, achievement, ratepay, 
+      finance, human_resource, honor_datum, 
+      standard, ability)
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{institution,jdbcType=INTEGER}, 
+      #{activity,jdbcType=INTEGER}, #{activityCost,jdbcType=INTEGER}, #{techProject,jdbcType=INTEGER}, 
+      #{intellectualProperty,jdbcType=INTEGER}, #{achievement,jdbcType=INTEGER}, #{ratepay,jdbcType=INTEGER}, 
+      #{finance,jdbcType=INTEGER}, #{humanResource,jdbcType=INTEGER}, #{honorDatum,jdbcType=INTEGER}, 
+      #{standard,jdbcType=INTEGER}, #{ability,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgCognizanceProportion" >
+    insert into org_cognizance_proportion
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="institution != null" >
+        institution,
+      </if>
+      <if test="activity != null" >
+        activity,
+      </if>
+      <if test="activityCost != null" >
+        activity_cost,
+      </if>
+      <if test="techProject != null" >
+        tech_project,
+      </if>
+      <if test="intellectualProperty != null" >
+        intellectual_property,
+      </if>
+      <if test="achievement != null" >
+        achievement,
+      </if>
+      <if test="ratepay != null" >
+        ratepay,
+      </if>
+      <if test="finance != null" >
+        finance,
+      </if>
+      <if test="humanResource != null" >
+        human_resource,
+      </if>
+      <if test="honorDatum != null" >
+        honor_datum,
+      </if>
+      <if test="standard != null" >
+        standard,
+      </if>
+      <if test="ability != null" >
+        ability,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null" >
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="institution != null" >
+        #{institution,jdbcType=INTEGER},
+      </if>
+      <if test="activity != null" >
+        #{activity,jdbcType=INTEGER},
+      </if>
+      <if test="activityCost != null" >
+        #{activityCost,jdbcType=INTEGER},
+      </if>
+      <if test="techProject != null" >
+        #{techProject,jdbcType=INTEGER},
+      </if>
+      <if test="intellectualProperty != null" >
+        #{intellectualProperty,jdbcType=INTEGER},
+      </if>
+      <if test="achievement != null" >
+        #{achievement,jdbcType=INTEGER},
+      </if>
+      <if test="ratepay != null" >
+        #{ratepay,jdbcType=INTEGER},
+      </if>
+      <if test="finance != null" >
+        #{finance,jdbcType=INTEGER},
+      </if>
+      <if test="humanResource != null" >
+        #{humanResource,jdbcType=INTEGER},
+      </if>
+      <if test="honorDatum != null" >
+        #{honorDatum,jdbcType=INTEGER},
+      </if>
+      <if test="standard != null" >
+        #{standard,jdbcType=INTEGER},
+      </if>
+      <if test="ability != null" >
+        #{ability,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrgCognizanceProportion" >
+    update org_cognizance_proportion
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="institution != null" >
+        institution = #{institution,jdbcType=INTEGER},
+      </if>
+      <if test="activity != null" >
+        activity = #{activity,jdbcType=INTEGER},
+      </if>
+      <if test="activityCost != null" >
+        activity_cost = #{activityCost,jdbcType=INTEGER},
+      </if>
+      <if test="techProject != null" >
+        tech_project = #{techProject,jdbcType=INTEGER},
+      </if>
+      <if test="intellectualProperty != null" >
+        intellectual_property = #{intellectualProperty,jdbcType=INTEGER},
+      </if>
+      <if test="achievement != null" >
+        achievement = #{achievement,jdbcType=INTEGER},
+      </if>
+      <if test="ratepay != null" >
+        ratepay = #{ratepay,jdbcType=INTEGER},
+      </if>
+      <if test="finance != null" >
+        finance = #{finance,jdbcType=INTEGER},
+      </if>
+      <if test="humanResource != null" >
+        human_resource = #{humanResource,jdbcType=INTEGER},
+      </if>
+      <if test="honorDatum != null" >
+        honor_datum = #{honorDatum,jdbcType=INTEGER},
+      </if>
+      <if test="standard != null" >
+        standard = #{standard,jdbcType=INTEGER},
+      </if>
+      <if test="ability != null" >
+        ability = #{ability,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrgCognizanceProportion" >
+    update org_cognizance_proportion
+    set uid = #{uid,jdbcType=VARCHAR},
+      institution = #{institution,jdbcType=INTEGER},
+      activity = #{activity,jdbcType=INTEGER},
+      activity_cost = #{activityCost,jdbcType=INTEGER},
+      tech_project = #{techProject,jdbcType=INTEGER},
+      intellectual_property = #{intellectualProperty,jdbcType=INTEGER},
+      achievement = #{achievement,jdbcType=INTEGER},
+      ratepay = #{ratepay,jdbcType=INTEGER},
+      finance = #{finance,jdbcType=INTEGER},
+      human_resource = #{humanResource,jdbcType=INTEGER},
+      honor_datum = #{honorDatum,jdbcType=INTEGER},
+      standard = #{standard,jdbcType=INTEGER},
+      ability = #{ability,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="selectByUid" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_cognizance_proportion
+    where uid = #{uid,jdbcType=VARCHAR}
+  </select>
+</mapper>

+ 19 - 2
src/main/java/com/goafanti/common/model/OrgActivityCost.java

@@ -16,6 +16,11 @@ public class OrgActivityCost {
     private String aid;
 
     private String uid;
+    
+    /**
+     * 年份
+     */
+    private Integer year;
 
     /**
     * 项目编号
@@ -260,11 +265,21 @@ public class OrgActivityCost {
         this.deletedSign = deletedSign;
     }
     
-    public String getSignDateFormattedDate(){
+    
+    
+    public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public String getSignDateFormattedDate(){
     	if (this.signDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getSignDate(), AFTConstants.YYYYMMDD);
 		}
     }
     
@@ -272,6 +287,7 @@ public class OrgActivityCost {
     	
     }
     
+    @JsonIgnore
     public String getStartDateFormattedDate(){
 		if (this.startDate == null) {
 			return null;
@@ -284,6 +300,7 @@ public class OrgActivityCost {
 		
 	}
 	
+	@JsonIgnore
 	public String getEndDateFormattedDate(){
 		if (this.endDate == null) {
 			return null;

+ 179 - 0
src/main/java/com/goafanti/common/model/OrgCognizanceProportion.java

@@ -0,0 +1,179 @@
+package com.goafanti.common.model;
+
+public class OrgCognizanceProportion {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 企业研发机构
+    */
+    private Integer institution;
+
+    /**
+    * 研发活动
+    */
+    private Integer activity;
+
+    /**
+    * 研发活动费用详情
+    */
+    private Integer activityCost;
+
+    /**
+    * 高新技术产品
+    */
+    private Integer techProject;
+
+    /**
+    * 知识产权
+    */
+    private Integer intellectualProperty;
+
+    /**
+    * 科技成果转化
+    */
+    private Integer achievement;
+
+    /**
+    * 企业所得税纳税申报表
+    */
+    private Integer ratepay;
+
+    /**
+    * 财务报表
+    */
+    private Integer finance;
+
+    /**
+    * 企业人员情况
+    */
+    private Integer humanResource;
+
+    /**
+    * 企业荣誉及其他证明材料
+    */
+    private Integer honorDatum;
+
+    /**
+    * 标准制定情况
+    */
+    private Integer standard;
+
+    /**
+    * 企业创新能力
+    */
+    private Integer ability;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public Integer getInstitution() {
+        return institution;
+    }
+
+    public void setInstitution(Integer institution) {
+        this.institution = institution;
+    }
+
+    public Integer getActivity() {
+        return activity;
+    }
+
+    public void setActivity(Integer activity) {
+        this.activity = activity;
+    }
+
+    public Integer getActivityCost() {
+        return activityCost;
+    }
+
+    public void setActivityCost(Integer activityCost) {
+        this.activityCost = activityCost;
+    }
+
+    public Integer getTechProject() {
+        return techProject;
+    }
+
+    public void setTechProject(Integer techProject) {
+        this.techProject = techProject;
+    }
+
+    public Integer getIntellectualProperty() {
+        return intellectualProperty;
+    }
+
+    public void setIntellectualProperty(Integer intellectualProperty) {
+        this.intellectualProperty = intellectualProperty;
+    }
+
+    public Integer getAchievement() {
+        return achievement;
+    }
+
+    public void setAchievement(Integer achievement) {
+        this.achievement = achievement;
+    }
+
+    public Integer getRatepay() {
+        return ratepay;
+    }
+
+    public void setRatepay(Integer ratepay) {
+        this.ratepay = ratepay;
+    }
+
+    public Integer getFinance() {
+        return finance;
+    }
+
+    public void setFinance(Integer finance) {
+        this.finance = finance;
+    }
+
+    public Integer getHumanResource() {
+        return humanResource;
+    }
+
+    public void setHumanResource(Integer humanResource) {
+        this.humanResource = humanResource;
+    }
+
+    public Integer getHonorDatum() {
+        return honorDatum;
+    }
+
+    public void setHonorDatum(Integer honorDatum) {
+        this.honorDatum = honorDatum;
+    }
+
+    public Integer getStandard() {
+        return standard;
+    }
+
+    public void setStandard(Integer standard) {
+        this.standard = standard;
+    }
+
+    public Integer getAbility() {
+        return ability;
+    }
+
+    public void setAbility(Integer ability) {
+        this.ability = ability;
+    }
+}

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

@@ -120,6 +120,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			u.setId(orgIdentity.getUid());
 			u.setLvl(1);
 			userMapper.updateByPrimaryKeySelective(u);
+			
 
 			Calendar cal = Calendar.getInstance();
 			if (null != orgIdentity.getLastYearTaxReportUrl()