Antiloveg 8 years ago
parent
commit
18fc94cfbd

+ 29 - 0
schema/2017-04-14.sql

@@ -0,0 +1,29 @@
+
+alter table `organization_identity`
+add COLUMN  `contacts_fixed_tel` VARCHAR(16) NULL COMMENT '联系人固定电话',
+add COLUMN  `contacts_fax` VARCHAR(16) NULL COMMENT '联系人传真',
+add COLUMN  `legal_person_tel` VARCHAR(16) NULL COMMENT '法人电话',
+add COLUMN  `legal_person_fax` VARCHAR(16) NULL COMMENT '法人传真',
+add COLUMN  `legal_person_email` VARCHAR(128) NULL COMMENT '法人Email',
+add COLUMN  `registration_time` DATETIME NULL COMMENT '注册时间',
+add COLUMN  `ratepay_code` VARCHAR(36) NULL COMMENT '税务登记号',
+add COLUMN  `industry` INT(2) NULL COMMENT '所属行业',
+add COLUMN  `enterprise_scale` INT(1) NULL COMMENT '企业规模',
+add COLUMN  `register_type` VARCHAR(8) NULL COMMENT '注册类型',
+add COLUMN  `foreign_investment` VARCHAR(32) NULL COMMENT '外资来源地',
+add COLUMN  `field` VARCHAR(8) NULL COMMENT '领域',
+add COLUMN  `tax_authority` INT(1) NULL COMMENT '企业所得税主管税务机关(0--国税,1--地税)',
+add COLUMN  `ratepay_method` INT(1) NULL COMMENT '企业所得税征收方式(0--查账征收,1--核定征收)',
+add COLUMN  `high_tech_zone` INT(1) NULL COMMENT '是否属于国家级高新区内企业(0--否,1--是)',
+add COLUMN  `risk_investment` INT(1) NULL COMMENT '是否引入风险投资(0--否,1--是)',
+add COLUMN  `business_scope` VARCHAR(400) NULL COMMENT '经营范围',
+add COLUMN  `high_tech_name` VARCHAR(32) NULL COMMENT '国家级高新区名称';
+
+alter table `organization_identity` 
+MODIFY COLUMN `registered_capital` DECIMAL(8,2) NULL COMMENT '注册资金' ,
+MODIFY COLUMN `contacts` VARCAHR(16) NULL COMMENT '联系人' ;
+
+
+
+
+

+ 142 - 12
src/main/java/com/goafanti/admin/controller/AdminOrgBaiscInfoApiController.java

@@ -1,14 +1,21 @@
 package com.goafanti.admin.controller;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,12 +23,19 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.DeleteStatus;
+import com.goafanti.common.enums.OrgBasicInfoFields;
 import com.goafanti.common.model.LegalPersonOwnership;
+import com.goafanti.common.model.NatureOwnership;
+import com.goafanti.common.model.OrgHumanResource;
+import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.user.bo.InputOrgBasicInfo;
 import com.goafanti.user.service.LegalPersonOwnershipService;
 import com.goafanti.user.service.NatureOwnershipService;
+import com.goafanti.user.service.OrganizationIdentityService;
 
 @Controller
 @RequestMapping(value = "/api/admin/basic")
@@ -30,9 +44,91 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 	private LegalPersonOwnershipService	legalPersonOwnershipService;
 	@Resource
 	private NatureOwnershipService		natureOwnershipService;
+	@Resource
+	private OrganizationIdentityService	organizationIdentityService;
+
+	/**
+	 * 企业基本信息保存
+	 * 
+	 * @param info
+	 * @param bindingResult
+	 * @return
+	 */
+	@RequestMapping(value = "/disposeInfo", method = RequestMethod.POST)
+	public Result disposeInfo(@Valid InputOrgBasicInfo info, String listedDateFormattedDate,
+			String registrationTimeFormattedDate, BindingResult bindingResult) {
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					OrgBasicInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+
+		if (StringUtils.isBlank(info.getUid())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
+			return res;
+		}
+
+		Date listedDate = null;
+		Date registrationTime = null;
+		if (!StringUtils.isBlank(listedDateFormattedDate)) {
+			try {
+				listedDate = DateUtils.parseDate(listedDateFormattedDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "listedDateFormattedDate"));
+				return res;
+			}
+		}
+
+		if (!StringUtils.isBlank(registrationTimeFormattedDate)) {
+			try {
+				registrationTime = DateUtils.parseDate(registrationTimeFormattedDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "registrationTimeFormattedDate"));
+				return res;
+			}
+		}
+
+		OrganizationIdentity oi = new OrganizationIdentity();
+		OrgHumanResource ohr = new OrgHumanResource();
+
+		BeanUtils.copyProperties(info, oi);
+		BeanUtils.copyProperties(info, ohr);
+
+		if (null != listedDate) {
+			oi.setListedDate(listedDate);
+		}
+		
+		if (null != registrationTime){
+			oi.setRegistrationTime(registrationTime);
+		}
+		ohr.setId(info.getHid());
+
+		organizationIdentityService.saveBasicInfo(oi, ohr);
+
+		return res;
+	}
+
+	/**
+	 * 企业基本信息入口
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET)
+	public Result info(String uid) {
+		Result res = new Result();
+		if (StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
+			return res;
+		}
+		Calendar now = Calendar.getInstance();
+		res.setData(organizationIdentityService.selectBasicInfo(uid, now.get(Calendar.YEAR) - 1));
+		return res;
+	}
 
 	/**
-	 * 法人股权人列表
+	 * 法人股权列表
 	 */
 	@RequestMapping(value = "/listLegalPerson", method = RequestMethod.GET)
 	public Result listLegalPerson(String uid) {
@@ -45,13 +141,14 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		res.setData(legalPersonOwnershipService.selectByUid(uid));
 		return res;
 	}
-	
+
 	/**
-	 * 法人股权人保存修改
+	 * 法人股权保存修改
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/legalPerson", method = RequestMethod.POST)
-	public Result legalPerson(String data){
+	public Result legalPerson(String data) {
 		Result res = new Result();
 		JSONArray ja = (JSONArray) JSON.parse(data);
 		if (ja != null && !ja.isEmpty()) {
@@ -59,13 +156,13 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 			for (int idx = 0; idx < ja.size(); idx++) {
 				lpo.add(ja.getJSONObject(idx).toJavaObject(LegalPersonOwnership.class));
 			}
-			for (LegalPersonOwnership l : lpo){
-				
-				if (StringUtils.isBlank(l.getId())){
+			for (LegalPersonOwnership l : lpo) {
+
+				if (StringUtils.isBlank(l.getId())) {
 					l.setId(UUID.randomUUID().toString());
 				}
-				
-				if (null == l.getDeletedSign()){
+
+				if (null == l.getDeletedSign()) {
 					l.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				}
 			}
@@ -77,7 +174,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 删除自然股权人
+	 * 删除法人股权人
 	 * 
 	 * @param ids
 	 * @return
@@ -92,9 +189,10 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 自然人股权列表
+	 * 
 	 * @param uid
 	 * @return
 	 */
@@ -109,9 +207,10 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		res.setData(natureOwnershipService.selectByUid(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 删除自然人股权
+	 * 
 	 * @param ids
 	 * @return
 	 */
@@ -126,4 +225,35 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		return res;
 	}
 
+	/**
+	 * 自然人股权保存修改
+	 * 
+	 * @param data
+	 * @return
+	 */
+	@RequestMapping(value = "/nature", method = RequestMethod.POST)
+	public Result nature(String data) {
+		Result res = new Result();
+		JSONArray ja = (JSONArray) JSON.parse(data);
+		if (ja != null && !ja.isEmpty()) {
+			List<NatureOwnership> no = new ArrayList<NatureOwnership>();
+			for (int idx = 0; idx < ja.size(); idx++) {
+				no.add(ja.getJSONObject(idx).toJavaObject(NatureOwnership.class));
+			}
+			for (NatureOwnership n : no) {
+				if (StringUtils.isBlank(n.getId())) {
+					n.setId(UUID.randomUUID().toString());
+				}
+
+				if (null == n.getDeletedSign()) {
+					n.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+				}
+			}
+			res.setData(natureOwnershipService.batchInsert(no));
+		} else {
+			res.getError().add(buildError("", "参数格式不正确"));
+		}
+		return res;
+	}
+
 }

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

@@ -20,4 +20,6 @@ public interface NatureOwnershipMapper {
 	List<NatureOwnership> selectByUid(String uid);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	int batchInsert(List<NatureOwnership> no);
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import java.util.List;
 
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
 
 public interface OrganizationIdentityMapper {
@@ -23,4 +24,6 @@ public interface OrganizationIdentityMapper {
 	OrgIdentityBo selectOrgIdentityBoByUserId(String uid);
 
 	List<OrganizationIdentity> selectAllOrgIndentity();
+
+	OrgBasicInfoBo selectBasicInfo(String uid, int year);
 }

+ 83 - 0
src/main/java/com/goafanti/common/enums/OrgBasicInfoFields.java

@@ -0,0 +1,83 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrgBasicInfoFields {
+	
+	UID("uid", "用户id"),
+	HID("hid", "人力资源id"),
+	UNITNAME("unitName", "企业名称"),
+	PROVINCE("province", "行政区域--省"),
+	CITY("city", "行政区域--市"),
+	AREA("area", "行政区域--区"),
+	POSTALADDRESS("postalAddress", "通讯地址"),
+	POSTCODE("postcode", "邮编"),
+	CONTACTS("contacts", "联系人姓名"),
+	CONTACTMOBILE("contactMobile", "联系人手机"),
+	CONTACTSFIXEDTEL("contactsFixedTel", "联系人电话"),
+	CONTACTSFAX("contactsFax", "联系人传真"),
+	LEGALPERSONTEL("legalPersonTel", "法人电话"),
+	LEGALPERSONFAX("legalPersonFax", "法人传真"),
+	LEGALPERSONEMAIL("legalPersonEmail", "法人Email"),
+	REGISTEREDCAPITAL("registeredCapital", "注册资金"),
+	LEGALPERSON("legalPerson", "法人代表姓名"),
+	LEGALPERSONIDCARD("legalPersonIdCard", "法人身份证号"),
+	ORGCODE("orgCode", "组织机构代码/统一社会信用代码"),
+	RATEPAYCODE("ratepayCode", "税务登记号/统一社会信用代码"),
+	INDUSTRY("industry", "所属行业"),
+	ENTERPRISESCALE("enterpriseScale", "企业规模(注册资金)"),
+	REGISTERTYPE("registerType", "注册类型"),
+	FOREIGNINVESTMENT("foreignInvestment", "外资来源地"),
+	FIELD("field", "领域"),
+	TAXAUTHORITY("taxAuthority", "企业所得税主管税务机关"),
+	RATEPAYMETHOD("ratepayMethod", "企业所得税征收方式"),
+	LISTED("listed", "是否上市"),
+	HIGHTECHZONE("highTechZone", "是否属于国家级高新区内企业"),
+	RISKINVESTMENT("riskInvestment", "是否引入风险投资"),
+	BUSINESSSCOPE("businessScope", "经营范围"),
+	FIRMTOTAL("firmTotal", "企业职工"),
+	TECHTOTAL("techTotal", "科技人员"),
+	
+	OTHER("", "未知参数");
+	
+	private String	code;
+	private String	desc;
+	
+	private static Map<String, OrgBasicInfoFields> status = new HashMap<String, OrgBasicInfoFields>();
+	
+	private OrgBasicInfoFields(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+	
+	static {
+		for (OrgBasicInfoFields value : OrgBasicInfoFields.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	
+	public static OrgBasicInfoFields getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+	
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+	
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

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

@@ -142,7 +142,7 @@
 	    type = values(type),
 	    name = values(name),
 	    org_code = values(orgCode),
-	    investment = values(investment)
-	  
+	    investment = values(investment),
+	    deleted_sign = values(deletedSign)
   </insert>
 </mapper>

+ 16 - 0
src/main/java/com/goafanti/common/mapper/NatureOwnershipMapper.xml

@@ -129,4 +129,20 @@
 		#{item}
 	</foreach>
   </update>
+  
+  <insert id="batchInsert" parameterType="com.goafanti.common.model.NatureOwnership">
+    insert into nature_ownership (id, uid, type, name, id_number, investment, deleted_sign)
+    values 
+    <foreach item="item" index="index" collection="list" separator=",">
+      (#{item.id,jdbcType=VARCHAR}, #{item.uid,jdbcType=VARCHAR}, #{item.type,jdbcType=INTEGER},
+      #{item.name,jdbcType=VARCHAR}, #{item.idNumber,jdbcType=VARCHAR}, #{item.investment,jdbcType=DECIMAL},
+      #{item.deletedSign,jdbcType=INTEGER})
+    </foreach>
+    ON DUPLICATE KEY UPDATE
+	    type = values(type),
+	    name = values(name),
+	    id_number = values(idNumber),
+	    investment = values(investment),
+	    deleted_sign = values(deletedSign)
+  </insert>
 </mapper>

+ 312 - 100
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -12,7 +12,7 @@
     <result column="postcode" property="postcode" jdbcType="VARCHAR" />
     <result column="aft_username" property="aftUsername" jdbcType="VARCHAR" />
     <result column="unit_name" property="unitName" jdbcType="VARCHAR" />
-    <result column="registered_capital" property="registeredCapital" jdbcType="INTEGER" />
+    <result column="registered_capital" property="registeredCapital" jdbcType="DECIMAL" />
     <result column="licence_number" property="licenceNumber" jdbcType="VARCHAR" />
     <result column="licence_province" property="licenceProvince" jdbcType="VARCHAR" />
     <result column="licence_city" property="licenceCity" jdbcType="VARCHAR" />
@@ -36,33 +36,51 @@
     <result column="process" property="process" jdbcType="INTEGER" />
     <result column="wrong_count" property="wrongCount" jdbcType="INTEGER" />
     <result column="payment_date" property="paymentDate" jdbcType="TIMESTAMP" />
-    
     <result column="first_contacts" property="firstContacts" jdbcType="VARCHAR" />
     <result column="first_mobile" property="firstMobile" jdbcType="VARCHAR" />
     <result column="second_contacts" property="secondContacts" jdbcType="VARCHAR" />
     <result column="second_mobile" property="secondMobile" jdbcType="VARCHAR" />
     <result column="third_contacts" property="thirdContacts" jdbcType="VARCHAR" />
     <result column="third_mobile" property="thirdMobile" jdbcType="VARCHAR" />
-    
     <result column="listed" property="listed" jdbcType="INTEGER" />
     <result column="listed_date" property="listedDate" jdbcType="TIMESTAMP" />
     <result column="listed_type" property="listedType" jdbcType="INTEGER" />
     <result column="stock_code" property="stockCode" jdbcType="VARCHAR" />
-    
     <result column="certificate_number" property="certificateNumber" jdbcType="VARCHAR" />
     <result column="issuing_date" property="issuingDate" jdbcType="TIMESTAMP" />
-    
     <result column="cog_contacts" property="cogContacts" jdbcType="INTEGER" />
     <result column="consultant" property="consultant" jdbcType="VARCHAR" />
+    <result column="contacts_fixed_tel" property="contactsFixedTel" jdbcType="VARCHAR" />
+    <result column="contacts_fax" property="contactsFax" jdbcType="VARCHAR" />
+    <result column="legal_person_tel" property="legalPersonTel" jdbcType="VARCHAR" />
+    <result column="legal_person_fax" property="legalPersonFax" jdbcType="VARCHAR" />
+    <result column="legal_person_email" property="legalPersonEmail" jdbcType="VARCHAR" />
+    <result column="registration_time" property="registrationTime" jdbcType="TIMESTAMP" />
+    <result column="ratepay_code" property="ratepayCode" jdbcType="VARCHAR" />
+    <result column="industry" property="industry" jdbcType="INTEGER" />
+    <result column="enterprise_scale" property="enterpriseScale" jdbcType="INTEGER" />
+    <result column="register_type" property="registerType" jdbcType="VARCHAR" />
+    <result column="foreign_investment" property="foreignInvestment" jdbcType="VARCHAR" />
+    <result column="field" property="field" jdbcType="VARCHAR" />
+    <result column="tax_authority" property="taxAuthority" jdbcType="INTEGER" />
+    <result column="ratepay_method" property="ratepayMethod" jdbcType="INTEGER" />
+    <result column="high_tech_zone" property="highTechZone" jdbcType="INTEGER" />
+    <result column="risk_investment" property="riskInvestment" jdbcType="INTEGER" />
+    <result column="business_scope" property="businessScope" jdbcType="VARCHAR" />
+    <result column="high_tech_name" property="highTechName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, contacts, contact_mobile, fixed_tel, qq, postal_address, postcode, aft_username, 
     unit_name, registered_capital, licence_number, licence_province, licence_city, licence_area, 
     licence_scanning_url, org_code, org_code_url, bank_account, banks, bank_branch, bank_card_number, 
     validation_amount, identity_type, location_province, location_city, location_area, 
-    legal_person, legal_person_id_card, last_year_tax_report_url, audit_status, process, wrong_count, 
-    payment_date, first_contacts, first_mobile, second_contacts, second_mobile, third_contacts ,third_mobile,
-    listed, listed_date, listed_type, stock_code, certificate_number, issuing_date, cog_contacts, consultant
+    legal_person, legal_person_id_card, last_year_tax_report_url, audit_status, process, 
+    wrong_count, payment_date, first_contacts, first_mobile, second_contacts, second_mobile, 
+    third_contacts, third_mobile, listed, listed_date, listed_type, stock_code, certificate_number, 
+    issuing_date, cog_contacts, consultant, contacts_fixed_tel, contacts_fax, legal_person_tel, 
+    legal_person_fax, legal_person_email, registration_time, ratepay_code, industry, 
+    enterprise_scale, register_type, foreign_investment, field, tax_authority, ratepay_method, 
+    high_tech_zone, risk_investment, business_scope, high_tech_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -85,29 +103,40 @@
       bank_card_number, validation_amount, identity_type, 
       location_province, location_city, location_area, 
       legal_person, legal_person_id_card, last_year_tax_report_url, 
-      audit_status, process, wrong_count, payment_date,
-      first_contacts, first_mobile, second_contacts, 
-      second_mobile, third_contacts , third_mobile,
-      listed, listed_date, listed_type, stock_code,
-      certificate_number, issuing_date, cog_contacts, consultant
-      )
+      audit_status, process, wrong_count, 
+      payment_date, first_contacts, first_mobile, 
+      second_contacts, second_mobile, third_contacts, 
+      third_mobile, listed, listed_date, 
+      listed_type, stock_code, certificate_number, 
+      issuing_date, cog_contacts, consultant, 
+      contacts_fixed_tel, contacts_fax, legal_person_tel, 
+      legal_person_fax, legal_person_email, registration_time, 
+      ratepay_code, industry, enterprise_scale, 
+      register_type, foreign_investment, field, 
+      tax_authority, ratepay_method, high_tech_zone, 
+      risk_investment, business_scope, high_tech_name)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactMobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{aftUsername,jdbcType=VARCHAR}, 
-      #{unitName,jdbcType=VARCHAR}, #{registeredCapital,jdbcType=INTEGER}, #{licenceNumber,jdbcType=VARCHAR}, 
+      #{unitName,jdbcType=VARCHAR}, #{registeredCapital,jdbcType=DECIMAL}, #{licenceNumber,jdbcType=VARCHAR}, 
       #{licenceProvince,jdbcType=VARCHAR}, #{licenceCity,jdbcType=VARCHAR}, #{licenceArea,jdbcType=VARCHAR}, 
       #{licenceScanningUrl,jdbcType=VARCHAR}, #{orgCode,jdbcType=VARCHAR}, #{orgCodeUrl,jdbcType=VARCHAR}, 
       #{bankAccount,jdbcType=VARCHAR}, #{banks,jdbcType=VARCHAR}, #{bankBranch,jdbcType=VARCHAR}, 
       #{bankCardNumber,jdbcType=VARCHAR}, #{validationAmount,jdbcType=DECIMAL}, #{identityType,jdbcType=INTEGER}, 
       #{locationProvince,jdbcType=VARCHAR}, #{locationCity,jdbcType=VARCHAR}, #{locationArea,jdbcType=VARCHAR}, 
       #{legalPerson,jdbcType=VARCHAR}, #{legalPersonIdCard,jdbcType=VARCHAR}, #{lastYearTaxReportUrl,jdbcType=VARCHAR}, 
-      #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, #{paymentDate,jdbcType=TIMESTAMP},
-      #{firstContacts,jdbcType=VARCHAR}, #{firstMobile,jdbcType=VARCHAR}, #{secondContacts,jdbcType=VARCHAR}, 
-      #{secondMobile,jdbcType=VARCHAR}, #{thirdContacts,jdbcType=VARCHAR}, #{thirdMobile,jdbcType=VARCHAR},
-      #{listed,jdbcType=INTEGER}, #{listedDate,jdbcType=TIMESTAMP}, #{listedType,jdbcType=INTEGER}, #{stockCode,jdbcType=VARCHAR},
-      #{certificateNumber,jdbcType=VARCHAR}, #{issuingDate,jdbcType=TIMESTAMP}, 
-      #{cogContacts,jdbcType=INTEGER}, #{consultant,jdbcType=VARCHAR}
-      )
+      #{auditStatus,jdbcType=INTEGER}, #{process,jdbcType=INTEGER}, #{wrongCount,jdbcType=INTEGER}, 
+      #{paymentDate,jdbcType=TIMESTAMP}, #{firstContacts,jdbcType=VARCHAR}, #{firstMobile,jdbcType=VARCHAR}, 
+      #{secondContacts,jdbcType=VARCHAR}, #{secondMobile,jdbcType=VARCHAR}, #{thirdContacts,jdbcType=VARCHAR}, 
+      #{thirdMobile,jdbcType=VARCHAR}, #{listed,jdbcType=INTEGER}, #{listedDate,jdbcType=TIMESTAMP}, 
+      #{listedType,jdbcType=INTEGER}, #{stockCode,jdbcType=VARCHAR}, #{certificateNumber,jdbcType=VARCHAR}, 
+      #{issuingDate,jdbcType=TIMESTAMP}, #{cogContacts,jdbcType=INTEGER}, #{consultant,jdbcType=VARCHAR}, 
+      #{contactsFixedTel,jdbcType=VARCHAR}, #{contactsFax,jdbcType=VARCHAR}, #{legalPersonTel,jdbcType=VARCHAR}, 
+      #{legalPersonFax,jdbcType=VARCHAR}, #{legalPersonEmail,jdbcType=VARCHAR}, #{registrationTime,jdbcType=TIMESTAMP}, 
+      #{ratepayCode,jdbcType=VARCHAR}, #{industry,jdbcType=INTEGER}, #{enterpriseScale,jdbcType=INTEGER}, 
+      #{registerType,jdbcType=VARCHAR}, #{foreignInvestment,jdbcType=VARCHAR}, #{field,jdbcType=VARCHAR}, 
+      #{taxAuthority,jdbcType=INTEGER}, #{ratepayMethod,jdbcType=INTEGER}, #{highTechZone,jdbcType=INTEGER}, 
+      #{riskInvestment,jdbcType=INTEGER}, #{businessScope,jdbcType=VARCHAR},  #{highTechName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity" >
     insert into organization_identity
@@ -214,51 +243,101 @@
       <if test="paymentDate != null" >
         payment_date,
       </if>
-      
-      <if test="firstContacts!= null">
-      	first_contacts,
+      <if test="firstContacts != null" >
+        first_contacts,
       </if>
-      <if test="firstMobile != null">
-      	first_mobile,
+      <if test="firstMobile != null" >
+        first_mobile,
       </if>
-      <if test="secondContacts != null">
-      	second_contacts,
+      <if test="secondContacts != null" >
+        second_contacts,
       </if>
-      <if test="secondMobile != null">
-      	second_mobile,
+      <if test="secondMobile != null" >
+        second_mobile,
       </if>
-      <if test="thirdContacts != null">
-      	third_contacts,
+      <if test="thirdContacts != null" >
+        third_contacts,
       </if>
-      <if test="thirdMobile != null">
-      	third_mobile,
+      <if test="thirdMobile != null" >
+        third_mobile,
       </if>
-      
-      <if test="listed != null">
-      	listed,
+      <if test="listed != null" >
+        listed,
+      </if>
+      <if test="listedDate != null" >
+        listed_date,
+      </if>
+      <if test="listedType != null" >
+        listed_type,
+      </if>
+      <if test="stockCode != null" >
+        stock_code,
+      </if>
+      <if test="certificateNumber != null" >
+        certificate_number,
+      </if>
+      <if test="issuingDate != null" >
+        issuing_date,
+      </if>
+      <if test="cogContacts != null" >
+        cog_contacts,
+      </if>
+      <if test="consultant != null" >
+        consultant,
+      </if>
+      <if test="contactsFixedTel != null" >
+        contacts_fixed_tel,
+      </if>
+      <if test="contactsFax != null" >
+        contacts_fax,
+      </if>
+      <if test="legalPersonTel != null" >
+        legal_person_tel,
       </if>
-      <if test="listedDate != null">
-      	listed_date,
+      <if test="legalPersonFax != null" >
+        legal_person_fax,
       </if>
-      <if test="listedType != null">
-      	listed_type,
+      <if test="legalPersonEmail != null" >
+        legal_person_email,
       </if>
-      <if test="stockCode != null">
-      	stock_code,
+      <if test="registrationTime != null" >
+        registration_time,
       </if>
-      
-      <if test="certificateNumber != null">
-      	certificate_number,
+      <if test="ratepayCode != null" >
+        ratepay_code,
       </if>
-      <if test="issuingDate != null">
-      	issuing_date,
+      <if test="industry != null" >
+        industry,
       </if>
-      
-       <if test="cogContacts != null">
-      	cog_contacts,
+      <if test="enterpriseScale != null" >
+        enterprise_scale,
       </if>
-      <if test="consultant != null">
-      	consultant,
+      <if test="registerType != null" >
+        register_type,
+      </if>
+      <if test="foreignInvestment != null" >
+        foreign_investment,
+      </if>
+      <if test="field != null" >
+        field,
+      </if>
+      <if test="taxAuthority != null" >
+        tax_authority,
+      </if>
+      <if test="ratepayMethod != null" >
+        ratepay_method,
+      </if>
+      <if test="highTechZone != null" >
+        high_tech_zone,
+      </if>
+      <if test="riskInvestment != null" >
+        risk_investment,
+      </if>
+      <if test="businessScope != null" >
+        business_scope,
+      </if>
+       <if test="highTechName != null" >
+        high_tech_name,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -293,7 +372,7 @@
         #{unitName,jdbcType=VARCHAR},
       </if>
       <if test="registeredCapital != null" >
-        #{registeredCapital,jdbcType=INTEGER},
+        #{registeredCapital,jdbcType=DECIMAL},
       </if>
       <if test="licenceNumber != null" >
         #{licenceNumber,jdbcType=VARCHAR},
@@ -361,29 +440,27 @@
       <if test="wrongCount != null" >
         #{wrongCount,jdbcType=INTEGER},
       </if>
-       <if test="paymentDate != null" >
+      <if test="paymentDate != null" >
         #{paymentDate,jdbcType=TIMESTAMP},
       </if>
-      
-      <if test="firstContacts!= null">
-      	#{firstContacts,jdbcType=VARCHAR},
+      <if test="firstContacts != null" >
+        #{firstContacts,jdbcType=VARCHAR},
       </if>
-      <if test="firstMobile != null">
-      	#{firstMobile,jdbcType=VARCHAR},
+      <if test="firstMobile != null" >
+        #{firstMobile,jdbcType=VARCHAR},
       </if>
-      <if test="secondContacts != null">
-      	#{secondContacts,jdbcType=VARCHAR},
+      <if test="secondContacts != null" >
+        #{secondContacts,jdbcType=VARCHAR},
       </if>
-      <if test="secondMobile != null">
-      	#{secondMobile,jdbcType=VARCHAR},
+      <if test="secondMobile != null" >
+        #{secondMobile,jdbcType=VARCHAR},
       </if>
-      <if test="thirdContacts != null">
-      	#{thirdContacts,jdbcType=VARCHAR},
+      <if test="thirdContacts != null" >
+        #{thirdContacts,jdbcType=VARCHAR},
       </if>
-      <if test="thirdMobile != null">
-      	#{thirdMobile,jdbcType=VARCHAR},
+      <if test="thirdMobile != null" >
+        #{thirdMobile,jdbcType=VARCHAR},
       </if>
-      
       <if test="listed != null" >
         #{listed,jdbcType=INTEGER},
       </if>
@@ -396,24 +473,76 @@
       <if test="stockCode != null" >
         #{stockCode,jdbcType=VARCHAR},
       </if>
-      
-       <if test="certificateNumber != null" >
+      <if test="certificateNumber != null" >
         #{certificateNumber,jdbcType=VARCHAR},
       </if>
       <if test="issuingDate != null" >
         #{issuingDate,jdbcType=TIMESTAMP},
       </if>
-      
-       <if test="cogContacts != null" >
+      <if test="cogContacts != null" >
         #{cogContacts,jdbcType=INTEGER},
       </if>
       <if test="consultant != null" >
         #{consultant,jdbcType=VARCHAR},
       </if>
+      <if test="contactsFixedTel != null" >
+        #{contactsFixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsFax != null" >
+        #{contactsFax,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonTel != null" >
+        #{legalPersonTel,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonFax != null" >
+        #{legalPersonFax,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonEmail != null" >
+        #{legalPersonEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="registrationTime != null" >
+        #{registrationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ratepayCode != null" >
+        #{ratepayCode,jdbcType=VARCHAR},
+      </if>
+      <if test="industry != null" >
+        #{industry,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseScale != null" >
+        #{enterpriseScale,jdbcType=INTEGER},
+      </if>
+      <if test="registerType != null" >
+        #{registerType,jdbcType=VARCHAR},
+      </if>
+      <if test="foreignInvestment != null" >
+        #{foreignInvestment,jdbcType=VARCHAR},
+      </if>
+      <if test="field != null" >
+        #{field,jdbcType=VARCHAR},
+      </if>
+      <if test="taxAuthority != null" >
+        #{taxAuthority,jdbcType=INTEGER},
+      </if>
+      <if test="ratepayMethod != null" >
+        #{ratepayMethod,jdbcType=INTEGER},
+      </if>
+      <if test="highTechZone != null" >
+        #{highTechZone,jdbcType=INTEGER},
+      </if>
+      <if test="riskInvestment != null" >
+        #{riskInvestment,jdbcType=INTEGER},
+      </if>
+      <if test="businessScope != null" >
+        #{businessScope,jdbcType=VARCHAR},
+      </if>
+      <if test="highTechName != null" >
+        #{highTechName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationIdentity" >
-    update organization_identity
+     update organization_identity
     <set >
       <if test="uid != null" >
         uid = #{uid,jdbcType=VARCHAR},
@@ -443,7 +572,7 @@
         unit_name = #{unitName,jdbcType=VARCHAR},
       </if>
       <if test="registeredCapital != null" >
-        registered_capital = #{registeredCapital,jdbcType=INTEGER},
+        registered_capital = #{registeredCapital,jdbcType=DECIMAL},
       </if>
       <if test="licenceNumber != null" >
         licence_number = #{licenceNumber,jdbcType=VARCHAR},
@@ -514,26 +643,24 @@
       <if test="paymentDate != null" >
         payment_date = #{paymentDate,jdbcType=TIMESTAMP},
       </if>
-      
-       <if test="firstContacts!= null">
-      	first_contacts = #{firstContacts,jdbcType=VARCHAR},
+      <if test="firstContacts != null" >
+        first_contacts = #{firstContacts,jdbcType=VARCHAR},
       </if>
-      <if test="firstMobile != null">
-      	first_mobile = #{firstMobile,jdbcType=VARCHAR},
+      <if test="firstMobile != null" >
+        first_mobile = #{firstMobile,jdbcType=VARCHAR},
       </if>
-      <if test="secondContacts != null">
-      	second_contacts = #{secondContacts,jdbcType=VARCHAR},
+      <if test="secondContacts != null" >
+        second_contacts = #{secondContacts,jdbcType=VARCHAR},
       </if>
-      <if test="secondMobile != null">
-      	second_mobile = #{secondMobile,jdbcType=VARCHAR},
+      <if test="secondMobile != null" >
+        second_mobile = #{secondMobile,jdbcType=VARCHAR},
       </if>
-      <if test="thirdContacts != null">
-      	third_contacts = #{thirdContacts,jdbcType=VARCHAR},
+      <if test="thirdContacts != null" >
+        third_contacts = #{thirdContacts,jdbcType=VARCHAR},
       </if>
-      <if test="thirdMobile != null">
-      	third_mobile = #{thirdMobile,jdbcType=VARCHAR},
+      <if test="thirdMobile != null" >
+        third_mobile = #{thirdMobile,jdbcType=VARCHAR},
       </if>
-      
       <if test="listed != null" >
         listed = #{listed,jdbcType=INTEGER},
       </if>
@@ -546,20 +673,72 @@
       <if test="stockCode != null" >
         stock_code = #{stockCode,jdbcType=VARCHAR},
       </if>
-      
-       <if test="certificateNumber != null" >
+      <if test="certificateNumber != null" >
         certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       </if>
       <if test="issuingDate != null" >
         issuing_date = #{issuingDate,jdbcType=TIMESTAMP},
       </if>
-      
-       <if test="cogContacts != null" >
+      <if test="cogContacts != null" >
         cog_contacts = #{cogContacts,jdbcType=INTEGER},
       </if>
       <if test="consultant != null" >
         consultant = #{consultant,jdbcType=VARCHAR},
       </if>
+      <if test="contactsFixedTel != null" >
+        contacts_fixed_tel = #{contactsFixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsFax != null" >
+        contacts_fax = #{contactsFax,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonTel != null" >
+        legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonFax != null" >
+        legal_person_fax = #{legalPersonFax,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonEmail != null" >
+        legal_person_email = #{legalPersonEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="registrationTime != null" >
+        registration_time = #{registrationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ratepayCode != null" >
+        ratepay_code = #{ratepayCode,jdbcType=VARCHAR},
+      </if>
+      <if test="industry != null" >
+        industry = #{industry,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseScale != null" >
+        enterprise_scale = #{enterpriseScale,jdbcType=INTEGER},
+      </if>
+      <if test="registerType != null" >
+        register_type = #{registerType,jdbcType=VARCHAR},
+      </if>
+      <if test="foreignInvestment != null" >
+        foreign_investment = #{foreignInvestment,jdbcType=VARCHAR},
+      </if>
+      <if test="field != null" >
+        field = #{field,jdbcType=VARCHAR},
+      </if>
+      <if test="taxAuthority != null" >
+        tax_authority = #{taxAuthority,jdbcType=INTEGER},
+      </if>
+      <if test="ratepayMethod != null" >
+        ratepay_method = #{ratepayMethod,jdbcType=INTEGER},
+      </if>
+      <if test="highTechZone != null" >
+        high_tech_zone = #{highTechZone,jdbcType=INTEGER},
+      </if>
+      <if test="riskInvestment != null" >
+        risk_investment = #{riskInvestment,jdbcType=INTEGER},
+      </if>
+      <if test="businessScope != null" >
+        business_scope = #{businessScope,jdbcType=VARCHAR},
+      </if>
+       <if test="highTechName != null" >
+        high_tech_name = #{highTechName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -574,7 +753,7 @@
       postcode = #{postcode,jdbcType=VARCHAR},
       aft_username = #{aftUsername,jdbcType=VARCHAR},
       unit_name = #{unitName,jdbcType=VARCHAR},
-      registered_capital = #{registeredCapital,jdbcType=INTEGER},
+      registered_capital = #{registeredCapital,jdbcType=DECIMAL},
       licence_number = #{licenceNumber,jdbcType=VARCHAR},
       licence_province = #{licenceProvince,jdbcType=VARCHAR},
       licence_city = #{licenceCity,jdbcType=VARCHAR},
@@ -604,18 +783,32 @@
       second_mobile = #{secondMobile,jdbcType=VARCHAR},
       third_contacts = #{thirdContacts,jdbcType=VARCHAR},
       third_mobile = #{thirdMobile,jdbcType=VARCHAR},
-      
       listed = #{listed,jdbcType=INTEGER},
       listed_date = #{listedDate,jdbcType=TIMESTAMP},
       listed_type = #{listedType,jdbcType=INTEGER},
       stock_code = #{stockCode,jdbcType=VARCHAR},
-      
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       issuing_date = #{issuingDate,jdbcType=TIMESTAMP},
-      
       cog_contacts = #{cogContacts,jdbcType=INTEGER},
-      consultant = #{consultant,jdbcType=VARCHAR}
-      }
+      consultant = #{consultant,jdbcType=VARCHAR},
+      contacts_fixed_tel = #{contactsFixedTel,jdbcType=VARCHAR},
+      contacts_fax = #{contactsFax,jdbcType=VARCHAR},
+      legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      legal_person_fax = #{legalPersonFax,jdbcType=VARCHAR},
+      legal_person_email = #{legalPersonEmail,jdbcType=VARCHAR},
+      registration_time = #{registrationTime,jdbcType=TIMESTAMP},
+      ratepay_code = #{ratepayCode,jdbcType=VARCHAR},
+      industry = #{industry,jdbcType=INTEGER},
+      enterprise_scale = #{enterpriseScale,jdbcType=INTEGER},
+      register_type = #{registerType,jdbcType=VARCHAR},
+      foreign_investment = #{foreignInvestment,jdbcType=VARCHAR},
+      field = #{field,jdbcType=VARCHAR},
+      tax_authority = #{taxAuthority,jdbcType=INTEGER},
+      ratepay_method = #{ratepayMethod,jdbcType=INTEGER},
+      high_tech_zone = #{highTechZone,jdbcType=INTEGER},
+      risk_investment = #{riskInvestment,jdbcType=INTEGER},
+      business_scope = #{businessScope,jdbcType=VARCHAR},
+      high_tech_name = #{highTechName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -644,5 +837,24 @@
     from organization_identity where audit_status = 5
   </select>
   
+  <select id="selectBasicInfo" resultType="com.goafanti.user.bo.OrgBasicInfoBo"  >
+   select oi.id, 
+       oi.uid as uid, oi.unit_name as unitName, oi.licence_province as province,
+	   oi.licence_city as city, oi.licence_area as area, oi.postal_address as postalAddress,
+       oi.postcode, oi.contacts, oi.contact_mobile as contactMobile,
+       oi.contacts_fixed_tel as contactsFixedTel, oi.contacts_fax as contactsFax,oi.legal_person_tel as legalPersonTel,
+       oi.legal_person_fax as legalPersonFax, oi.legal_person_email as legalPersonEmail, oi.registered_capital as registeredCapital,
+       oi.registration_time as registrationTime, oi.legal_person as legalPerson, oi.legal_person_id_card as legalPersonIdCard, oi.org_code as orgCode,
+	   oi.ratepay_code as ratepayCode, oi.industry, oi.enterprise_scale as enterpriseScale, oi.register_type as registerType,
+       oi.foreign_investment as foreignInvestment, oi.field, oi.tax_authority as taxAuthority,
+       oi.ratepay_method as ratepayMethod, oi.listed, oi.high_tech_zone as highTechZone, oi.risk_investment as riskInvestment,
+	   oi.business_scope as businessScope, oi.high_tech_name as highTechName,
+       ohr.id as hid, ohr.firm_total as firmTotal, ohr.tech_total as techTotal
+    from organization_identity oi 
+    LEFT JOIN org_human_resource ohr
+    on oi.uid = ohr.uid  and ohr.year = #{1}
+    where oi.uid = #{0}
+  </select>
+  
    
 </mapper>

+ 244 - 1
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -244,6 +244,100 @@ public class OrganizationIdentity {
      */
     private String consultant;
     
+    /**
+	 * 联系人电话
+	 */
+	private String contactsFixedTel;
+	
+	/**
+	 * 联系人传真
+	 */
+	private String contactsFax;
+	
+	/**
+	 * 法人电话
+	 */
+	private String legalPersonTel;
+	
+	/**
+	 * 法人传真
+	 */
+	private String legalPersonFax;
+	
+	/**
+	 * 法人Email
+	 */
+	private String legalPersonEmail;
+	
+	
+	/**
+	 * 注册时间
+	 */
+	private Date registrationTime;
+	
+	
+	
+	/**
+	 * 税务登记号/统一社会信用代码
+	 */
+	private String ratepayCode;
+	
+	/**
+	 * 所属行业
+	 */
+	private Integer industry;
+	
+	/**
+	 * 企业规模(注册资金)
+	 */
+	private Integer enterpriseScale;
+	
+	/**
+	 * 注册类型
+	 */
+	private String registerType;
+	
+	/**
+	 * 外资来源地
+	 */
+	private String foreignInvestment;
+	
+	/**
+	 * 领域
+	 */
+	private String field;
+	
+	/**
+	 * 企业所得税主管税务机关
+	 */
+	private Integer taxAuthority;
+	
+	/**
+	 * 企业所得税征收方式
+	 */
+	private Integer ratepayMethod;
+	
+	
+	/**
+	 * 是否属于国家级高新区内企业
+	 */
+	private Integer highTechZone;
+	
+	/**
+	 * 是否引入风险投资
+	 */
+	private Integer riskInvestment;
+	
+	/**
+	 * 经营范围
+	 */
+	private String businessScope;
+	
+	/**
+	 * 国家级高新区名称
+	 */
+	private String highTechName;
+    
 
     public String getId() {
         return id;
@@ -638,6 +732,155 @@ public class OrganizationIdentity {
 	public void setConsultant(String consultant) {
 		this.consultant = consultant;
 	}
+	
+	
+
+	public String getContactsFixedTel() {
+		return contactsFixedTel;
+	}
+
+	public void setContactsFixedTel(String contactsFixedTel) {
+		this.contactsFixedTel = contactsFixedTel;
+	}
+
+	public String getContactsFax() {
+		return contactsFax;
+	}
+
+	public void setContactsFax(String contactsFax) {
+		this.contactsFax = contactsFax;
+	}
+
+	public String getLegalPersonTel() {
+		return legalPersonTel;
+	}
+
+	public void setLegalPersonTel(String legalPersonTel) {
+		this.legalPersonTel = legalPersonTel;
+	}
+
+	public String getLegalPersonFax() {
+		return legalPersonFax;
+	}
+
+	public void setLegalPersonFax(String legalPersonFax) {
+		this.legalPersonFax = legalPersonFax;
+	}
+
+	public String getLegalPersonEmail() {
+		return legalPersonEmail;
+	}
+
+	public void setLegalPersonEmail(String legalPersonEmail) {
+		this.legalPersonEmail = legalPersonEmail;
+	}
+
+	public Date getRegistrationTime() {
+		return registrationTime;
+	}
+
+	public void setRegistrationTime(Date registrationTime) {
+		this.registrationTime = registrationTime;
+	}
+
+	public String getRatepayCode() {
+		return ratepayCode;
+	}
+
+	public void setRatepayCode(String ratepayCode) {
+		this.ratepayCode = ratepayCode;
+	}
+
+	public Integer getIndustry() {
+		return industry;
+	}
+
+	public void setIndustry(Integer industry) {
+		this.industry = industry;
+	}
+
+	public Integer getEnterpriseScale() {
+		return enterpriseScale;
+	}
+
+	public void setEnterpriseScale(Integer enterpriseScale) {
+		this.enterpriseScale = enterpriseScale;
+	}
+
+
+	public String getRegisterType() {
+		return registerType;
+	}
+
+	public void setRegisterType(String registerType) {
+		this.registerType = registerType;
+	}
+
+	public String getForeignInvestment() {
+		return foreignInvestment;
+	}
+
+	public void setForeignInvestment(String foreignInvestment) {
+		this.foreignInvestment = foreignInvestment;
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public Integer getTaxAuthority() {
+		return taxAuthority;
+	}
+
+	public void setTaxAuthority(Integer taxAuthority) {
+		this.taxAuthority = taxAuthority;
+	}
+
+	public Integer getRatepayMethod() {
+		return ratepayMethod;
+	}
+
+	public void setRatepayMethod(Integer ratepayMethod) {
+		this.ratepayMethod = ratepayMethod;
+	}
+
+	public Integer getHighTechZone() {
+		return highTechZone;
+	}
+
+	public void setHighTechZone(Integer highTechZone) {
+		this.highTechZone = highTechZone;
+	}
+
+	public Integer getRiskInvestment() {
+		return riskInvestment;
+	}
+
+	public void setRiskInvestment(Integer riskInvestment) {
+		this.riskInvestment = riskInvestment;
+	}
+
+	public String getBusinessScope() {
+		return businessScope;
+	}
+
+	public void setBusinessScope(String businessScope) {
+		this.businessScope = businessScope;
+	}
+	
+	
+
+	public String getHighTechName() {
+		return highTechName;
+	}
+
+	public void setHighTechName(String highTechName) {
+		this.highTechName = highTechName;
+	}
 
 	//打款日期
 	public String getPaymentDateFormattedDate(){
@@ -657,7 +900,7 @@ public class OrganizationIdentity {
 		if (this.listedDate == null) {
 			 return null;
 		   } else {
-			 return DateFormatUtils.format(this.getListedDate(), AFTConstants.YYYYMMDDHHMMSS);
+			 return DateFormatUtils.format(this.getListedDate(), AFTConstants.YYYYMMDD);
 		   }
 	}
 		

+ 565 - 0
src/main/java/com/goafanti/user/bo/InputOrgBasicInfo.java

@@ -0,0 +1,565 @@
+package com.goafanti.user.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+import com.goafanti.common.constant.ErrorConstants;
+
+public class InputOrgBasicInfo {
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		id;
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		uid;
+	
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		hid;
+
+	/**
+	 * 企业名称
+	 */
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		unitName;
+
+	/**
+	 * 行政区域--省
+	 */
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		province;
+
+	/**
+	 * 行政区域--市
+	 */
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		city;
+
+	/**
+	 * 行政区域--区
+	 */
+	@Size(min = 0, max = 12, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		area;
+
+	/**
+	 * 通讯地址
+	 */
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		postalAddress;
+
+	/**
+	 * 邮编
+	 */
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		postcode;
+
+	/**
+	 * 联系人姓名
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		contacts;
+
+	/**
+	 * 联系人手机
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Pattern(regexp = "^([1-9])\\d{10}$", message = "{" + ErrorConstants.MOBILE_PATTERN_ERROR + "}")
+	private String		contactMobile;
+
+	/**
+	 * 联系人电话
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		contactsFixedTel;
+
+	/**
+	 * 联系人传真
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		contactsFax;
+
+	/**
+	 * 法人电话
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		legalPersonTel;
+
+	/**
+	 * 法人传真
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		legalPersonFax;
+
+	/**
+	 * 法人Email
+	 */
+	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Pattern(regexp = "^([a-z0-9A-Z]+[_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$", message = "{"
+			+ ErrorConstants.EMAIL_PATTERN_ERROR + "}")
+	private String		legalPersonEmail;
+
+	/**
+	 * 注册资金
+	 */
+	@Max(value = (long)999999.99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private BigDecimal	registeredCapital;
+
+	/**
+	 * 注册时间
+	 */
+	private Date		registrationTime;
+
+	/**
+	 * 法人代表姓名
+	 */
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		legalPerson;
+
+	/**
+	 * 法人身份证号
+	 */
+	@Size(min = 0, max = 18, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		legalPersonIdCard;
+
+	/**
+	 * 组织机构代码/统一社会信用代码
+	 */
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		orgCode;
+
+	/**
+	 * 税务登记号/统一社会信用代码
+	 */
+	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		ratepayCode;
+
+	/**
+	 * 所属行业
+	 */
+	@Max(value = 99, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		industry;
+
+	/**
+	 * 企业规模(注册资金)
+	 */
+	@Max(value = 9, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		enterpriseScale;
+
+	/**
+	 * 注册类型
+	 */
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		registerType;
+
+	/**
+	 * 外资来源地
+	 */
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		foreignInvestment;
+
+	/**
+	 * 领域
+	 */
+	@Size(min = 0, max = 8, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		field;
+
+	/**
+	 * 企业所得税主管税务机关
+	 */
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		taxAuthority;
+
+	/**
+	 * 企业所得税征收方式
+	 */
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		ratepayMethod;
+
+	/**
+	 * 是否上市
+	 */
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		listed;
+
+	/**
+	 * 是否属于国家级高新区内企业
+	 */
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		highTechZone;
+
+	/**
+	 * 是否引入风险投资
+	 */
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		riskInvestment;
+
+	/**
+	 * 经营范围
+	 */
+	@Size(min = 0, max = 398, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String		businessScope;
+
+	/**
+	 * 企业职工
+	 */
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		firmTotal;
+
+	/**
+	 * 科技人员
+	 */
+	@Max(value = 999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer		techTotal;
+	
+	/**
+	 * 上市时间
+	 */
+	private Date listedDate;
+	
+	/**
+	 * 上市类型
+	 */
+	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer listedType;
+	
+	/**
+	 * 股票代码
+	 */
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String stockCode;
+	
+	/**
+	 * 国家级高新区名称
+	 */
+	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String highTechName;
+
+	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 getHid() {
+		return hid;
+	}
+
+	public void setHid(String hid) {
+		this.hid = hid;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getArea() {
+		return area;
+	}
+
+	public void setArea(String area) {
+		this.area = area;
+	}
+
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
+	public String getPostcode() {
+		return postcode;
+	}
+
+	public void setPostcode(String postcode) {
+		this.postcode = postcode;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
+	public String getContactsFixedTel() {
+		return contactsFixedTel;
+	}
+
+	public void setContactsFixedTel(String contactsFixedTel) {
+		this.contactsFixedTel = contactsFixedTel;
+	}
+
+	public String getContactsFax() {
+		return contactsFax;
+	}
+
+	public void setContactsFax(String contactsFax) {
+		this.contactsFax = contactsFax;
+	}
+
+	public String getLegalPersonTel() {
+		return legalPersonTel;
+	}
+
+	public void setLegalPersonTel(String legalPersonTel) {
+		this.legalPersonTel = legalPersonTel;
+	}
+
+	public String getLegalPersonFax() {
+		return legalPersonFax;
+	}
+
+	public void setLegalPersonFax(String legalPersonFax) {
+		this.legalPersonFax = legalPersonFax;
+	}
+
+	public String getLegalPersonEmail() {
+		return legalPersonEmail;
+	}
+
+	public void setLegalPersonEmail(String legalPersonEmail) {
+		this.legalPersonEmail = legalPersonEmail;
+	}
+
+	public BigDecimal getRegisteredCapital() {
+		return registeredCapital;
+	}
+
+	public void setRegisteredCapital(BigDecimal registeredCapital) {
+		this.registeredCapital = registeredCapital;
+	}
+
+	public Date getRegistrationTime() {
+		return registrationTime;
+	}
+
+	public void setRegistrationTime(Date registrationTime) {
+		this.registrationTime = registrationTime;
+	}
+
+	public String getLegalPerson() {
+		return legalPerson;
+	}
+
+	public void setLegalPerson(String legalPerson) {
+		this.legalPerson = legalPerson;
+	}
+
+	public String getLegalPersonIdCard() {
+		return legalPersonIdCard;
+	}
+
+	public void setLegalPersonIdCard(String legalPersonIdCard) {
+		this.legalPersonIdCard = legalPersonIdCard;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRatepayCode() {
+		return ratepayCode;
+	}
+
+	public void setRatepayCode(String ratepayCode) {
+		this.ratepayCode = ratepayCode;
+	}
+
+	public Integer getIndustry() {
+		return industry;
+	}
+
+	public void setIndustry(Integer industry) {
+		this.industry = industry;
+	}
+
+	public Integer getEnterpriseScale() {
+		return enterpriseScale;
+	}
+
+	public void setEnterpriseScale(Integer enterpriseScale) {
+		this.enterpriseScale = enterpriseScale;
+	}
+
+
+	public String getRegisterType() {
+		return registerType;
+	}
+
+	public void setRegisterType(String registerType) {
+		this.registerType = registerType;
+	}
+
+	public String getForeignInvestment() {
+		return foreignInvestment;
+	}
+
+	public void setForeignInvestment(String foreignInvestment) {
+		this.foreignInvestment = foreignInvestment;
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public Integer getTaxAuthority() {
+		return taxAuthority;
+	}
+
+	public void setTaxAuthority(Integer taxAuthority) {
+		this.taxAuthority = taxAuthority;
+	}
+
+	public Integer getRatepayMethod() {
+		return ratepayMethod;
+	}
+
+	public void setRatepayMethod(Integer ratepayMethod) {
+		this.ratepayMethod = ratepayMethod;
+	}
+
+	public Integer getListed() {
+		return listed;
+	}
+
+	public void setListed(Integer listed) {
+		this.listed = listed;
+	}
+
+	public Integer getHighTechZone() {
+		return highTechZone;
+	}
+
+	public void setHighTechZone(Integer highTechZone) {
+		this.highTechZone = highTechZone;
+	}
+
+	public Integer getRiskInvestment() {
+		return riskInvestment;
+	}
+
+	public void setRiskInvestment(Integer riskInvestment) {
+		this.riskInvestment = riskInvestment;
+	}
+
+	public String getBusinessScope() {
+		return businessScope;
+	}
+
+	public void setBusinessScope(String businessScope) {
+		this.businessScope = businessScope;
+	}
+
+	public Integer getFirmTotal() {
+		return firmTotal;
+	}
+
+	public void setFirmTotal(Integer firmTotal) {
+		this.firmTotal = firmTotal;
+	}
+
+	public Integer getTechTotal() {
+		return techTotal;
+	}
+
+	public void setTechTotal(Integer techTotal) {
+		this.techTotal = techTotal;
+	}
+
+	public Date getListedDate() {
+		return listedDate;
+	}
+
+	public void setListedDate(Date listedDate) {
+		this.listedDate = listedDate;
+	}
+
+	public Integer getListedType() {
+		return listedType;
+	}
+
+	public void setListedType(Integer listedType) {
+		this.listedType = listedType;
+	}
+
+	public String getStockCode() {
+		return stockCode;
+	}
+
+	public void setStockCode(String stockCode) {
+		this.stockCode = stockCode;
+	}
+
+	public String getHighTechName() {
+		return highTechName;
+	}
+
+	public void setHighTechName(String highTechName) {
+		this.highTechName = highTechName;
+	}
+	
+
+}

+ 549 - 0
src/main/java/com/goafanti/user/bo/OrgBasicInfoBo.java

@@ -0,0 +1,549 @@
+package com.goafanti.user.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+import com.goafanti.common.constant.AFTConstants;
+
+public class OrgBasicInfoBo {
+	private String id;
+	
+	private String uid;
+	
+	private String hid;
+	
+	/**
+	 * 企业名称
+	 */
+	private String unitName; 
+	
+	
+	/**
+	 * 行政区域--省
+	 */
+	private String province;
+	
+	/**
+	 * 行政区域--市
+	 */
+	private String city;
+	
+	/**
+	 * 行政区域--区
+	 */
+	private String area;
+	
+	/**
+	 * 通讯地址
+	 */
+	private String postalAddress;
+	
+	/**
+	 * 邮编
+	 */
+	private String postcode;
+	
+	/**
+	 * 联系人姓名
+	 */
+	private String contacts;
+	
+	/**
+	 * 联系人手机
+	 */
+	private String contactMobile;
+	
+	/**
+	 * 联系人电话
+	 */
+	private String contactsFixedTel;
+	
+	/**
+	 * 联系人传真
+	 */
+	private String contactsFax;
+	
+	/**
+	 * 法人电话
+	 */
+	private String legalPersonTel;
+	
+	/**
+	 * 法人传真
+	 */
+	private String legalPersonFax;
+	
+	/**
+	 * 法人Email
+	 */
+	private String legalPersonEmail;
+	
+	/**
+	 * 注册资金
+	 */
+	private BigDecimal registeredCapital;
+	
+	/**
+	 * 注册时间
+	 */
+	private Date registrationTime;
+	
+	/**
+	 * 法人代表姓名
+	 */
+	private String legalPerson;
+	
+	/**
+	 * 法人身份证号
+	 */
+	private String legalPersonIdCard;
+	
+	/**
+	 * 组织机构代码/统一社会信用代码
+	 */
+	private String orgCode;
+	
+	/**
+	 * 税务登记号/统一社会信用代码
+	 */
+	private String ratepayCode;
+	
+	/**
+	 * 所属行业
+	 */
+	private Integer industry;
+	
+	/**
+	 * 企业规模(注册资金)
+	 */
+	private Integer enterpriseScale;
+	
+	/**
+	 * 注册类型
+	 */
+	private String registerType;
+	
+	/**
+	 * 外资来源地
+	 */
+	private String foreignInvestment;
+	
+	/**
+	 * 领域
+	 */
+	private String field;
+	
+	/**
+	 * 企业所得税主管税务机关
+	 */
+	private Integer taxAuthority;
+	
+	/**
+	 * 企业所得税征收方式
+	 */
+	private Integer ratepayMethod;
+	
+	/**
+	 * 是否上市
+	 */
+	private Integer listed;
+	
+	/**
+	 * 上市时间
+	 */
+	private Date listedDate;
+	
+	/**
+	 * 上市类型
+	 */
+	private Integer listedType;
+	
+	/**
+	 * 股票代码
+	 */
+	private String stockCode;
+	
+	/**
+	 * 是否属于国家级高新区内企业
+	 */
+	private Integer highTechZone;
+	
+	/**
+	 * 国家级高新区名称
+	 */
+	private String highTechName;
+	
+	/**
+	 * 是否引入风险投资
+	 */
+	private Integer riskInvestment;
+	
+	/**
+	 * 经营范围
+	 */
+	private String businessScope;
+	
+	/**
+	 * 企业职工
+	 */
+	private Integer firmTotal;
+	
+	/**
+	 * 科技人员
+	 */
+	private Integer techTotal;
+
+	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 getHid() {
+		return hid;
+	}
+
+	public void setHid(String hid) {
+		this.hid = hid;
+	}
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getArea() {
+		return area;
+	}
+
+	public void setArea(String area) {
+		this.area = area;
+	}
+
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
+	public String getPostcode() {
+		return postcode;
+	}
+
+	public void setPostcode(String postcode) {
+		this.postcode = postcode;
+	}
+
+	public String getContacts() {
+		return contacts;
+	}
+
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
+
+	public String getContactMobile() {
+		return contactMobile;
+	}
+
+	public void setContactMobile(String contactMobile) {
+		this.contactMobile = contactMobile;
+	}
+
+	public String getContactsFixedTel() {
+		return contactsFixedTel;
+	}
+
+	public void setContactsFixedTel(String contactsFixedTel) {
+		this.contactsFixedTel = contactsFixedTel;
+	}
+
+	public String getContactsFax() {
+		return contactsFax;
+	}
+
+	public void setContactsFax(String contactsFax) {
+		this.contactsFax = contactsFax;
+	}
+
+	public String getLegalPersonTel() {
+		return legalPersonTel;
+	}
+
+	public void setLegalPersonTel(String legalPersonTel) {
+		this.legalPersonTel = legalPersonTel;
+	}
+
+	public String getLegalPersonFax() {
+		return legalPersonFax;
+	}
+
+	public void setLegalPersonFax(String legalPersonFax) {
+		this.legalPersonFax = legalPersonFax;
+	}
+
+	public String getLegalPersonEmail() {
+		return legalPersonEmail;
+	}
+
+	public void setLegalPersonEmail(String legalPersonEmail) {
+		this.legalPersonEmail = legalPersonEmail;
+	}
+
+	public BigDecimal getRegisteredCapital() {
+		return registeredCapital;
+	}
+
+	public void setRegisteredCapital(BigDecimal registeredCapital) {
+		this.registeredCapital = registeredCapital;
+	}
+
+	public Date getRegistrationTime() {
+		return registrationTime;
+	}
+
+	public void setRegistrationTime(Date registrationTime) {
+		this.registrationTime = registrationTime;
+	}
+
+	public String getLegalPerson() {
+		return legalPerson;
+	}
+
+	public void setLegalPerson(String legalPerson) {
+		this.legalPerson = legalPerson;
+	}
+
+	public String getLegalPersonIdCard() {
+		return legalPersonIdCard;
+	}
+
+	public void setLegalPersonIdCard(String legalPersonIdCard) {
+		this.legalPersonIdCard = legalPersonIdCard;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRatepayCode() {
+		return ratepayCode;
+	}
+
+	public void setRatepayCode(String ratepayCode) {
+		this.ratepayCode = ratepayCode;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getIndustry() {
+		return industry;
+	}
+
+	public void setIndustry(Integer industry) {
+		this.industry = industry;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getEnterpriseScale() {
+		return enterpriseScale;
+	}
+
+	public void setEnterpriseScale(Integer enterpriseScale) {
+		this.enterpriseScale = enterpriseScale;
+	}
+	
+    
+	public String getRegisterType() {
+		return registerType;
+	}
+
+	public void setRegisterType(String registerType) {
+		this.registerType = registerType;
+	}
+
+	public String getForeignInvestment() {
+		return foreignInvestment;
+	}
+
+	public void setForeignInvestment(String foreignInvestment) {
+		this.foreignInvestment = foreignInvestment;
+	}
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getTaxAuthority() {
+		return taxAuthority;
+	}
+
+	public void setTaxAuthority(Integer taxAuthority) {
+		this.taxAuthority = taxAuthority;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getRatepayMethod() {
+		return ratepayMethod;
+	}
+
+	public void setRatepayMethod(Integer ratepayMethod) {
+		this.ratepayMethod = ratepayMethod;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getListed() {
+		return listed;
+	}
+
+	public void setListed(Integer listed) {
+		this.listed = listed;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getHighTechZone() {
+		return highTechZone;
+	}
+
+	public void setHighTechZone(Integer highTechZone) {
+		this.highTechZone = highTechZone;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getRiskInvestment() {
+		return riskInvestment;
+	}
+
+	public void setRiskInvestment(Integer riskInvestment) {
+		this.riskInvestment = riskInvestment;
+	}
+
+	public String getBusinessScope() {
+		return businessScope;
+	}
+
+	public void setBusinessScope(String businessScope) {
+		this.businessScope = businessScope;
+	}
+
+	public Integer getFirmTotal() {
+		return firmTotal;
+	}
+
+	public void setFirmTotal(Integer firmTotal) {
+		this.firmTotal = firmTotal;
+	}
+
+	public Integer getTechTotal() {
+		return techTotal;
+	}
+
+	public void setTechTotal(Integer techTotal) {
+		this.techTotal = techTotal;
+	}
+	
+	public Date getListedDate() {
+		return listedDate;
+	}
+
+	public void setListedDate(Date listedDate) {
+		this.listedDate = listedDate;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getListedType() {
+		return listedType;
+	}
+
+	public void setListedType(Integer listedType) {
+		this.listedType = listedType;
+	}
+
+	public String getStockCode() {
+		return stockCode;
+	}
+
+	public void setStockCode(String stockCode) {
+		this.stockCode = stockCode;
+	}
+
+	public String getHighTechName() {
+		return highTechName;
+	}
+
+	public void setHighTechName(String highTechName) {
+		this.highTechName = highTechName;
+	}
+
+	public String getRegistrationTimeFormattedDate() {
+		if (this.registrationTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getRegistrationTime(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setRegistrationTimeFormattedDate(String registrationTimeFormattedDate) {
+
+	}
+	
+	public String getListedDateFormattedDate() {
+		if (this.listedDate == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getListedDate(), AFTConstants.YYYYMMDD);
+		}
+	}
+
+	public void setListedDateFormattedDate(String listedDateFormattedDate) {
+
+	}
+	
+	
+	
+	
+
+}

+ 2 - 0
src/main/java/com/goafanti/user/service/NatureOwnershipService.java

@@ -10,4 +10,6 @@ public interface NatureOwnershipService {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
+	int batchInsert(List<NatureOwnership> no);
+
 }

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

@@ -4,7 +4,9 @@ import java.util.List;
 import java.util.Map;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
 
 public interface OrganizationIdentityService {
@@ -29,6 +31,11 @@ public interface OrganizationIdentityService {
 
 	int updateOrgDetail(OrganizationIdentity orgIdentity);
 
+	OrgBasicInfoBo selectBasicInfo(String uid, int year);
+
+	int saveBasicInfo(OrganizationIdentity oi, OrgHumanResource ohr);
+
+
 
 	
 

+ 5 - 0
src/main/java/com/goafanti/user/service/impl/NatureOwnershipServiceImpl.java

@@ -23,4 +23,9 @@ public class NatureOwnershipServiceImpl implements NatureOwnershipService {
 		return natureOwnershipMapper.batchDeleteByPrimaryKey(id);
 	}
 
+	@Override
+	public int batchInsert(List<NatureOwnership> no) {
+		return natureOwnershipMapper.batchInsert(no);
+	}
+
 }

+ 35 - 3
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -11,13 +11,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.dao.OrgHumanResourceMapper;
 import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.enums.DeleteStatus;
+import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrgRatepay;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 
@@ -25,11 +29,13 @@ import com.goafanti.user.service.OrganizationIdentityService;
 public class OrganizationIdentityServiceImpl extends BaseMybatisDao<OrganizationIdentityMapper>
 		implements OrganizationIdentityService {
 	@Autowired
-	OrganizationIdentityMapper	organizationIdentityMapper;
+	private OrganizationIdentityMapper	organizationIdentityMapper;
 	@Autowired
-	OrgRatepayMapper			orgRatepayMapper;
+	private OrgRatepayMapper			orgRatepayMapper;
 	@Autowired
-	UserMapper					userMapper;
+	private UserMapper					userMapper;
+	@Autowired
+	private OrgHumanResourceMapper orgHumanResourceMapper;
 
 	@Override
 	public OrganizationIdentity insert(OrganizationIdentity organizationIdentity) {
@@ -137,4 +143,30 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		return organizationIdentityMapper.updateByPrimaryKeySelective(orgIdentity);
 	}
 
+	@Override
+	public OrgBasicInfoBo selectBasicInfo(String uid, int year) {
+		return organizationIdentityMapper.selectBasicInfo(uid, year);
+	}
+
+	@Override
+	public int saveBasicInfo(OrganizationIdentity oi, OrgHumanResource ohr) {
+		if (StringUtils.isBlank(oi.getId())){
+			oi.setId(UUID.randomUUID().toString());
+			organizationIdentityMapper.insert(oi);
+		} else {
+			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
+		}
+		
+		if (StringUtils.isBlank(ohr.getId())){
+			ohr.setId(UUID.randomUUID().toString());
+			ohr.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+			Calendar now = Calendar.getInstance();
+			ohr.setYear(now.get(Calendar.YEAR) - 1);
+			orgHumanResourceMapper.insert(ohr);
+		} else {
+			orgHumanResourceMapper.updateByPrimaryKeySelective(ohr);
+		}
+		return 1;
+	}
+
 }