Forráskód Böngészése

Accept Merge Request #46 debug : (master -> test)

Merge Request: debug
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/46
Antiloveg 9 éve%!(EXTRA string=óta)
szülő
commit
74dc4cdf62
27 módosított fájl, 1861 hozzáadás és 231 törlés
  1. 98 45
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 2 2
      src/main/java/com/goafanti/common/controller/BaseController.java
  3. 17 0
      src/main/java/com/goafanti/common/dao/OrgActivityMapper.java
  4. 18 0
      src/main/java/com/goafanti/common/dao/OrgStandardMapper.java
  5. 446 0
      src/main/java/com/goafanti/common/mapper/OrgActivityMapper.xml
  6. 21 21
      src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml
  7. 171 0
      src/main/java/com/goafanti/common/mapper/OrgStandardMapper.xml
  8. 1 65
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  9. 1 1
      src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml
  10. 53 4
      src/main/java/com/goafanti/common/mapper/UserAbilityMapper.xml
  11. 71 5
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  12. 415 0
      src/main/java/com/goafanti/common/model/OrgActivity.java
  13. 17 15
      src/main/java/com/goafanti/common/model/OrgHumanResource.java
  14. 105 0
      src/main/java/com/goafanti/common/model/OrgStandard.java
  15. 56 0
      src/main/java/com/goafanti/common/model/UserAbility.java
  16. 123 0
      src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java
  17. 17 0
      src/main/java/com/goafanti/techservice/cognizance/service/OrgActivityService.java
  18. 15 0
      src/main/java/com/goafanti/techservice/cognizance/service/OrgStandardService.java
  19. 76 0
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgActivityServiceImpl.java
  20. 68 0
      src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgStandardServiceImpl.java
  21. 2 2
      src/main/java/com/goafanti/user/controller/UserApiController.java
  22. 1 1
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  23. 1 5
      src/main/java/com/goafanti/user/service/OrganizationIdentityService.java
  24. 7 5
      src/main/java/com/goafanti/user/service/UserService.java
  25. 2 58
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  26. 56 1
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java
  27. 1 1
      src/main/resources/spring/spring-shiro.xml

+ 98 - 45
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -13,11 +13,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.OrgHumanResource;
+import com.goafanti.common.model.OrgStandard;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.techservice.cognizance.service.OrgStandardService;
 import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.service.OrgHumanResourceService;
@@ -29,17 +30,16 @@ import com.goafanti.user.service.UserService;
 @RequestMapping(value = "/api/admin")
 public class AdminApiController extends BaseApiController {
 	@Resource
-	private UserService			userService;
+	private UserService					userService;
 	@Resource
-	private UserIdentityService	userIdentityService;
+	private UserIdentityService			userIdentityService;
 	@Resource
-	private OrganizationIdentityService organizationIdentityService;
+	private OrganizationIdentityService	organizationIdentityService;
 	@Resource
-	private OrgHumanResourceService			orgHumanResourceService;
-	
-	
-	
-	
+	private OrgHumanResourceService		orgHumanResourceService;
+	@Resource
+	private OrgStandardService	orgStandardService;
+
 	/**
 	 * 个人用户列表
 	 * 
@@ -69,9 +69,10 @@ public class AdminApiController extends BaseApiController {
 		res.setData(getUserList(mobile, email, createTime, number, aftUsername, auditStatus, pNo, pSize));
 		return res;
 	}
-    
+
 	/**
 	 * 个人用户信息明细
+	 * 
 	 * @param uid
 	 * @return
 	 */
@@ -81,34 +82,36 @@ public class AdminApiController extends BaseApiController {
 		res.setData(userIdentityService.selectUserIdentityByUserId(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 修改个人用户信息
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "updateUserDetail", method = RequestMethod.POST)
-	public Result updateUserDetail(UserIdentity userIdentity){
+	public Result updateUserDetail(UserIdentity userIdentity) {
 		Result res = new Result();
 		res.setData(userIdentityService.updateByPrimaryKeySelective(userIdentity));
 		return res;
 	}
-	
-    /**
-     * 团体用户列表
-     * @param mobile
-     * @param email
-     * @param createTime
-     * @param number
-     * @param auditStatus
-     * @param pageNo
-     * @param pageSize
-     * @return
-     * @throws ParseException
-     */
+
+	/**
+	 * 团体用户列表
+	 * 
+	 * @param mobile
+	 * @param email
+	 * @param createTime
+	 * @param number
+	 * @param auditStatus
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 * @throws ParseException
+	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.POST)
 	public Result orgList(String mobile, String email,
 			@RequestParam(name = "createTime[]", required = false) String[] createTime, Integer number,
-			Integer auditStatus, String pageNo, String pageSize) throws ParseException {
+			String aftUsername, Integer auditStatus, String pageNo, String pageSize) throws ParseException {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -118,76 +121,126 @@ public class AdminApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(getOrgList(mobile, email, createTime, number, auditStatus, pNo, pSize));
+		res.setData(getOrgList(mobile, email, createTime, number, aftUsername, auditStatus, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 团体用户明细
+	 * 
 	 * @param uid
 	 * @return
 	 */
-	@RequestMapping(value="/orgDetail", method = RequestMethod.POST)
-	public Result orgDetail(String uid){
+	@RequestMapping(value = "/orgDetail", method = RequestMethod.POST)
+	public Result orgDetail(String uid) {
 		Result res = new Result();
 		res.setData(organizationIdentityService.selectOrgIdentityByUserId(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 修改团体用户信息
+	 * 
 	 * @param orgIdentity
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrgDetail", method = RequestMethod.POST)
-	public Result updateOrgDetail(OrganizationIdentity orgIdentity){
+	public Result updateOrgDetail(OrganizationIdentity orgIdentity) {
 		Result res = new Result();
 		res.setData(organizationIdentityService.updateByPrimaryKeySelective(orgIdentity));
 		return res;
 	}
-	
+
 	/**
 	 * 团体用户人力资源情况入口
-	 * @param uid 用户ID
+	 * 
+	 * @param uid
+	 *            用户ID
 	 * @return
 	 */
 	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
-	public Result orgHumanResource(String uid){
+	public Result orgHumanResource(String uid) {
 		Result res = new Result();
 		res.setData(orgHumanResourceService.selectOrgHumanResourceByUserId(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 修改团体用户人力资源情况
+	 * 
 	 * @param orgHumanResource
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrgHumanResource", method = RequestMethod.POST)
-	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource){
+	public Result updateOrgHumanResource(OrgHumanResource orgHumanResource) {
 		Result res = new Result();
 		OrgHumanResource org = orgHumanResourceService.selectOrgHumanResourceByUserId(orgHumanResource.getUid());
-		if (null == org){
+		if (null == org) {
 			orgHumanResource.setId(UUID.randomUUID().toString());
 			orgHumanResourceService.insert(orgHumanResource);
 		} else {
 			orgHumanResourceService.updateByPrimaryKeySelective(orgHumanResource);
 		}
-		res.setData(orgHumanResource); 
+		res.setData(orgHumanResource);
 		return res;
 	}
-    
+
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细入口
+	 * 
+	 * @param uid
+	 *            用户id
+	 * @return
+	 */
+	@RequestMapping(value = "/standard", method = RequestMethod.POST)
+	public Result standard(String uid, String standardName, String standardNumber, Integer standardLevel,
+			Integer participateWay, String pageNo, String pageSize) {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
+				pSize, uid));
+
+		return res;
+	}
+	
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细修改保存
+	 * @param orgStandard
+	 * @return
+	 */
+	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
+	public Result developStandard(OrgStandard orgStandard){
+		Result res = new Result();
+		if (StringUtils.isBlank(orgStandard.getId())){
+			orgStandard.setId(UUID.randomUUID().toString());
+			orgStandardService.insert(orgStandard);
+		} else {
+			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+		}
+		res.setData(orgStandard);	
+		return res;
+	}
+	
+	
+
 	// org团体列表
-	private Pagination<OrgListBo> getOrgList(String mobile, String email, String[] createTime, Integer number, Integer auditStatus,
-			Integer pNo, Integer pSize) throws ParseException {
-		return (Pagination<OrgListBo>) organizationIdentityService.listOrg(mobile, email, createTime, number, 
+	private Pagination<OrgListBo> getOrgList(String mobile, String email, String[] createTime, Integer number,
+			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
+		return (Pagination<OrgListBo>) userService.listOrg(mobile, email, createTime, number, aftUsername,
 				auditStatus, pNo, pSize);
 	}
 
 	// user个人列表
 	private Pagination<UserListBo> getUserList(String mobile, String email, String[] createTime, Integer number,
 			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException {
-		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, aftUsername, auditStatus, pNo,
-				pSize);
+		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, aftUsername,
+				auditStatus, pNo, pSize);
 	}
 }

+ 2 - 2
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -94,7 +94,7 @@ public class BaseController {
 			model.addAttribute("userData", TokenManager.getToken() );
 		}
 		
-		model.addAttribute("accessKey",accessKey);
-		model.addAttribute("accessSecret",accessSecret);
+		/*model.addAttribute("accessKey",accessKey);
+		model.addAttribute("accessSecret",accessSecret);*/
 	}
 }

+ 17 - 0
src/main/java/com/goafanti/common/dao/OrgActivityMapper.java

@@ -0,0 +1,17 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrgActivity;
+
+public interface OrgActivityMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrgActivity record);
+
+    int insertSelective(OrgActivity record);
+
+    OrgActivity selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrgActivity record);
+
+    int updateByPrimaryKey(OrgActivity record);
+}

+ 18 - 0
src/main/java/com/goafanti/common/dao/OrgStandardMapper.java

@@ -0,0 +1,18 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OrgStandard;
+
+public interface OrgStandardMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrgStandard record);
+
+    int insertSelective(OrgStandard record);
+
+    OrgStandard selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(OrgStandard record);
+
+    int updateByPrimaryKey(OrgStandard record);
+
+}

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

@@ -0,0 +1,446 @@
+<?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.OrgActivityMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgActivity" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="activity_number" property="activityNumber" jdbcType="VARCHAR" />
+    <result column="activity_name" property="activityName" jdbcType="VARCHAR" />
+    <result column="start_date" property="startDate" jdbcType="TIMESTAMP" />
+    <result column="end_date" property="endDate" jdbcType="TIMESTAMP" />
+    <result column="technical_field1" property="technicalField1" jdbcType="VARCHAR" />
+    <result column="technical_field2" property="technicalField2" jdbcType="VARCHAR" />
+    <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="implement" property="implement" jdbcType="VARCHAR" />
+    <result column="technology_innovation" property="technologyInnovation" jdbcType="VARCHAR" />
+    <result column="achievement" property="achievement" 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="enterprise_filler" property="enterpriseFiller" jdbcType="VARCHAR" />
+    <result column="sign_date" property="signDate" jdbcType="TIMESTAMP" />
+    <result column="sort_number" property="sortNumber" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, activity_number, activity_name, start_date, end_date, technical_field1, 
+    technical_field2, technical_field3, technical_source, intellectual_property_number, 
+    budget, first_year_expenditure, second_year_expenditure, third_year_expenditure, 
+    implement, technology_innovation, achievement, 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
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_activity
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from org_activity
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrgActivity" >
+    insert into org_activity (id, uid, activity_number, 
+      activity_name, start_date, end_date, 
+      technical_field1, technical_field2, technical_field3, 
+      technical_source, intellectual_property_number, 
+      budget, first_year_expenditure, second_year_expenditure, 
+      third_year_expenditure, implement, technology_innovation, 
+      achievement, 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
+      )
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{activityNumber,jdbcType=VARCHAR}, 
+      #{activityName,jdbcType=VARCHAR}, #{startDate,jdbcType=TIMESTAMP}, #{endDate,jdbcType=TIMESTAMP}, 
+      #{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}, 
+      #{achievement,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}, 
+      #{enterpriseFiller,jdbcType=VARCHAR}, #{signDate,jdbcType=TIMESTAMP}, #{sortNumber,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgActivity" >
+    insert into org_activity
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="activityNumber != null" >
+        activity_number,
+      </if>
+      <if test="activityName != null" >
+        activity_name,
+      </if>
+      <if test="startDate != null" >
+        start_date,
+      </if>
+      <if test="endDate != null" >
+        end_date,
+      </if>
+      <if test="technicalField1 != null" >
+        technical_field1,
+      </if>
+      <if test="technicalField2 != null" >
+        technical_field2,
+      </if>
+      <if test="technicalField3 != null" >
+        technical_field3,
+      </if>
+      <if test="technicalSource != null" >
+        technical_source,
+      </if>
+      <if test="intellectualPropertyNumber != null" >
+        intellectual_property_number,
+      </if>
+      <if test="budget != null" >
+        budget,
+      </if>
+      <if test="firstYearExpenditure != null" >
+        first_year_expenditure,
+      </if>
+      <if test="secondYearExpenditure != null" >
+        second_year_expenditure,
+      </if>
+      <if test="thirdYearExpenditure != null" >
+        third_year_expenditure,
+      </if>
+      <if test="implement != null" >
+        implement,
+      </if>
+      <if test="technologyInnovation != null" >
+        technology_innovation,
+      </if>
+      <if test="achievement != null" >
+        achievement,
+      </if>
+      <if test="internalLaborCost != null" >
+        internal_labor_cost,
+      </if>
+      <if test="internalDirectCost != null" >
+        internal_direct_cost,
+      </if>
+      <if test="internalDepreciationCost != null" >
+        internal_depreciation_cost,
+      </if>
+      <if test="internalAmortizationCost != null" >
+        internal_amortization_cost,
+      </if>
+      <if test="internalDesignCost != null" >
+        internal_design_cost,
+      </if>
+      <if test="internalEquipmentCost != null" >
+        internal_equipment_cost,
+      </if>
+      <if test="internalOtherCost != null" >
+        internal_other_cost,
+      </if>
+      <if test="externalTotalCost != null" >
+        external_total_cost,
+      </if>
+      <if test="externalAbroadCost != null" >
+        external_abroad_cost,
+      </if>
+      <if test="enterpriseFiller != null" >
+        enterprise_filler,
+      </if>
+      <if test="signDate != null" >
+        sign_date,
+      </if>
+      <if test="sortNumber != null" >
+        sort_number,
+      </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="activityNumber != null" >
+        #{activityNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="activityName != null" >
+        #{activityName,jdbcType=VARCHAR},
+      </if>
+      <if test="startDate != null" >
+        #{startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endDate != null" >
+        #{endDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="technicalField1 != null" >
+        #{technicalField1,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalField2 != null" >
+        #{technicalField2,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalField3 != null" >
+        #{technicalField3,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalSource != null" >
+        #{technicalSource,jdbcType=INTEGER},
+      </if>
+      <if test="intellectualPropertyNumber != null" >
+        #{intellectualPropertyNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="budget != null" >
+        #{budget,jdbcType=INTEGER},
+      </if>
+      <if test="firstYearExpenditure != null" >
+        #{firstYearExpenditure,jdbcType=INTEGER},
+      </if>
+      <if test="secondYearExpenditure != null" >
+        #{secondYearExpenditure,jdbcType=INTEGER},
+      </if>
+      <if test="thirdYearExpenditure != null" >
+        #{thirdYearExpenditure,jdbcType=INTEGER},
+      </if>
+      <if test="implement != null" >
+        #{implement,jdbcType=VARCHAR},
+      </if>
+      <if test="technologyInnovation != null" >
+        #{technologyInnovation,jdbcType=VARCHAR},
+      </if>
+      <if test="achievement != null" >
+        #{achievement,jdbcType=VARCHAR},
+      </if>
+      <if test="internalLaborCost != null" >
+        #{internalLaborCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalDirectCost != null" >
+        #{internalDirectCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalDepreciationCost != null" >
+        #{internalDepreciationCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalAmortizationCost != null" >
+        #{internalAmortizationCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalDesignCost != null" >
+        #{internalDesignCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalEquipmentCost != null" >
+        #{internalEquipmentCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalOtherCost != null" >
+        #{internalOtherCost,jdbcType=INTEGER},
+      </if>
+      <if test="externalTotalCost != null" >
+        #{externalTotalCost,jdbcType=INTEGER},
+      </if>
+      <if test="externalAbroadCost != null" >
+        #{externalAbroadCost,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseFiller != null" >
+        #{enterpriseFiller,jdbcType=VARCHAR},
+      </if>
+      <if test="signDate != null" >
+        #{signDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sortNumber != null" >
+        #{sortNumber,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrgActivity" >
+    update org_activity
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="activityNumber != null" >
+        activity_number = #{activityNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="activityName != null" >
+        activity_name = #{activityName,jdbcType=VARCHAR},
+      </if>
+      <if test="startDate != null" >
+        start_date = #{startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endDate != null" >
+        end_date = #{endDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="technicalField1 != null" >
+        technical_field1 = #{technicalField1,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalField2 != null" >
+        technical_field2 = #{technicalField2,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalField3 != null" >
+        technical_field3 = #{technicalField3,jdbcType=VARCHAR},
+      </if>
+      <if test="technicalSource != null" >
+        technical_source = #{technicalSource,jdbcType=INTEGER},
+      </if>
+      <if test="intellectualPropertyNumber != null" >
+        intellectual_property_number = #{intellectualPropertyNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="budget != null" >
+        budget = #{budget,jdbcType=INTEGER},
+      </if>
+      <if test="firstYearExpenditure != null" >
+        first_year_expenditure = #{firstYearExpenditure,jdbcType=INTEGER},
+      </if>
+      <if test="secondYearExpenditure != null" >
+        second_year_expenditure = #{secondYearExpenditure,jdbcType=INTEGER},
+      </if>
+      <if test="thirdYearExpenditure != null" >
+        third_year_expenditure = #{thirdYearExpenditure,jdbcType=INTEGER},
+      </if>
+      <if test="implement != null" >
+        implement = #{implement,jdbcType=VARCHAR},
+      </if>
+      <if test="technologyInnovation != null" >
+        technology_innovation = #{technologyInnovation,jdbcType=VARCHAR},
+      </if>
+      <if test="achievement != null" >
+        achievement = #{achievement,jdbcType=VARCHAR},
+      </if>
+      <if test="internalLaborCost != null" >
+        internal_labor_cost = #{internalLaborCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalDirectCost != null" >
+        internal_direct_cost = #{internalDirectCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalDepreciationCost != null" >
+        internal_depreciation_cost = #{internalDepreciationCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalAmortizationCost != null" >
+        internal_amortization_cost = #{internalAmortizationCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalDesignCost != null" >
+        internal_design_cost = #{internalDesignCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalEquipmentCost != null" >
+        internal_equipment_cost = #{internalEquipmentCost,jdbcType=INTEGER},
+      </if>
+      <if test="internalOtherCost != null" >
+        internal_other_cost = #{internalOtherCost,jdbcType=INTEGER},
+      </if>
+      <if test="externalTotalCost != null" >
+        external_total_cost = #{externalTotalCost,jdbcType=INTEGER},
+      </if>
+      <if test="externalAbroadCost != null" >
+        external_abroad_cost = #{externalAbroadCost,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseFiller != null" >
+        enterprise_filler = #{enterpriseFiller,jdbcType=VARCHAR},
+      </if>
+      <if test="signDate != null" >
+        sign_date = #{signDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sortNumber != null" >
+        sort_number = #{sortNumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrgActivity" >
+    update org_activity
+    set uid = #{uid,jdbcType=VARCHAR},
+      activity_number = #{activityNumber,jdbcType=VARCHAR},
+      activity_name = #{activityName,jdbcType=VARCHAR},
+      start_date = #{startDate,jdbcType=TIMESTAMP},
+      end_date = #{endDate,jdbcType=TIMESTAMP},
+      technical_field1 = #{technicalField1,jdbcType=VARCHAR},
+      technical_field2 = #{technicalField2,jdbcType=VARCHAR},
+      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},
+      implement = #{implement,jdbcType=VARCHAR},
+      technology_innovation = #{technologyInnovation,jdbcType=VARCHAR},
+      achievement = #{achievement,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},
+      enterprise_filler = #{enterpriseFiller,jdbcType=VARCHAR},
+      sign_date = #{signDate,jdbcType=TIMESTAMP},
+      sort_number = #{sortNumber,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <select id="findOrgActivityListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from org_activity
+    where 1=1
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+    <if test="activityNumber != null">
+    	and  activity_number = #{activityNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="activityName != null">
+    	and  activity_name= #{activityName,jdbcType=VARCHAR}
+    </if>
+    <if test="startDate != null">
+    	and  start_date <![CDATA[ > ]]> #{startDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate != null">
+    	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+  </select>
+  
+   <select id="findOrgActivityCount" resultType="java.lang.Integer" parameterType="String">
+  	 select count(1) from (
+  	 	 select 
+    <include refid="Base_Column_List" />
+    from org_activity
+    where 1=1
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+    <if test="activityNumber != null">
+    	and  activity_number = #{activityNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="activityName != null">
+    	and  activity_name= #{activityName,jdbcType=VARCHAR}
+    </if>
+    <if test="startDate != null">
+    	and  start_date <![CDATA[ > ]]> #{startDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate != null">
+    	and  end_date <![CDATA[ < ]]> #{endDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+    ) as total
+  </select>
+</mapper>

+ 21 - 21
src/main/java/com/goafanti/common/mapper/OrgHumanResourceMapper.xml

@@ -16,8 +16,8 @@
     <result column="tech_foreign" property="techForeign" jdbcType="INTEGER" />
     <result column="firm_abroad" property="firmAbroad" jdbcType="INTEGER" />
     <result column="tech_abroad" property="techAbroad" jdbcType="INTEGER" />
-    <result column="firm_thousands" property="firmThousands" jdbcType="INTEGER" />
-    <result column="tech_thousands" property="techThousands" jdbcType="INTEGER" />
+    <result column="firm_core" property="firmCore" jdbcType="INTEGER" />
+    <result column="tech_core" property="techCore" jdbcType="INTEGER" />
     <result column="doctor" property="doctor" jdbcType="INTEGER" />
     <result column="master" property="master" jdbcType="INTEGER" />
     <result column="undergraduate" property="undergraduate" jdbcType="INTEGER" />
@@ -34,7 +34,7 @@
   <sql id="Base_Column_List" >
     id, uid, firm_total, tech_total, firm_in_service, tech_in_service, firm_part_time, 
     tech_part_time, firm_temporary, tech_temporary, firm_foreign, tech_foreign, firm_abroad, 
-    tech_abroad, firm_thousands, tech_thousands, doctor, master, undergraduate, college, 
+    tech_abroad, firm_core, tech_core, doctor, master, undergraduate, college, 
     senior_title, intermediate_title, junior_title, senior_mechanic, below_thirty, 
     thirtyone_to_thirtyfour, fortyone_to_fifty, above_fifty
   </sql>
@@ -53,8 +53,8 @@
       tech_total, firm_in_service, tech_in_service, 
       firm_part_time, tech_part_time, firm_temporary, 
       tech_temporary, firm_foreign, tech_foreign, 
-      firm_abroad, tech_abroad, firm_thousands, 
-      tech_thousands, doctor, master, 
+      firm_abroad, tech_abroad, firm_core, 
+      tech_core, doctor, master, 
       undergraduate, college, senior_title, 
       intermediate_title, junior_title, senior_mechanic, 
       below_thirty, thirtyone_to_thirtyfour, fortyone_to_fifty, 
@@ -63,8 +63,8 @@
       #{techTotal,jdbcType=INTEGER}, #{firmInService,jdbcType=INTEGER}, #{techInService,jdbcType=INTEGER}, 
       #{firmPartTime,jdbcType=INTEGER}, #{techPartTime,jdbcType=INTEGER}, #{firmTemporary,jdbcType=INTEGER}, 
       #{techTemporary,jdbcType=INTEGER}, #{firmForeign,jdbcType=INTEGER}, #{techForeign,jdbcType=INTEGER}, 
-      #{firmAbroad,jdbcType=INTEGER}, #{techAbroad,jdbcType=INTEGER}, #{firmThousands,jdbcType=INTEGER}, 
-      #{techThousands,jdbcType=INTEGER}, #{doctor,jdbcType=INTEGER}, #{master,jdbcType=INTEGER}, 
+      #{firmAbroad,jdbcType=INTEGER}, #{techAbroad,jdbcType=INTEGER}, #{firmCore,jdbcType=INTEGER}, 
+      #{techCore,jdbcType=INTEGER}, #{doctor,jdbcType=INTEGER}, #{master,jdbcType=INTEGER}, 
       #{undergraduate,jdbcType=INTEGER}, #{college,jdbcType=INTEGER}, #{seniorTitle,jdbcType=INTEGER}, 
       #{intermediateTitle,jdbcType=INTEGER}, #{juniorTitle,jdbcType=INTEGER}, #{seniorMechanic,jdbcType=INTEGER}, 
       #{belowThirty,jdbcType=INTEGER}, #{thirtyoneToThirtyfour,jdbcType=INTEGER}, #{fortyoneToFifty,jdbcType=INTEGER}, 
@@ -115,11 +115,11 @@
       <if test="techAbroad != null" >
         tech_abroad,
       </if>
-      <if test="firmThousands != null" >
-        firm_thousands,
+      <if test="firmCore != null" >
+        firm_core,
       </if>
-      <if test="techThousands != null" >
-        tech_thousands,
+      <if test="techCore != null" >
+        tech_core,
       </if>
       <if test="doctor != null" >
         doctor,
@@ -201,11 +201,11 @@
       <if test="techAbroad != null" >
         #{techAbroad,jdbcType=INTEGER},
       </if>
-      <if test="firmThousands != null" >
-        #{firmThousands,jdbcType=INTEGER},
+      <if test="firmCore != null" >
+        #{firmCore,jdbcType=INTEGER},
       </if>
-      <if test="techThousands != null" >
-        #{techThousands,jdbcType=INTEGER},
+      <if test="techCore != null" >
+        #{techCore,jdbcType=INTEGER},
       </if>
       <if test="doctor != null" >
         #{doctor,jdbcType=INTEGER},
@@ -287,11 +287,11 @@
       <if test="techAbroad != null" >
         tech_abroad = #{techAbroad,jdbcType=INTEGER},
       </if>
-      <if test="firmThousands != null" >
-        firm_thousands = #{firmThousands,jdbcType=INTEGER},
+      <if test="firmCore != null" >
+        firm_core = #{firmCore,jdbcType=INTEGER},
       </if>
-      <if test="techThousands != null" >
-        tech_thousands = #{techThousands,jdbcType=INTEGER},
+      <if test="techCore != null" >
+        tech_core = #{techCore,jdbcType=INTEGER},
       </if>
       <if test="doctor != null" >
         doctor = #{doctor,jdbcType=INTEGER},
@@ -347,8 +347,8 @@
       tech_foreign = #{techForeign,jdbcType=INTEGER},
       firm_abroad = #{firmAbroad,jdbcType=INTEGER},
       tech_abroad = #{techAbroad,jdbcType=INTEGER},
-      firm_thousands = #{firmThousands,jdbcType=INTEGER},
-      tech_thousands = #{techThousands,jdbcType=INTEGER},
+      firm_core = #{firmCore,jdbcType=INTEGER},
+      tech_core = #{techCore,jdbcType=INTEGER},
       doctor = #{doctor,jdbcType=INTEGER},
       master = #{master,jdbcType=INTEGER},
       undergraduate = #{undergraduate,jdbcType=INTEGER},

+ 171 - 0
src/main/java/com/goafanti/common/mapper/OrgStandardMapper.xml

@@ -0,0 +1,171 @@
+<?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.OrgStandardMapper" >
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OrgStandard" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="standard_name" property="standardName" jdbcType="VARCHAR" />
+    <result column="standard_number" property="standardNumber" jdbcType="VARCHAR" />
+    <result column="standard_level" property="standardLevel" jdbcType="INTEGER" />
+    <result column="participate_way" property="participateWay" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, uid, standard_name, standard_number, standard_level, participate_way, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_standard
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from org_standard
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OrgStandard" >
+    insert into org_standard (id, uid, standard_name, 
+      standard_number, standard_level, participate_way, create_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{standardName,jdbcType=VARCHAR}, 
+      #{standardNumber,jdbcType=VARCHAR}, #{standardLevel,jdbcType=INTEGER}, #{participateWay,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgStandard" >
+    insert into org_standard
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="uid != null" >
+        uid,
+      </if>
+      <if test="standardName != null" >
+        standard_name,
+      </if>
+      <if test="standardNumber != null" >
+        standard_number,
+      </if>
+      <if test="standardLevel != null" >
+        standard_level,
+      </if>
+      <if test="participateWay != null" >
+        participate_way,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </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="standardName != null" >
+        #{standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="standardNumber != null" >
+        #{standardNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="standardLevel != null" >
+        #{standardLevel,jdbcType=INTEGER},
+      </if>
+      <if test="participateWay != null" >
+        #{participateWay,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrgStandard" >
+    update org_standard
+    <set >
+      <if test="uid != null" >
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="standardName != null" >
+        standard_name = #{standardName,jdbcType=VARCHAR},
+      </if>
+      <if test="standardNumber != null" >
+        standard_number = #{standardNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="standardLevel != null" >
+        standard_level = #{standardLevel,jdbcType=INTEGER},
+      </if>
+      <if test="participateWay != null" >
+        participate_way = #{participateWay,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OrgStandard" >
+    update org_standard
+    set uid = #{uid,jdbcType=VARCHAR},
+      standard_name = #{standardName,jdbcType=VARCHAR},
+      standard_number = #{standardNumber,jdbcType=VARCHAR},
+      standard_level = #{standardLevel,jdbcType=INTEGER},
+      participate_way = #{participateWay,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+   <select id="findOrgStandardListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from org_standard
+    where 1=1
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+    <if test="standardName != null">
+    	and  standard_name = #{standardName,jdbcType=VARCHAR}
+    </if>
+    <if test="standardNumber != null">
+    	and   standard_number= #{standardNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="standardLevel != null">
+    	and   standard_level= #{standardLevel,jdbcType=INTEGER}
+    </if>
+    <if test="participateWay != null">
+    	and   participate_way= #{participateWay,jdbcType=INTEGER}
+    </if>
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+  </select>
+  
+   <select id="findOrgStandardCount" resultType="java.lang.Integer" parameterType="String">
+   	select count(1) from (
+   		 select 
+    <include refid="Base_Column_List" />
+    from org_standard
+    where 1=1
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+    <if test="standardName != null">
+    	and  standard_name = #{standardName,jdbcType=VARCHAR}
+    </if>
+    <if test="standardNumber != null">
+    	and   standard_number= #{standardNumber,jdbcType=VARCHAR}
+    </if>
+    <if test="standardLevel != null">
+    	and   standard_level= #{standardLevel,jdbcType=INTEGER}
+    </if>
+    <if test="participateWay != null">
+    	and   participate_way= #{participateWay,jdbcType=INTEGER}
+    </if>
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+    )
+    as total
+    </select>
+</mapper>

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

@@ -535,69 +535,5 @@
     from organization_identity
   </select>
   
-   <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
-  	select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus
-    from user u LEFT JOIN organization_identity o 
-    ON u.id = o.uid 
-    WHERE u.type = 1
-    <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=Integer}
-	</if>
-	<if test="aftUsername != null">
-		and o.aft_username = #{aftUsername,jdbcType=VARCHAR}
-	</if>
-	<if test="auditStatus != null">
-		and o.audit_status= #{auditStatus,jdbcType=Integer}
-	</if>
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
-  </select>
-  
-  <select id="findOrgCount" resultType="java.lang.Integer" parameterType="String">
-  	select count(1) from (
-  		select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus
-    from user u LEFT JOIN organization_identity o 
-    ON u.id = o.uid 
-    WHERE u.type = 1
-    <if test = "mobile != null">
-	    and u.mobile = #{mobile,jdbcType=VARCHAR}
-	</if>
-	<if test = "email != null">
-	    and u.email = #{email,jdbcType=VARCHAR}
-	</if>
-	<if test = "pStart != null" >
-		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
-	</if>
-	<if test = "pEnd != null">
-		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
-	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=Integer}
-	</if>
-	<if test="aftUsername != null">
-		and o.aft_username = #{aftUsername,jdbcType=VARCHAR}
-	</if>
-	<if test="auditStatus != null">
-		and o.audit_status= #{auditStatus,jdbcType=Integer}
-	</if>
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
-	) as total
-  </select>  
+   
 </mapper>

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

@@ -511,7 +511,7 @@
 	    and p.author = #{author,jdbcType=VARCHAR}
 	</if>
 	<if test="locationProvince != null">
-	    and  o.location_province=#{locationProvince,jdbcType=VARCHAR}
+	    and  o.location_province = #{locationProvince,jdbcType=VARCHAR}
 	</if>
 	 order by p.create_time desc) x
 	 LEFT JOIN admin a on a.id = x.author

+ 53 - 4
src/main/java/com/goafanti/common/mapper/UserAbilityMapper.xml

@@ -5,9 +5,13 @@
     <id column="id" property="id" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="ability_label" property="abilityLabel" jdbcType="VARCHAR" />
+    <result column="intellect_right" property="intellectRight" jdbcType="VARCHAR" />
+    <result column="science_achievement" property="scienceAchievement" jdbcType="VARCHAR" />
+    <result column="research_innovation" property="researchInnovation" jdbcType="VARCHAR" />
+    <result column="personnel" property="personnel" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, uid, ability_label
+    id, uid, ability_label, intellect_right, science_achievement, research_innovation, personnel
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -20,9 +24,11 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.UserAbility" >
-    insert into user_ability (id, uid, ability_label
+    insert into user_ability (id, uid, ability_label, intellect_right, science_achievement, research_innovation, personnel
       )
-    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{abilityLabel,jdbcType=VARCHAR}
+    values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{abilityLabel,jdbcType=VARCHAR},
+    #{intellectRight,jdbcType=VARCHAR}, #{scienceAchievement,jdbcType=VARCHAR}, 
+    #{researchInnovation,jdbcType=VARCHAR}, #{personnel,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserAbility" >
@@ -37,6 +43,19 @@
       <if test="abilityLabel != null" >
         ability_label,
       </if>
+      
+      <if test="intellectRight != null" >
+        intellect_right,
+      </if>
+      <if test="scienceAchievement != null" >
+        science_achievement,
+      </if>
+      <if test="researchInnovation != null" >
+        research_innovation,
+      </if>
+      <if test="personnel != null" >
+        personnel,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -48,6 +67,19 @@
       <if test="abilityLabel != null" >
         #{abilityLabel,jdbcType=VARCHAR},
       </if>
+      
+      <if test="intellectRight != null" >
+        #{intellectRight,jdbcType=VARCHAR},
+      </if>
+      <if test="scienceAchievement != null" >
+        #{scienceAchievement,jdbcType=VARCHAR},
+      </if>
+      <if test="researchInnovation != null" >
+        #{researchInnovation,jdbcType=VARCHAR},
+      </if>
+      <if test="personnel != null" >
+        #{personnel,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserAbility" >
@@ -59,13 +91,30 @@
       <if test="abilityLabel != null" >
         ability_label = #{abilityLabel,jdbcType=VARCHAR},
       </if>
+      
+      <if test="intellectRight != null" >
+        intellect_right = #{intellectRight,jdbcType=VARCHAR},
+      </if>
+      <if test="scienceAchievement != null" >
+        science_achievement = #{scienceAchievement,jdbcType=VARCHAR},
+      </if>
+      <if test="researchInnovation != null" >
+        research_innovation = #{researchInnovation,jdbcType=VARCHAR},
+      </if>
+      <if test="personnel != null" >
+        personnel = #{personnel,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserAbility" >
     update user_ability
     set uid = #{uid,jdbcType=VARCHAR},
-      ability_label = #{abilityLabel,jdbcType=VARCHAR}
+      ability_label = #{abilityLabel,jdbcType=VARCHAR},
+      intellect_right = #{intellectRight,jdbcType=VARCHAR},
+      science_achievement = #{scienceAchievement,jdbcType=VARCHAR},
+      research_innovation = #{researchInnovation,jdbcType=VARCHAR},
+      personnel = #{personnel,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

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

@@ -203,13 +203,13 @@
 		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
 	</if>
 	<if test=" number != null">
-		and u.number = #{number,jdbcType=Integer}
+		and u.number = #{number,jdbcType=INTEGER}
 	</if>
 	<if test="aftUsername != null">
 		and i.aft_username = #{aftUsername,jdbcType=VARCHAR}
 	</if>
 	<if test="auditStatus != null">
-		and i.audit_status= #{auditStatus,jdbcType=Integer}
+		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="page_sql!=null">
 		${page_sql}
@@ -235,14 +235,80 @@
 	<if test = "pEnd != null">
 		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
 	</if>
-	<if test=" number != null">
-		and u.number = #{number,jdbcType=Integer}
+	<if test="number != null">
+		and u.number = #{number,jdbcType=INTEGER}
 	</if>
 	<if test="aftUsername != null">
 		and i.aft_username = #{aftUsername,jdbcType=VARCHAR}
 	</if>
 	<if test="auditStatus != null">
-		and i.audit_status= #{auditStatus,jdbcType=Integer}
+		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+	) as total
+  </select>  
+  
+  <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
+  	select u.id ,u.mobile, u.email, u.create_time as createTime, 
+  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus
+    from user u LEFT JOIN organization_identity o 
+    ON u.id = o.uid 
+    WHERE u.type = 1
+    <if test = "mobile != null">
+	    and u.mobile = #{mobile,jdbcType=VARCHAR}
+	</if>
+	<if test = "email != null">
+	    and u.email = #{email,jdbcType=VARCHAR}
+	</if>
+	<if test = "pStart != null" >
+		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test = "pEnd != null">
+		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test=" number != null">
+		and u.number = #{number,jdbcType=INTEGER}
+	</if>
+	<if test="aftUsername != null">
+		and o.aft_username = #{aftUsername,jdbcType=VARCHAR}
+	</if>
+	<if test="auditStatus != null">
+		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findOrgCount" resultType="java.lang.Integer" parameterType="String">
+  	select count(1) from (
+  		select u.id ,u.mobile, u.email, u.create_time as createTime, 
+  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus
+    from user u LEFT JOIN organization_identity o 
+    ON u.id = o.uid 
+    WHERE u.type = 1
+    <if test = "mobile != null">
+	    and u.mobile = #{mobile,jdbcType=VARCHAR}
+	</if>
+	<if test = "email != null">
+	    and u.email = #{email,jdbcType=VARCHAR}
+	</if>
+	<if test = "pStart != null" >
+		and u.create_time <![CDATA[ > ]]> #{pStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test = "pEnd != null">
+		and u.create_time <![CDATA[ < ]]> #{pEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test=" number != null">
+		and u.number = #{number,jdbcType=INTEGER}
+	</if>
+	<if test="aftUsername != null">
+		and o.aft_username = #{aftUsername,jdbcType=VARCHAR}
+	</if>
+	<if test="auditStatus != null">
+		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="page_sql!=null">
 		${page_sql}

+ 415 - 0
src/main/java/com/goafanti/common/model/OrgActivity.java

@@ -0,0 +1,415 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+public class OrgActivity {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 研发活动编号
+    */
+    private String activityNumber;
+
+    /**
+    * 研发活动名称
+    */
+    private String activityName;
+
+    /**
+    * 开始日期
+    */
+    private Date startDate;
+
+    /**
+    * 结束日期
+    */
+    private Date endDate;
+
+    /**
+    * 技术领域1st select
+    */
+    private String technicalField1;
+
+    /**
+    * 技术领域2nd select
+    */
+    private String technicalField2;
+
+    /**
+    * 技术领域3rd select
+    */
+    private String technicalField3;
+
+    /**
+    * 技术来源
+    */
+    private Integer technicalSource;
+
+    /**
+    * 知识产权编号
+    */
+    private String intellectualPropertyNumber;
+
+    /**
+    * 研发经费总预算(万元)
+    */
+    private Integer budget;
+
+    /**
+    * 第一年研发经费支出(万元)
+    */
+    private Integer firstYearExpenditure;
+
+    /**
+    * 第二年研发经费支出(万元)
+    */
+    private Integer secondYearExpenditure;
+
+    /**
+    * 第三年研发经费支出(万元)
+    */
+    private Integer thirdYearExpenditure;
+
+    /**
+    * 目的及组织实施方式
+    */
+    private String implement;
+
+    /**
+    * 核心技术及创新点
+    */
+    private String technologyInnovation;
+
+    /**
+    * 取得的阶段性成果
+    */
+    private String achievement;
+
+    /**
+    * 内部人员人工费用(万元)
+    */
+    private Integer internalLaborCost;
+
+    /**
+    * 内部直接投入费用(万元)
+    */
+    private Integer internalDirectCost;
+
+    /**
+    * 内部折旧费用与长期待摊费用(万元)
+    */
+    private Integer internalDepreciationCost;
+
+    /**
+    * 内部无形资产摊销费用(万元)
+    */
+    private Integer internalAmortizationCost;
+
+    /**
+    * 内部设计费用(万元)
+    */
+    private Integer internalDesignCost;
+
+    /**
+    * 内部装备调试费用与实验费用(万元)
+    */
+    private Integer internalEquipmentCost;
+
+    /**
+    * 内部其他费用(万元)
+    */
+    private Integer internalOtherCost;
+
+    /**
+    * 委托外部研究开发总费用(万元)
+    */
+    private Integer externalTotalCost;
+
+    /**
+    * 委托外部境内的外部研发费用(万元)
+    */
+    private Integer externalAbroadCost;
+
+    /**
+    * 企业填报人
+    */
+    private String enterpriseFiller;
+
+    /**
+    * 企业填报人签字日期
+    */
+    private Date signDate;
+
+    /**
+    * 排序号
+    */
+    private String sortNumber;
+
+    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 String getActivityNumber() {
+        return activityNumber;
+    }
+
+    public void setActivityNumber(String activityNumber) {
+        this.activityNumber = activityNumber;
+    }
+
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getTechnicalField1() {
+        return technicalField1;
+    }
+
+    public void setTechnicalField1(String technicalField1) {
+        this.technicalField1 = technicalField1;
+    }
+
+    public String getTechnicalField2() {
+        return technicalField2;
+    }
+
+    public void setTechnicalField2(String technicalField2) {
+        this.technicalField2 = technicalField2;
+    }
+
+    public String getTechnicalField3() {
+        return technicalField3;
+    }
+
+    public void setTechnicalField3(String technicalField3) {
+        this.technicalField3 = technicalField3;
+    }
+
+    public Integer getTechnicalSource() {
+        return technicalSource;
+    }
+
+    public void setTechnicalSource(Integer technicalSource) {
+        this.technicalSource = technicalSource;
+    }
+
+    public String getIntellectualPropertyNumber() {
+        return intellectualPropertyNumber;
+    }
+
+    public void setIntellectualPropertyNumber(String intellectualPropertyNumber) {
+        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;
+    }
+
+    public void setImplement(String implement) {
+        this.implement = implement;
+    }
+
+    public String getTechnologyInnovation() {
+        return technologyInnovation;
+    }
+
+    public void setTechnologyInnovation(String technologyInnovation) {
+        this.technologyInnovation = technologyInnovation;
+    }
+
+    public String getAchievement() {
+        return achievement;
+    }
+
+    public void setAchievement(String achievement) {
+        this.achievement = achievement;
+    }
+
+    public Integer getInternalLaborCost() {
+        return internalLaborCost;
+    }
+
+    public void setInternalLaborCost(Integer internalLaborCost) {
+        this.internalLaborCost = internalLaborCost;
+    }
+
+    public Integer getInternalDirectCost() {
+        return internalDirectCost;
+    }
+
+    public void setInternalDirectCost(Integer internalDirectCost) {
+        this.internalDirectCost = internalDirectCost;
+    }
+
+    public Integer getInternalDepreciationCost() {
+        return internalDepreciationCost;
+    }
+
+    public void setInternalDepreciationCost(Integer internalDepreciationCost) {
+        this.internalDepreciationCost = internalDepreciationCost;
+    }
+
+    public Integer getInternalAmortizationCost() {
+        return internalAmortizationCost;
+    }
+
+    public void setInternalAmortizationCost(Integer internalAmortizationCost) {
+        this.internalAmortizationCost = internalAmortizationCost;
+    }
+
+    public Integer getInternalDesignCost() {
+        return internalDesignCost;
+    }
+
+    public void setInternalDesignCost(Integer internalDesignCost) {
+        this.internalDesignCost = internalDesignCost;
+    }
+
+    public Integer getInternalEquipmentCost() {
+        return internalEquipmentCost;
+    }
+
+    public void setInternalEquipmentCost(Integer internalEquipmentCost) {
+        this.internalEquipmentCost = internalEquipmentCost;
+    }
+
+    public Integer getInternalOtherCost() {
+        return internalOtherCost;
+    }
+
+    public void setInternalOtherCost(Integer internalOtherCost) {
+        this.internalOtherCost = internalOtherCost;
+    }
+
+    public Integer getExternalTotalCost() {
+        return externalTotalCost;
+    }
+
+    public void setExternalTotalCost(Integer externalTotalCost) {
+        this.externalTotalCost = externalTotalCost;
+    }
+
+    public Integer getExternalAbroadCost() {
+        return externalAbroadCost;
+    }
+
+    public void setExternalAbroadCost(Integer externalAbroadCost) {
+        this.externalAbroadCost = externalAbroadCost;
+    }
+
+    public String getEnterpriseFiller() {
+        return enterpriseFiller;
+    }
+
+    public void setEnterpriseFiller(String enterpriseFiller) {
+        this.enterpriseFiller = enterpriseFiller;
+    }
+
+    public Date getSignDate() {
+        return signDate;
+    }
+
+    public void setSignDate(Date signDate) {
+        this.signDate = signDate;
+    }
+
+    public String getSortNumber() {
+        return sortNumber;
+    }
+
+    public void setSortNumber(String sortNumber) {
+        this.sortNumber = sortNumber;
+    }
+    
+    public String getStartDateFormattedDate(){
+		if (this.startDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getStartDate(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setStartDateFormattedDate(String startDateFormattedDate){
+		
+	}
+	
+	public String getEndDateFormattedDate(){
+		if (this.endDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getEndDate(), "yyyy-MM-dd");
+		}
+	}
+	
+	public void setEndDateFormattedDate(String endDateFormattedDate){
+		
+	}
+}

+ 17 - 15
src/main/java/com/goafanti/common/model/OrgHumanResource.java

@@ -68,12 +68,12 @@ public class OrgHumanResource {
     /**
     * 企业千人计划人数
     */
-    private Integer firmThousands;
+    private Integer firmCore;
 
     /**
     * 千人计划科技人员数
     */
-    private Integer techThousands;
+    private Integer techCore;
 
     /**
     * 博士人数
@@ -247,23 +247,25 @@ public class OrgHumanResource {
         this.techAbroad = techAbroad;
     }
 
-    public Integer getFirmThousands() {
-        return firmThousands;
-    }
+    
 
-    public void setFirmThousands(Integer firmThousands) {
-        this.firmThousands = firmThousands;
-    }
+    public Integer getFirmCore() {
+		return firmCore;
+	}
 
-    public Integer getTechThousands() {
-        return techThousands;
-    }
+	public void setFirmCore(Integer firmCore) {
+		this.firmCore = firmCore;
+	}
 
-    public void setTechThousands(Integer techThousands) {
-        this.techThousands = techThousands;
-    }
+	public Integer getTechCore() {
+		return techCore;
+	}
+
+	public void setTechCore(Integer techCore) {
+		this.techCore = techCore;
+	}
 
-    public Integer getDoctor() {
+	public Integer getDoctor() {
         return doctor;
     }
 

+ 105 - 0
src/main/java/com/goafanti/common/model/OrgStandard.java

@@ -0,0 +1,105 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+public class OrgStandard {
+    private String id;
+
+    private String uid;
+
+    /**
+    * 标准名称
+    */
+    private String standardName;
+
+    /**
+    * 标准编号
+    */
+    private String standardNumber;
+
+    /**
+    * 标准级别
+    */
+    private Integer standardLevel;
+
+    /**
+    * 参与方式
+    */
+    private Integer participateWay;
+    
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    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 String getStandardName() {
+        return standardName;
+    }
+
+    public void setStandardName(String standardName) {
+        this.standardName = standardName;
+    }
+
+    public String getStandardNumber() {
+        return standardNumber;
+    }
+
+    public void setStandardNumber(String standardNumber) {
+        this.standardNumber = standardNumber;
+    }
+
+    public Integer getStandardLevel() {
+        return standardLevel;
+    }
+
+    public void setStandardLevel(Integer standardLevel) {
+        this.standardLevel = standardLevel;
+    }
+
+    public Integer getParticipateWay() {
+        return participateWay;
+    }
+
+    public void setParticipateWay(Integer participateWay) {
+        this.participateWay = participateWay;
+    }
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+    
+	//创建时间
+	public String getCreateTimeFormattedDate(){
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), "yyyy-MM-dd");
+		}
+	}
+		
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate){
+			
+	}
+}

+ 56 - 0
src/main/java/com/goafanti/common/model/UserAbility.java

@@ -9,6 +9,28 @@ public class UserAbility {
     * 能力标签
     */
     private String abilityLabel;
+    
+    /**
+     * 知识产权对企业竞争力的作用  
+     */
+    private String intellectRight;
+    
+    /**
+     * 科技成果转化情况
+     */
+    private String scienceAchievement;
+    
+    
+    /**
+     * 研究开发与技术创新组织管理情况
+     */
+    private String researchInnovation;
+    
+    
+    /**
+     * 管理与科技人员情况
+     */
+    private String personnel;
 
     public String getId() {
         return id;
@@ -33,4 +55,38 @@ public class UserAbility {
     public void setAbilityLabel(String abilityLabel) {
         this.abilityLabel = abilityLabel;
     }
+
+	public String getIntellectRight() {
+		return intellectRight;
+	}
+
+	public void setIntellectRight(String intellectRight) {
+		this.intellectRight = intellectRight;
+	}
+
+	public String getScienceAchievement() {
+		return scienceAchievement;
+	}
+
+	public void setScienceAchievement(String scienceAchievement) {
+		this.scienceAchievement = scienceAchievement;
+	}
+
+	public String getResearchInnovation() {
+		return researchInnovation;
+	}
+
+	public void setResearchInnovation(String researchInnovation) {
+		this.researchInnovation = researchInnovation;
+	}
+
+	public String getPersonnel() {
+		return personnel;
+	}
+
+	public void setPersonnel(String personnel) {
+		this.personnel = personnel;
+	}
+    
+    
 }

+ 123 - 0
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -0,0 +1,123 @@
+package com.goafanti.techservice.cognizance.controller;
+
+import java.text.ParseException;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrgActivity;
+import com.goafanti.common.model.OrgStandard;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.techservice.cognizance.service.OrgActivityService;
+import com.goafanti.techservice.cognizance.service.OrgStandardService;
+import com.goafanti.user.service.UserService;
+
+@Controller
+@RequestMapping(value = "/techservice/cognizance")
+public class CognizanceApiController extends BaseApiController {
+	@Resource
+	private UserService			userService;
+	@Resource
+	private OrgStandardService	orgStandardService;
+	@Resource
+	private OrgActivityService  orgActivityService;
+    
+	/**
+	 * 企业研究开发活动情况表及企业年度研究开发费用结构明细表入口
+	 * @param activityNumber
+	 * @param activityName
+	 * @param startDate
+	 * @param endDate
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 * @throws ParseException
+	 */
+	@RequestMapping(value = "/activity", method = RequestMethod.POST)
+	public Result activity(String activityNumber, String activityName, String startDate, String endDate, String pageNo,
+			String pageSize) throws ParseException {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(orgActivityService.listOrgActivity(activityNumber, activityName, startDate, endDate, pNo,
+				pSize, TokenManager.getUserId()));
+		return res;
+	}
+	
+	/**
+	 * 企业研究开发活动情况表及企业年度研究开发费用结构明细新增、修改
+	 * @param orgActivity
+	 * @return
+	 * @throws ParseException 
+	 */
+	@RequestMapping(value = "/disposeActivity", method = RequestMethod.POST)
+	public Result disposeActivity(OrgActivity orgActivity, String startDate, String endDate) throws ParseException{
+		Result res = new Result();
+		orgActivity.setEndDate(DateUtils.parseDate(startDate, "yyyy-MM-dd"));
+		orgActivity.setEndDate(DateUtils.parseDate(endDate, "yyyy-MM-dd"));
+		if (StringUtils.isBlank(orgActivity.getId())){
+			orgActivity.setId(UUID.randomUUID().toString());
+			orgActivity.setUid(TokenManager.getUserId());
+			orgActivityService.insert(orgActivity);
+		} else {
+			orgActivityService.updateByPrimaryKeySelective(orgActivity);
+		}
+		res.setData(orgActivity);
+		return res;
+	}
+
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细入口
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/standard", method = RequestMethod.POST)
+	public Result standard(String standardName, String standardNumber, Integer standardLevel, Integer participateWay,
+			String pageNo, String pageSize) {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
+				pSize, TokenManager.getUserId()));
+		return res;
+	}
+
+	/**
+	 * 企业参与国家标准或行业标准制定情况明细修改保存
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/developStandard", method = RequestMethod.POST)
+	public Result developStandard(OrgStandard orgStandard) {
+		Result res = new Result();
+		if (StringUtils.isBlank(orgStandard.getId())) {
+			orgStandard.setId(UUID.randomUUID().toString());
+			orgStandard.setUid(TokenManager.getUserId());
+			orgStandardService.insert(orgStandard);
+		} else {
+			orgStandardService.updateByPrimaryKeySelective(orgStandard);
+		}
+		res.setData(orgStandard);
+		return res;
+	}
+}

+ 17 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgActivityService.java

@@ -0,0 +1,17 @@
+package com.goafanti.techservice.cognizance.service;
+
+import java.text.ParseException;
+
+import com.goafanti.common.model.OrgActivity;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface OrgActivityService {
+
+	Pagination<OrgActivity> listOrgActivity(String activityNumber, String activityName, String startDate, String endDate, Integer pNo,
+			Integer pSize, String userId) throws ParseException;
+
+	OrgActivity insert(OrgActivity orgActivity);
+
+	int updateByPrimaryKeySelective(OrgActivity orgActivity);
+
+}

+ 15 - 0
src/main/java/com/goafanti/techservice/cognizance/service/OrgStandardService.java

@@ -0,0 +1,15 @@
+package com.goafanti.techservice.cognizance.service;
+
+import com.goafanti.common.model.OrgStandard;
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface OrgStandardService {
+
+	OrgStandard insert(OrgStandard orgStandard);
+
+	int updateByPrimaryKeySelective(OrgStandard orgStandard);
+
+	Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
+			Integer participateWay, Integer pNo, Integer pSize, String userId);
+
+}

+ 76 - 0
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgActivityServiceImpl.java

@@ -0,0 +1,76 @@
+package com.goafanti.techservice.cognizance.service.impl;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrgActivityMapper;
+import com.goafanti.common.model.OrgActivity;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.cognizance.service.OrgActivityService;
+@Service
+public class OrgActivityServiceImpl extends BaseMybatisDao<OrgActivityMapper> implements OrgActivityService {
+	@Autowired
+	private OrgActivityMapper orgActivityMapper;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgActivity> listOrgActivity(String activityNumber, String activityName, String sDate,
+			String eDate, Integer pageNo, Integer pageSize, String uid) throws ParseException {
+		Map<String, Object> params = new HashMap<>();
+		
+		Date startDate = null;
+		Date endDate = null;
+		
+		if (!StringUtils.isBlank(activityNumber)){
+			params.put("activityNumber", activityNumber);
+		}
+		
+		if (!StringUtils.isBlank(activityName)){
+			params.put("activityName", activityName);
+		}
+		
+		if (!StringUtils.isBlank(sDate)){
+			startDate = DateUtils.parseDate(sDate, "yyyy-MM-dd");
+			params.put("startDate", startDate);
+		}
+		
+		if (!StringUtils.isBlank(eDate)){
+			endDate = DateUtils.addDays(DateUtils.parseDate(eDate, "yyyy-MM-dd"), 1);
+			params.put("endDate", endDate);
+		}
+		
+		if(!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<OrgActivity>) findPage("findOrgActivityListByPage", "findOrgActivityCount", params, pageNo,
+				pageSize);
+	}
+
+	@Override
+	public OrgActivity insert(OrgActivity orgActivity) {
+		orgActivityMapper.insert(orgActivity);
+		return orgActivity;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgActivity orgActivity) {
+		return orgActivityMapper.updateByPrimaryKeySelective(orgActivity);
+	}
+}

+ 68 - 0
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgStandardServiceImpl.java

@@ -0,0 +1,68 @@
+package com.goafanti.techservice.cognizance.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrgStandardMapper;
+import com.goafanti.common.model.OrgStandard;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techservice.cognizance.service.OrgStandardService;
+
+@Service
+public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> implements OrgStandardService {
+	@Autowired
+	private OrgStandardMapper orgStandardMapper;
+
+	@Override
+	public OrgStandard insert(OrgStandard orgStandard) {
+		orgStandardMapper.insert(orgStandard);
+		return orgStandard;
+	}
+
+	@Override
+	public int updateByPrimaryKeySelective(OrgStandard orgStandard) {
+		return orgStandardMapper.updateByPrimaryKeySelective(orgStandard);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
+			Integer participateWay, Integer pageNo, Integer pageSize, String uid) {
+		Map<String, Object> params = new HashMap<>();
+		
+		if (!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
+		if (!StringUtils.isBlank(standardName)){
+			params.put("standardName", standardName);
+		}
+		
+		if (!StringUtils.isBlank(standardNumber)){
+			params.put("standardNumber", standardNumber);
+		}
+		
+		if (null == standardLevel){
+			params.put("standardLevel", standardLevel);
+		}
+		
+		if (null == participateWay){
+			params.put("participateWay", participateWay);
+		}
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<OrgStandard>) findPage("findOrgStandardListByPage", "findOrgStandardCount", params, pageNo,
+				pageSize);
+	}
+}

+ 2 - 2
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -598,8 +598,6 @@ public class UserApiController extends BaseApiController {
 	public Result ability() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		// UserAbility u =
-		// userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
 		UserAbility u = userAbilityService.selectUserAbilityByUserId(ub.getUid());
 		res.setData(u);
 		return res;
@@ -831,6 +829,8 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
+	
+	
 
 	// 认证失败清除相关认证信息
 	private Result dealFaild(Result res) {

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

@@ -44,7 +44,7 @@ public class UserRegisterController extends BaseController {
 			BindingResult bindingResult) {
 		Result res = new Result();
 		String sessVCode = (String) TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE);
-		if (sessVCode == null || !sessVCode.equals(verificationCode)) {
+		if (sessVCode == null || !sessVCode.equalsIgnoreCase(verificationCode)) {
 			logger.info("input vcode:" + verificationCode + "| sess vcode:" + sessVCode);
 			res.getError().add(buildError(ErrorConstants.VCODE_ERROR, "验证码错误"));
 			return res;

+ 1 - 5
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -1,12 +1,9 @@
 package com.goafanti.user.service;
 
-import java.text.ParseException;
 import java.util.List;
 
 import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgIdentityBo;
-import com.goafanti.user.bo.OrgListBo;
 
 public interface OrganizationIdentityService {
 
@@ -22,7 +19,6 @@ public interface OrganizationIdentityService {
 
 	int updateByPrimaryKey(OrganizationIdentity org);
 
-	Pagination<OrgListBo> listOrg(String mobile, String email, String[] createTime, Integer number, Integer auditStatus,
-			Integer pNo, Integer pSize) throws ParseException;
+	
 
 }

+ 7 - 5
src/main/java/com/goafanti/user/service/UserService.java

@@ -4,24 +4,24 @@ import java.text.ParseException;
 
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserPageHomeBo;
 
-
 public interface UserService {
 
 	User selectByPrimaryKey(String userId);
 
 	int updateByPrimaryKeySelective(User u);
-	
+
 	int updateByPrimaryKey(User u);
 
 	User insert(User user);
 
 	User selectByMobieAndType(String mobile, Integer type);
-	
-	User insertRegister(User user,String companyName,String contacts,String uid);
+
+	User insertRegister(User user, String companyName, String contacts, String uid);
 
 	UserPageHomeBo selectUserPageHomeBoByUserId(String userId);
 
@@ -29,6 +29,8 @@ public interface UserService {
 
 	Pagination<UserListBo> listUser(String mobile, String email, String[] createTime, Integer number,
 			String aftUsername, Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
-	
+
+	Pagination<OrgListBo> listOrg(String mobile, String email, String[] createTime, Integer number, String aftUsername,
+			Integer auditStatus, Integer pNo, Integer pSize) throws ParseException;
 
 }

+ 2 - 58
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -1,23 +1,15 @@
 package com.goafanti.user.service.impl;
 
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
+
 import java.util.List;
-import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.user.bo.OrgIdentityBo;
-import com.goafanti.user.bo.OrgListBo;
-import com.goafanti.user.bo.UserListBo;
+import com.goafanti.user.bo.OrgIdentityBo;	
 import com.goafanti.user.service.OrganizationIdentityService;
 
 @Service
@@ -56,54 +48,6 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		return organizationIdentityMapper.updateByPrimaryKey(org);
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<OrgListBo> listOrg(String mobile, String email, String[] pDate, Integer number,
-			Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
-		Map<String, Object> params = new HashMap<>();
-		Date pStart = null;
-		Date pEnd = null;
-		
-		if (null != pDate ){
-			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			if (pDate.length == 2){
-				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
-			}
-		}
-		 
-		if (null != pStart){
-			params.put("pStart", pStart);
-		}
-		
-		if (null != pEnd){
-			params.put("pEnd", pEnd);
-		}
-		
-		if (!StringUtils.isBlank(mobile)){
-			params.put("mobile", mobile);
-		}
 		
-		if (!StringUtils.isBlank(email)){
-			params.put("email", email);
-		}
-		
-		if (null != number ){
-			params.put("number", number);
-		}
-		
-		if (null != auditStatus){
-			params.put("auditStatus", auditStatus);
-		}
-		
-		if (pageNo == null || pageNo < 0) {
-			pageNo = 1;
-		}
-
-		if (pageSize == null || pageSize < 0) {
-			pageSize = 10;
-		}
-		return (Pagination<OrgListBo>) findPage("findOrgListByPage","findOrgCount", params, pageNo,
-				pageSize);
-	}
 
 }

+ 56 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ import com.goafanti.common.model.User;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.user.bo.OrgListBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserListBo;
 import com.goafanti.user.bo.UserPageHomeBo;
@@ -131,7 +132,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 			params.put("number", number);
 		}
 		
-		if (null != aftUsername){
+		if (!StringUtils.isBlank(aftUsername)){
 			params.put("aftUsername", aftUsername);
 		}
 		
@@ -149,6 +150,60 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return (Pagination<UserListBo>) findPage("findUserListByPage","findUserCount", params, pageNo,
 				pageSize);
 	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgListBo> listOrg(String mobile, String email, String[] pDate, Integer number,
+			String aftUsername, Integer auditStatus, Integer pageNo, Integer pageSize) throws ParseException {
+		Map<String, Object> params = new HashMap<>();
+		Date pStart = null;
+		Date pEnd = null;
+		
+		if (null != pDate ){
+			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			if (pDate.length == 2){
+				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
+			}
+		}
+		 
+		if (null != pStart){
+			params.put("pStart", pStart);
+		}
+		
+		if (null != pEnd){
+			params.put("pEnd", pEnd);
+		}
+		
+		if (!StringUtils.isBlank(mobile)){
+			params.put("mobile", mobile);
+		}
+		
+		if (!StringUtils.isBlank(email)){
+			params.put("email", email);
+		}
+		
+		if (null != number ){
+			params.put("number", number);
+		}
+		
+		if (!StringUtils.isBlank(aftUsername)){
+			params.put("aftUsername", aftUsername);
+		}
+		
+		if (null != auditStatus){
+			params.put("auditStatus", auditStatus);
+		}
+		
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return (Pagination<OrgListBo>) findPage("findOrgListByPage","findOrgCount", params, pageNo,
+				pageSize);
+	}
 
 
 

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
-	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
+	    <!-- <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
 	  
 	</bean>