Browse Source

企业人力资源属性字段更改

Antiloveg 9 years ago
parent
commit
407acd2064

+ 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},

+ 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;
     }
 

+ 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;