好多更新

pom.xml

@@ -44,6 +44,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
+		<dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 		<!-- 引入spring boot自带的pagehelper插件 -->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>

src/main/java/com/chinaitop/WebSecurityConfig.java

@@ -0,0 +1,37 @@
+package com.chinaitop;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
+	@Override
+    protected void configure(HttpSecurity http) throws Exception {
+		String[] urls = {
+                "*",
+                "/*",
+                "/*/*",
+                "/*/*/*",
+                "/*/*/*/*",
+                "/*/*/*/*/*/*",
+                "/login"
+        };
+
+		http.authorizeRequests().anyRequest().permitAll() //允许所有用户访问所有资源
+        .and()
+        .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
+
+//        super.configure(http);
+//        
+//        http.authorizeRequests() // 对请求执行认证与授权
+//                .antMatchers(urls) // 匹配某些请求路径
+//                .permitAll() // （对此前匹配的请求路径）不需要通过认证即允许访问
+//                .anyRequest() // 除以上配置过的请求路径以外的所有请求路径
+//                .authenticated(); // 要求是已经通过认证的
+//        super.configure(http);
+    }
+}

src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperEducationMapper.xml

@@ -18,6 +18,9 @@
     <result column="sfwslzy" jdbcType="VARCHAR" property="sfwslzy" />
     <result column="zsbh" jdbcType="VARCHAR" property="zsbh" />
     <result column="rych" jdbcType="VARCHAR" property="rych" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER"  />
+    <result column="fzywlx" jdbcType="VARCHAR" property="fzywlx" />
+    <result column="fzywsj" jdbcType="TIMESTAMP" property="fzywsj" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -79,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, keeper_id, datatype, type, occupation, college, department, education, degree, 
-    degree_detailed, rank, issue_facility, issue_time, sfwslzy, zsbh, rych
+    degree_detailed, rank, issue_facility, issue_time, sfwslzy, zsbh, rych, org_id, fzywlx, fzywsj
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperEducationExample" resultMap="BaseResultMap">
     select
@@ -120,13 +123,13 @@
       department, education, degree, 
       degree_detailed, rank, issue_facility, 
       issue_time, sfwslzy, 
-      zsbh, rych)
+      zsbh, rych, org_id, fzywlx, fzywsj)
     values (#{id,jdbcType=INTEGER}, #{keeperId,jdbcType=INTEGER}, #{datatype,jdbcType=INTEGER}, 
       #{type,jdbcType=INTEGER}, #{occupation,jdbcType=INTEGER}, #{college,jdbcType=VARCHAR}, 
       #{department,jdbcType=VARCHAR}, #{education,jdbcType=INTEGER}, #{degree,jdbcType=INTEGER}, 
       #{degreeDetailed,jdbcType=INTEGER}, #{rank,jdbcType=INTEGER}, #{issueFacility,jdbcType=VARCHAR}, 
       #{issueTime,jdbcType=TIMESTAMP}, #{sfwslzy,jdbcType=VARCHAR}, 
-      #{zsbh,jdbcType=VARCHAR}, #{rych,jdbcType=VARCHAR})
+      #{zsbh,jdbcType=VARCHAR}, #{rych,jdbcType=VARCHAR}, #{org_id,jdbcType=INTEGER}, #{fzywlx,jdbcType=VARCHAR}, #{fzywsj,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicKeeperEducation">
     <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Integer">
@@ -182,6 +185,15 @@
       <if test="rych != null">
         rych,
       </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="fzywlx != null">
+        fzywlx,
+      </if>
+      <if test="fzywsj != null">
+        fzywsj,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -232,6 +244,15 @@
       <if test="rych != null">
         #{rych,jdbcType=VARCHAR},
       </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="fzywlx != null">
+        #{fzywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="fzywsj != null">
+        #{fzywsj,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperEducationExample" resultType="java.lang.Integer">
@@ -291,6 +312,15 @@
       <if test="record.rych != null">
         rych = #{record.rych,jdbcType=VARCHAR},
       </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.fzywlx != null">
+        fzywlx = #{record.fzywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fzywsj != null">
+        fzywsj = #{record.fzywsj,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -313,7 +343,10 @@
       issue_time = #{record.issueTime,jdbcType=TIMESTAMP},
       sfwslzy = #{record.sfwslzy,jdbcType=VARCHAR},
       zsbh = #{record.zsbh,jdbcType=VARCHAR},
-      rych = #{record.rych,jdbcType=VARCHAR}
+      rych = #{record.rych,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      fzywlx = #{record.fzywlx,jdbcType=VARCHAR},
+      fzywsj = #{record.fzywsj,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -366,6 +399,15 @@
       <if test="rych != null">
         rych = #{rych,jdbcType=VARCHAR},
       </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="fzywlx != null">
+        fzywlx = #{fzywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="fzywsj != null">
+        fzywsj = #{fzywsj,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -385,7 +427,10 @@
       issue_time = #{issueTime,jdbcType=TIMESTAMP},
       sfwslzy = #{sfwslzy,jdbcType=VARCHAR},
       zsbh = #{zsbh,jdbcType=VARCHAR},
-      rych = #{rych,jdbcType=VARCHAR}
+      rych = #{rych,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      fzywlx = #{fzywlx,jdbcType=VARCHAR},
+      fzywsj = #{fzywsj,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/basic/mapper/BasicKeeperMapper.xml

@@ -34,6 +34,13 @@
     <result column="sync_flag" jdbcType="VARCHAR" property="syncFlag" />
     <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
     <result column="sfsjjllg" jdbcType="VARCHAR" property="sfsjjllg" />
+    <result column="cjslqygzsj" jdbcType="TIMESTAMP" property="cjslqygzsj" />
+    <result column="cjgzsj" jdbcType="TIMESTAMP" property="cjgzsj" />
+    <result column="mz" jdbcType="INTEGER" property="mz" />
+    <result column="zw" jdbcType="VARCHAR" property="zw" />
+    <result column="zgzt" jdbcType="INTEGER" property="zgzt" />
+    <result column="cyfzr" property="cyfzr" jdbcType="VARCHAR" />
+    <result column="gwxz" property="gwxz" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -97,7 +104,8 @@
     id, user_Id, post_type, name, user_alias, dept_id, org_id, sex, id_card, phone, birthday, 
     email, work_Year, entry_time, employee_nature, handover_Date, input_Person_Id, input_Date, 
     edit_Person_Id, edit_Date, house_id, province_Id, city_Id, grain_Id, depot_name, 
-    avator_Url, nation, isdepartment_time, political, sync_flag, del_flag, sfsjjllg
+    avator_Url, nation, isdepartment_time, political, sync_flag, del_flag, sfsjjllg, cjslqygzsj,
+    cjgzsj, zw, mz, zgzt, gwxz, cyfzr
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperExample" resultMap="BaseResultMap">
     select
@@ -143,7 +151,7 @@
       province_Id, city_Id, grain_Id, 
       depot_name, avator_Url, nation, 
       isdepartment_time, political, sync_flag, 
-      del_flag, sfsjjllg)
+      del_flag, sfsjjllg, cjslqygzsj, cjgzsj, zw, mz, zgzt, gwxz, cyfzr)
     values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{postType,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{userAlias,jdbcType=VARCHAR}, #{deptId,jdbcType=INTEGER}, 
       #{orgId,jdbcType=INTEGER}, #{sex,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
@@ -154,7 +162,9 @@
       #{provinceId,jdbcType=INTEGER}, #{cityId,jdbcType=INTEGER}, #{grainId,jdbcType=INTEGER}, 
       #{depotName,jdbcType=VARCHAR}, #{avatorUrl,jdbcType=VARCHAR}, #{nation,jdbcType=INTEGER}, 
       #{isdepartmentTime,jdbcType=TIMESTAMP}, #{political,jdbcType=INTEGER}, #{syncFlag,jdbcType=VARCHAR}, 
-      #{delFlag,jdbcType=INTEGER}, #{sfsjjllg,jdbcType=VARCHAR})
+      #{delFlag,jdbcType=INTEGER}, #{sfsjjllg,jdbcType=VARCHAR}, #{cjslqygzsj,jdbcType=TIMESTAMP},
+      #{cjgzsj,jdbcType=TIMESTAMP}, #{zw,jdbcType=VARCHAR}, #{mz,jdbcType=INTEGER}, #{zgzt,jdbcType=INTEGER},
+      #{gwxz,jdbcType=VARCHAR}, #{cyfzr,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyProperty="id" useGeneratedKeys="true" parameterType="com.chinaitop.depot.basic.model.BasicKeeper">
     <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
@@ -258,6 +268,27 @@
       <if test="sfsjjllg != null">
         sfsjjllg,
       </if>
+      <if test="cjslqygzsj != null">
+        cjslqygzsj,
+      </if>
+      <if test="cjgzsj != null">
+        cjgzsj,
+      </if>
+      <if test="zw != null">
+        zw,
+      </if>
+      <if test="mz != null">
+        mz,
+      </if>
+      <if test="zgzt != null">
+        zgzt,
+      </if>
+      <if test="gwxz != null">
+        gwxz,
+      </if>
+      <if test="cyfzr != null">
+        cyfzr,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -356,6 +387,27 @@
       <if test="sfsjjllg != null">
         #{sfsjjllg,jdbcType=VARCHAR},
       </if>
+      <if test="cjslqygzsj != null">
+        #{cjslqygzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cjgzsj != null">
+        #{cjgzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zw != null">
+        #{zw,jdbcType=VARCHAR},
+      </if>
+      <if test="mz != null">
+        #{mz,jdbcType=INTEGER},
+      </if>
+      <if test="zgzt != null">
+        #{zgzt,jdbcType=INTEGER},
+      </if>
+      <if test="gwxz != null">
+        #{gwxz,jdbcType=VARCHAR},
+      </if>
+      <if test="cyfzr != null">
+        #{cyfzr,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicKeeperExample" resultType="java.lang.Integer">
@@ -463,6 +515,27 @@
       <if test="record.sfsjjllg != null">
         sfsjjllg = #{record.sfsjjllg,jdbcType=VARCHAR},
       </if>
+      <if test="record.cjslqygzsj != null">
+        cjslqygzsj = #{record.cjslqygzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.cjgzsj != null">
+        cjgzsj = #{record.cjgzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.zw != null">
+        zw = #{record.zw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mz != null">
+        mz = #{record.mz,jdbcType=INTEGER},
+      </if>
+      <if test="record.zgzt != null">
+        zgzt = #{record.zgzt,jdbcType=INTEGER},
+      </if>
+      <if test="record.gwxz != null">
+        gwxz = #{record.gwxz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cyfzr != null">
+        cyfzr = #{record.cyfzr,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -501,7 +574,14 @@
       political = #{record.political,jdbcType=INTEGER},
       sync_flag = #{record.syncFlag,jdbcType=VARCHAR},
       del_flag = #{record.delFlag,jdbcType=INTEGER},
-      sfsjjllg = #{record.sfsjjllg,jdbcType=VARCHAR}
+      sfsjjllg = #{record.sfsjjllg,jdbcType=VARCHAR},
+      cjslqygzsj = #{record.cjslqygzsj,jdbcType=TIMESTAMP},
+      cjgzsj = #{record.cjgzsj,jdbcType=TIMESTAMP},
+      zw = #{record.zw,jdbcType=VARCHAR},
+      mz = #{record.mz,jdbcType=INTEGER},
+      zgzt = #{record.zgzt,jdbcType=INTEGER},
+      gwxz = #{record.gwxz,jdbcType=VARCHAR},
+      cyfzr = #{record.cyfzr,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -602,6 +682,27 @@
       <if test="sfsjjllg != null">
         sfsjjllg = #{sfsjjllg,jdbcType=VARCHAR},
       </if>
+      <if test="cjslqygzsj != null">
+        cjslqygzsj = #{cjslqygzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cjgzsj != null">
+        cjgzsj = #{cjgzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zw != null">
+        zw = #{zw,jdbcType=VARCHAR},
+      </if>
+      <if test="mz != null">
+        mz = #{mz,jdbcType=INTEGER},
+      </if>
+      <if test="zgzt != null">
+        zgzt = #{zgzt,jdbcType=INTEGER},
+      </if>
+      <if test="gwxz != null">
+        gwxz = #{gwxz,jdbcType=VARCHAR},
+      </if>
+      <if test="cyfzr != null">
+        cyfzr = #{cyfzr,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -637,7 +738,14 @@
       political = #{political,jdbcType=INTEGER},
       sync_flag = #{syncFlag,jdbcType=VARCHAR},
       del_flag = #{delFlag,jdbcType=INTEGER},
-      sfsjjllg = #{sfsjjllg,jdbcType=VARCHAR}
+      sfsjjllg = #{sfsjjllg,jdbcType=VARCHAR},
+      cjslqygzsj = #{cjslqygzsj,jdbcType=TIMESTAMP},
+      cjgzsj = #{cjgzsj,jdbcType=TIMESTAMP},
+      zw = #{zw,jdbcType=VARCHAR},
+      mz = #{mz,jdbcType=INTEGER},
+      zgzt = #{zgzt,jdbcType=INTEGER},
+      gwxz = #{gwxz,jdbcType=VARCHAR},
+      cyfzr = #{cyfzr,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

src/main/java/com/chinaitop/depot/basic/model/BasicKeeper.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.basic.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class BasicKeeper {
     private Integer id;
 
@@ -29,8 +31,10 @@ public class BasicKeeper {
 
     private Integer workYear;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date entryTime;
 
+    //人员类别
     private Integer employeeNature;
 
     private Date handoverDate;
@@ -64,8 +68,22 @@ public class BasicKeeper {
     private String syncFlag;
 
     private Integer delFlag;
-
+    //是否设计交流轮岗
     private String sfsjjllg;
+    //名族
+    private Integer mz;
+    //职务
+    private String zw;
+    //在岗状态
+    private String zgzt;
+    //岗位性质
+    private String gwxz;
+    //参加涉粮企业工作时间
+    private Date cjslqygzsj;
+    //参加工作时间
+    private Date cjgzsj;
+    //关键部门负责人
+    private String cyfzr;
 
     //业务字段
     private String keeperNames;
@@ -295,16 +313,16 @@ public class BasicKeeper {
     }
 
     /**
-     * 职员性质
-     * @return employee_nature 职员性质
+     * 人员类别
+     * @return employee_nature 人员类别
      */
     public Integer getEmployeeNature() {
         return employeeNature;
     }
 
     /**
-     * 职员性质
-     * @param employeeNature 职员性质
+     * 人员类别
+     * @param employeeNature 人员类别
      */
     public void setEmployeeNature(Integer employeeNature) {
         this.employeeNature = employeeNature;
@@ -590,4 +608,100 @@ public class BasicKeeper {
 		this.sfsjjllg = sfsjjllg;
 	}
 
+	/**
+	 * 名族
+	 * @return
+	 */
+	public Integer getMz() {
+		return mz;
+	}
+
+	/**
+	 * 名族
+	 * @param mz
+	 */
+	public void setMz(Integer mz) {
+		this.mz = mz;
+	}
+
+	/**
+	 * 职务
+	 * @return
+	 */
+	public String getZw() {
+		return zw;
+	}
+
+	/**
+	 * 职务
+	 * @param zw
+	 */
+	public void setZw(String zw) {
+		this.zw = zw;
+	}
+
+	/**
+	 * 在岗状态
+	 * @return
+	 */
+	public String getZgzt() {
+		return zgzt;
+	}
+
+	/**
+	 * 在岗状态
+	 * @param zgzt
+	 */
+	public void setZgzt(String zgzt) {
+		this.zgzt = zgzt;
+	}
+
+	/**
+	 * 岗位性质
+	 * @return
+	 */
+	public String getGwxz() {
+		return gwxz;
+	}
+
+	/**
+	 * 岗位性质
+	 * @param gwxz
+	 */
+	public void setGwxz(String gwxz) {
+		this.gwxz = gwxz;
+	}
+
+	/**
+	 * 参加涉粮企业工作时间
+	 * @return
+	 */
+	public Date getCjslqygzsj() {
+		return cjslqygzsj;
+	}
+
+	/**
+	 * 参加涉粮企业工作时间
+	 * @param cjslqygzsj
+	 */
+	public void setCjslqygzsj(Date cjslqygzsj) {
+		this.cjslqygzsj = cjslqygzsj;
+	}
+
+	/**
+	 * 参加工作时间
+	 * @return
+	 */
+	public Date getCjgzsj() {
+		return cjgzsj;
+	}
+
+	/**
+	 * 参加工作时间
+	 * @param cjgzsj
+	 */
+	public void setCjgzsj(Date cjgzsj) {
+		this.cjgzsj = cjgzsj;
+	}
+
 }

src/main/java/com/chinaitop/depot/basic/model/BasicKeeperEducation.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.basic.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class BasicKeeperEducation {
     private Integer id;
 
@@ -34,6 +36,13 @@ public class BasicKeeperEducation {
     private String zsbh;
 
     private String rych;
+    
+    private Integer orgId;
+
+    private String fzywlx;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date fzywsj;
 
     /**
      * 
@@ -68,16 +77,16 @@ public class BasicKeeperEducation {
     }
 
     /**
-     * 数据类型(1.学历学位信息，2.专业技术职称，3.职业资格及等级，4.上岗证)
-     * @return dataType 数据类型(1.学历学位信息，2.专业技术职称，3.职业资格及等级，4.上岗证)
+     * 数据类型(1.学历学位信息，2.技能等级，3.职称和荣誉称号，4.上岗及其他证书，5.交流轮岗)
+     * @return dataType 数据类型(1.学历学位信息，2.技能等级，3.职称和荣誉称号，4.上岗及其他证书，5.交流轮岗)
      */
     public Integer getDatatype() {
         return datatype;
     }
 
     /**
-     * 数据类型(1.学历学位信息，2.专业技术职称，3.职业资格及等级，4.上岗证)
-     * @param datatype 数据类型(1.学历学位信息，2.专业技术职称，3.职业资格及等级，4.上岗证)
+     * 数据类型(1.学历学位信息，2.技能等级，3.职称和荣誉称号，4.上岗及其他证书，5.交流轮岗)
+     * @param datatype 数据类型(1.学历学位信息，2.技能等级，3.职称和荣誉称号，4.上岗及其他证书，5.交流轮岗)
      */
     public void setDatatype(Integer datatype) {
         this.datatype = datatype;
@@ -290,4 +299,44 @@ public class BasicKeeperEducation {
 	public void setRych(String rych) {
 		this.rych = rych;
 	}
+
+	public Integer getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Integer orgId) {
+		this.orgId = orgId;
+	}
+
+	/**
+	 * 负责（分管）业务类型
+	 * @return
+	 */
+	public String getFzywlx() {
+		return fzywlx;
+	}
+
+	/**
+	 * 负责（分管）业务类型
+	 * @param fzywlx
+	 */
+	public void setFzywlx(String fzywlx) {
+		this.fzywlx = fzywlx;
+	}
+
+	/**
+	 * 负责（分管）业务时间
+	 * @return
+	 */
+	public Date getFzywsj() {
+		return fzywsj;
+	}
+
+	/**
+	 * 负责（分管）业务时间
+	 * @param fzywsj
+	 */
+	public void setFzywsj(Date fzywsj) {
+		this.fzywsj = fzywsj;
+	}
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -356,7 +356,7 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 			criteria.andIdEqualTo(sptDataId);
 			BasicTank basicTank = bankMapper.selectByPrimaryKey(sptDataId);
 			if(null != basicTank){
-				houseId = Integer.parseInt(sptDataId);
+				houseId = Integer.parseInt(basicTank.getId());
 				wareHouseId = houseId;
 				orgId = basicTank.getOrgId();
 			}

src/main/resources/bootstrap.yml

@@ -7,11 +7,12 @@ server:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
     #register-with-eureka: false
     #fetchRegistry: false
   instance:
     hostname: 172.16.0.16
+    #hostname: localhost
     #prefer-ip-address: true
     # 每隔10s发送一次心跳(默认30s)
     lease-renewal-interval-in-seconds: 10
@@ -22,6 +23,12 @@ eureka:
 mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
 
+management:
+  server:
+    port: -1
+  #endpoints:
+    #enabled-by-default: false
+
 spring:
   application:
     name: depot-basic
@@ -32,9 +39,9 @@ spring:
     url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     username: gbasedbt
     password: cDbK2S0go8
-    #url: jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
+    #url: jdbc:gbasedbt-sqli://10.223.3.63:9088/depot:GBASEDBTSERVER=gbaseserver2;DB_LOCALE=zh_CN.utf8;CLIENT_LOCALE=zh_CN.utf8;NEWCODESET=UTF8,utf8,57372;GL_USEGLU=1;
     #username: gbasedbt
-    #password: GBase123
+    #password: 4E7#8x8Yut
   # 缓存配置
   session:
     store-type: redis
@@ -77,7 +84,7 @@ cxf:
 
 web:
   #upload-path: D:/upload
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+  upload-path: /home/depot/depot-web/depot-file
 
 logging:
   level: