Merge remote-tracking branch 'origin/dev' into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/Enterprise.java

@@ -20,12 +20,6 @@ public class Enterprise extends CommonBaseEntity implements Serializable {
 
     private String en_pricemethod;
 
-    private Integer en_recorderid;
-
-    private String en_recorder;
-
-    private Date en_recorddate;
-
     private byte[] en_signet;
 
     public String getEn_name() {
@@ -84,30 +78,6 @@ public class Enterprise extends CommonBaseEntity implements Serializable {
         this.en_pricemethod = en_pricemethod;
     }
 
-    public Integer getEn_recorderid() {
-        return en_recorderid;
-    }
-
-    public void setEn_recorderid(Integer en_recorderid) {
-        this.en_recorderid = en_recorderid;
-    }
-
-    public String getEn_recorder() {
-        return en_recorder;
-    }
-
-    public void setEn_recorder(String en_recorder) {
-        this.en_recorder = en_recorder;
-    }
-
-    public Date getEn_recorddate() {
-        return en_recorddate;
-    }
-
-    public void setEn_recorddate(Date en_recorddate) {
-        this.en_recorddate = en_recorddate;
-    }
-
     public byte[] getEn_signet() {
         return en_signet;
     }

applications/commons/commons-server/src/main/resources/mapper/EnterpriseMapper.xml

@@ -10,9 +10,6 @@
         <result column="en_postcodes" property="en_postcodes" jdbcType="VARCHAR" />
         <result column="en_begindate" property="en_begindate" jdbcType="TIMESTAMP" />
         <result column="en_pricemethod" property="en_pricemethod" jdbcType="VARCHAR" />
-        <result column="en_recorderid" property="en_recorderid" jdbcType="INTEGER" />
-        <result column="en_recorder" property="en_recorder" jdbcType="VARCHAR" />
-        <result column="en_recorddate" property="en_recorddate" jdbcType="TIMESTAMP" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     </resultMap>
@@ -47,15 +44,6 @@
             <if test="en_pricemethod != null" >
                 en_pricemethod,
             </if>
-            <if test="en_recorderid != null" >
-                en_recorderid,
-            </if>
-            <if test="en_recorder != null" >
-                en_recorder,
-            </if>
-            <if test="en_recorddate != null" >
-                en_recorddate,
-            </if>
             <if test="updaterId != null" >
                 updaterId,
             </if>
@@ -88,15 +76,6 @@
             <if test="en_pricemethod != null" >
                 #{en_pricemethod,jdbcType=VARCHAR},
             </if>
-            <if test="en_recorderid != null" >
-                #{en_recorderid,jdbcType=INTEGER},
-            </if>
-            <if test="en_recorder != null" >
-                #{en_recorder,jdbcType=VARCHAR},
-            </if>
-            <if test="en_recorddate != null" >
-                #{en_recorddate,jdbcType=TIMESTAMP},
-            </if>
             <if test="updaterId != null" >
                 #{updaterId,jdbcType=INTEGER},
             </if>
@@ -132,15 +111,6 @@
             <if test="en_pricemethod != null" >
                 en_pricemethod = #{en_pricemethod,jdbcType=VARCHAR},
             </if>
-            <if test="en_recorderid != null" >
-                en_recorderid = #{en_recorderid,jdbcType=INTEGER},
-            </if>
-            <if test="en_recorder != null" >
-                en_recorder = #{en_recorder,jdbcType=VARCHAR},
-            </if>
-            <if test="en_recorddate != null" >
-                en_recorddate = #{en_recorddate,jdbcType=TIMESTAMP},
-            </if>
             <if test="updaterId != null" >
                 updaterId = #{updaterId,jdbcType=INTEGER},
             </if>

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/ProductDTO.java

@@ -26,9 +26,6 @@ public class ProductDTO implements Serializable {
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Address.java

@@ -6,7 +6,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class Address extends CommonBaseEntity implements Serializable {
-    private Date ad_recorddate;
 
     private String ad_text1;
 
@@ -20,14 +19,6 @@ public class Address extends CommonBaseEntity implements Serializable {
 
     private String ad_address;
 
-    public Date getAd_recorddate() {
-        return ad_recorddate;
-    }
-
-    public void setAd_recorddate(Date ad_recorddate) {
-        this.ad_recorddate = ad_recorddate;
-    }
-
     public String getAd_text1() {
         return ad_text1;
     }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Bom.java

@@ -19,12 +19,6 @@ public class Bom extends CommonBaseEntity implements Serializable {
 
     private String bo_statuscode;
 
-    private Integer bo_recorderid;
-
-    private String bo_recorder;
-
-    private Date bo_recorddate;
-
     private String bo_text1;
 
     private String bo_text2;
@@ -123,30 +117,6 @@ public class Bom extends CommonBaseEntity implements Serializable {
         this.bo_statuscode = bo_statuscode == null ? null : bo_statuscode.trim();
     }
 
-    public Integer getBo_recorderid() {
-        return bo_recorderid;
-    }
-
-    public void setBo_recorderid(Integer bo_recorderid) {
-        this.bo_recorderid = bo_recorderid;
-    }
-
-    public String getBo_recorder() {
-        return bo_recorder;
-    }
-
-    public void setBo_recorder(String bo_recorder) {
-        this.bo_recorder = bo_recorder == null ? null : bo_recorder.trim();
-    }
-
-    public Date getBo_recorddate() {
-        return bo_recorddate;
-    }
-
-    public void setBo_recorddate(Date bo_recorddate) {
-        this.bo_recorddate = bo_recorddate;
-    }
-
     public String getBo_text1() {
         return bo_text1;
     }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Customerkind.java

@@ -8,12 +8,6 @@ import java.util.Date;
 public class Customerkind extends CommonBaseEntity implements Serializable {
     private String ck_name;
 
-    private Integer ck_recordid;
-
-    private String ck_recorder;
-
-    private Date ck_date;
-
     public String getCk_name() {
         return ck_name;
     }
@@ -22,27 +16,4 @@ public class Customerkind extends CommonBaseEntity implements Serializable {
         this.ck_name = ck_name == null ? null : ck_name.trim();
     }
 
-    public Integer getCk_recordid() {
-        return ck_recordid;
-    }
-
-    public void setCk_recordid(Integer ck_recordid) {
-        this.ck_recordid = ck_recordid;
-    }
-
-    public String getCk_recorder() {
-        return ck_recorder;
-    }
-
-    public void setCk_recorder(String ck_recorder) {
-        this.ck_recorder = ck_recorder == null ? null : ck_recorder.trim();
-    }
-
-    public Date getCk_date() {
-        return ck_date;
-    }
-
-    public void setCk_date(Date ck_date) {
-        this.ck_date = ck_date;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Fundinouttype.java

@@ -10,12 +10,6 @@ public class Fundinouttype extends CommonBaseEntity implements Serializable {
 
     private String ft_kind;
 
-    private Integer ft_recordid;
-
-    private String ft_recorder;
-
-    private Date ft_date;
-
     public String getFt_name() {
         return ft_name;
     }
@@ -32,27 +26,4 @@ public class Fundinouttype extends CommonBaseEntity implements Serializable {
         this.ft_kind = ft_kind == null ? null : ft_kind.trim();
     }
 
-    public Integer getFt_recordid() {
-        return ft_recordid;
-    }
-
-    public void setFt_recordid(Integer ft_recordid) {
-        this.ft_recordid = ft_recordid;
-    }
-
-    public String getFt_recorder() {
-        return ft_recorder;
-    }
-
-    public void setFt_recorder(String ft_recorder) {
-        this.ft_recorder = ft_recorder == null ? null : ft_recorder.trim();
-    }
-
-    public Date getFt_date() {
-        return ft_date;
-    }
-
-    public void setFt_date(Date ft_date) {
-        this.ft_date = ft_date;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Product.java

@@ -26,9 +26,6 @@ public class Product extends CommonBaseEntity implements Serializable {
     private Long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private Long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;
@@ -180,30 +177,6 @@ public class Product extends CommonBaseEntity implements Serializable {
         this.pr_vendcode = pr_vendcode;
     }
 
-    public Date getPr_docdate() {
-        return pr_docdate;
-    }
-
-    public void setPr_docdate(Date pr_docdate) {
-        this.pr_docdate = pr_docdate;
-    }
-
-    public Long getPr_recordmanid() {
-        return pr_recordmanid;
-    }
-
-    public void setPr_recordmanid(Long pr_recordmanid) {
-        this.pr_recordmanid = pr_recordmanid;
-    }
-
-    public String getPr_recordman() {
-        return pr_recordman;
-    }
-
-    public void setPr_recordman(String pr_recordman) {
-        this.pr_recordman = pr_recordman;
-    }
-
     public String getPr_status() {
         return pr_status;
     }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Productbrand.java

@@ -8,12 +8,6 @@ import java.util.Date;
 public class Productbrand extends CommonBaseEntity implements Serializable {
     private String pb_name;
 
-    private Integer pb_recordid;
-
-    private String pb_recorder;
-
-    private Date pb_date;
-
     public String getPb_name() {
         return pb_name;
     }
@@ -21,28 +15,4 @@ public class Productbrand extends CommonBaseEntity implements Serializable {
     public void setPb_name(String pb_name) {
         this.pb_name = pb_name == null ? null : pb_name.trim();
     }
-
-    public Integer getPb_recordid() {
-        return pb_recordid;
-    }
-
-    public void setPb_recordid(Integer pb_recordid) {
-        this.pb_recordid = pb_recordid;
-    }
-
-    public String getPb_recorder() {
-        return pb_recorder;
-    }
-
-    public void setPb_recorder(String pb_recorder) {
-        this.pb_recorder = pb_recorder == null ? null : pb_recorder.trim();
-    }
-
-    public Date getPb_date() {
-        return pb_date;
-    }
-
-    public void setPb_date(Date pb_date) {
-        this.pb_date = pb_date;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Producttype.java

@@ -9,12 +9,6 @@ public class Producttype extends CommonBaseEntity implements Serializable {
 
     private String pt_name;
 
-    private Integer pt_recordid;
-
-    private String pt_recorder;
-
-    private Date pt_date;
-
     public String getPt_name() {
         return pt_name;
     }
@@ -22,28 +16,4 @@ public class Producttype extends CommonBaseEntity implements Serializable {
     public void setPt_name(String pt_name) {
         this.pt_name = pt_name == null ? null : pt_name.trim();
     }
-
-    public Integer getPt_recordid() {
-        return pt_recordid;
-    }
-
-    public void setPt_recordid(Integer pt_recordid) {
-        this.pt_recordid = pt_recordid;
-    }
-
-    public String getPt_recorder() {
-        return pt_recorder;
-    }
-
-    public void setPt_recorder(String pt_recorder) {
-        this.pt_recorder = pt_recorder == null ? null : pt_recorder.trim();
-    }
-
-    public Date getPt_date() {
-        return pt_date;
-    }
-
-    public void setPt_date(Date pt_date) {
-        this.pt_date = pt_date;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Productunit.java

@@ -8,12 +8,6 @@ import java.util.Date;
 public class Productunit extends CommonBaseEntity implements Serializable {
     private String pu_name;
 
-    private Integer pu_recordid;
-
-    private String pu_recorder;
-
-    private Date pu_date;
-
     public String getPu_name() {
         return pu_name;
     }
@@ -21,28 +15,4 @@ public class Productunit extends CommonBaseEntity implements Serializable {
     public void setPu_name(String pu_name) {
         this.pu_name = pu_name == null ? null : pu_name.trim();
     }
-
-    public Integer getPu_recordid() {
-        return pu_recordid;
-    }
-
-    public void setPu_recordid(Integer pu_recordid) {
-        this.pu_recordid = pu_recordid;
-    }
-
-    public String getPu_recorder() {
-        return pu_recorder;
-    }
-
-    public void setPu_recorder(String pu_recorder) {
-        this.pu_recorder = pu_recorder == null ? null : pu_recorder.trim();
-    }
-
-    public Date getPu_date() {
-        return pu_date;
-    }
-
-    public void setPu_date(Date pu_date) {
-        this.pu_date = pu_date;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/VendorList.java

@@ -66,18 +66,6 @@ public class VendorList implements Serializable {
      * 状态码
      */
     private String ve_statuscode;
-    /**
-     * 录入人ID
-     */
-    private long ve_recordid;
-    /**
-     * 录入人
-     */
-    private String ve_recordname;
-    /**
-     * 建立日期
-     */
-    private Date ve_initdate;
     /**
      * 自定义字段
      */

applications/document/document-server/src/main/resources/mapper/AddressMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.usoftchina.saas.document.mapper.AddressMapper">
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Address">
     <id column="ad_id" jdbcType="INTEGER" property="id" />
-    <result column="ad_recorddate" jdbcType="TIMESTAMP" property="ad_recorddate" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
@@ -17,7 +16,7 @@
     <result column="ad_address" jdbcType="LONGVARCHAR" property="ad_address" />
   </resultMap>
   <sql id="Base_Column_List">
-    ad_id, ad_recorddate, companyId, updaterId, updateTime, ad_text1, ad_text2, ad_text3, 
+    ad_id,  companyId, updaterId, updateTime, ad_text1, ad_text2, ad_text3,
     ad_text4, ad_text5
   </sql>
   <sql id="Blob_Column_List">
@@ -28,11 +27,11 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into address (ad_recorddate, companyId,
+    insert into address ( companyId,
       updaterId, updateTime, ad_text1, 
       ad_text2, ad_text3, ad_text4, 
       ad_text5, ad_address)
-    values (#{ad_recorddate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER},
+    values (#{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{ad_text1,jdbcType=VARCHAR}, 
       #{ad_text2,jdbcType=VARCHAR}, #{ad_text3,jdbcType=VARCHAR}, #{ad_text4,jdbcType=VARCHAR}, 
       #{ad_text5,jdbcType=VARCHAR}, #{ad_address,jdbcType=LONGVARCHAR})
@@ -43,9 +42,6 @@
     </selectKey>
     insert into address
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="ad_recorddate != null">
-        ad_recorddate,
-      </if>
       <if test="companyId != null">
         companyId,
       </if>
@@ -75,9 +71,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="ad_recorddate != null">
-        #{ad_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -110,9 +103,6 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
     <set>
-      <if test="ad_recorddate != null">
-        ad_recorddate = #{ad_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -145,7 +135,7 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
-    set ad_recorddate = #{ad_recorddate,jdbcType=TIMESTAMP},
+    set
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},
@@ -159,7 +149,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Address">
     update address
-    set ad_recorddate = #{ad_recorddate,jdbcType=TIMESTAMP},
+    set
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},

applications/document/document-server/src/main/resources/mapper/BomDetailMapper.xml

@@ -39,9 +39,6 @@
         <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER" />
         <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR" />
         <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_docdate" property="pr_docdate" jdbcType="TIMESTAMP" />
-        <result column="pr_recordmanid" property="pr_recordmanid" jdbcType="INTEGER" />
-        <result column="pr_recordman" property="pr_recordman" jdbcType="VARCHAR" />
         <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
         <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />

applications/document/document-server/src/main/resources/mapper/BomMapper.xml

@@ -9,9 +9,6 @@
     <result column="bo_version" property="bo_version" jdbcType="VARCHAR" />
     <result column="bo_status" property="bo_status" jdbcType="VARCHAR" />
     <result column="bo_statuscode" property="bo_statuscode" jdbcType="VARCHAR" />
-    <result column="bo_recorderid" property="bo_recorderid" jdbcType="INTEGER" />
-    <result column="bo_recorder" property="bo_recorder" jdbcType="VARCHAR" />
-    <result column="bo_recorddate" property="bo_recorddate" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updaterName" property="updaterName" jdbcType="VARCHAR" />
@@ -34,7 +31,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     bo_id, bo_motherid, bo_mothercode, bo_mothername, bo_version, bo_status, bo_statuscode, 
-    bo_recorderid, bo_recorder, bo_recorddate, companyId, updaterId,updaterName,updateTime, bo_text1,
+    companyId, updaterId,updaterName,updateTime, bo_text1,
     bo_text2, bo_text3, bo_text4, bo_text5,creatorName,creatorId,createTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -53,15 +50,13 @@
     </selectKey>
     insert into bom (bo_motherid, bo_mothercode,
       bo_mothername, bo_version, bo_status, 
-      bo_statuscode, bo_recorderid, bo_recorder, 
-      bo_recorddate, companyId, updaterId, 
+      bo_statuscode, companyId, updaterId,
       updateTime, bo_text1, bo_text2, 
       bo_text3, bo_text4, bo_text5
       )
     values (#{bo_motherid,jdbcType=INTEGER}, #{bo_mothercode,jdbcType=VARCHAR},
       #{bo_mothername,jdbcType=VARCHAR}, #{bo_version,jdbcType=VARCHAR}, #{bo_status,jdbcType=VARCHAR}, 
-      #{bo_statuscode,jdbcType=VARCHAR}, #{bo_recorderid,jdbcType=INTEGER}, #{bo_recorder,jdbcType=VARCHAR}, 
-      #{bo_recorddate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
+      #{bo_statuscode,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{bo_text1,jdbcType=VARCHAR}, #{bo_text2,jdbcType=VARCHAR}, 
       #{bo_text3,jdbcType=VARCHAR}, #{bo_text4,jdbcType=VARCHAR}, #{bo_text5,jdbcType=VARCHAR}
       )
@@ -90,15 +85,6 @@
       <if test="bo_statuscode != null" >
         bo_statuscode,
       </if>
-      <if test="bo_recorderid != null" >
-        bo_recorderid,
-      </if>
-      <if test="bo_recorder != null" >
-        bo_recorder,
-      </if>
-      <if test="bo_recorddate != null" >
-        bo_recorddate,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -149,15 +135,6 @@
       <if test="bo_statuscode != null" >
         #{bo_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bo_recorderid != null" >
-        #{bo_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bo_recorder != null" >
-        #{bo_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bo_recorddate != null" >
-        #{bo_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -208,15 +185,6 @@
       <if test="bo_statuscode != null" >
         bo_statuscode = #{bo_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bo_recorderid != null" >
-        bo_recorderid = #{bo_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bo_recorder != null" >
-        bo_recorder = #{bo_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bo_recorddate != null" >
-        bo_recorddate = #{bo_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -252,9 +220,6 @@
       bo_version = #{bo_version,jdbcType=VARCHAR},
       bo_status = #{bo_status,jdbcType=VARCHAR},
       bo_statuscode = #{bo_statuscode,jdbcType=VARCHAR},
-      bo_recorderid = #{bo_recorderid,jdbcType=INTEGER},
-      bo_recorder = #{bo_recorder,jdbcType=VARCHAR},
-      bo_recorddate = #{bo_recorddate,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP},

applications/document/document-server/src/main/resources/mapper/CustomerkindMapper.xml

@@ -4,9 +4,6 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Customerkind" >
     <id column="ck_id" property="id" jdbcType="INTEGER" />
     <result column="ck_name" property="ck_name" jdbcType="VARCHAR" />
-    <result column="ck_recordid" property="ck_recordid" jdbcType="INTEGER" />
-    <result column="ck_recorder" property="ck_recorder" jdbcType="VARCHAR" />
-    <result column="ck_date" property="ck_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -18,18 +15,16 @@
     where ck_id = #{id}
   </select>
   <sql id="Base_Column_List" >
-    ck_id, ck_name, ck_recordid, ck_recorder, ck_date, companyId, updaterId, updateTime
+    ck_id, ck_name, companyId, updaterId, updateTime
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from customerkind
     where ck_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
-    insert into customerkind (ck_name, ck_recordid,
-      ck_recorder, ck_date, companyId, 
+    insert into customerkind (ck_name, companyId,
       updaterId, updateTime)
-    values (#{ck_name,jdbcType=VARCHAR}, #{ck_recordid,jdbcType=INTEGER},
-      #{ck_recorder,jdbcType=VARCHAR}, #{ck_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
+    values (#{ck_name,jdbcType=VARCHAR},#{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
@@ -38,15 +33,6 @@
       <if test="ck_name != null" >
         ck_name,
       </if>
-      <if test="ck_recordid != null" >
-        ck_recordid,
-      </if>
-      <if test="ck_recorder != null" >
-        ck_recorder,
-      </if>
-      <if test="ck_date != null" >
-        ck_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -61,15 +47,6 @@
       <if test="ck_name != null" >
         #{ck_name,jdbcType=VARCHAR},
       </if>
-      <if test="ck_recordid != null" >
-        #{ck_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ck_recorder != null" >
-        #{ck_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ck_date != null" >
-        #{ck_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -87,15 +64,6 @@
       <if test="ck_name != null" >
         ck_name = #{ck_name,jdbcType=VARCHAR},
       </if>
-      <if test="ck_recordid != null" >
-        ck_recordid = #{ck_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ck_recorder != null" >
-        ck_recorder = #{ck_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ck_date != null" >
-        ck_date = #{ck_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -111,9 +79,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Customerkind" >
     update customerkind
     set ck_name = #{ck_name,jdbcType=VARCHAR},
-      ck_recordid = #{ck_recordid,jdbcType=INTEGER},
-      ck_recorder = #{ck_recorder,jdbcType=VARCHAR},
-      ck_date = #{ck_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

applications/document/document-server/src/main/resources/mapper/FundinouttypeMapper.xml

@@ -5,15 +5,12 @@
     <id column="ft_id" property="id" jdbcType="INTEGER" />
     <result column="ft_name" property="ft_name" jdbcType="VARCHAR" />
     <result column="ft_kind" property="ft_kind" jdbcType="VARCHAR" />
-    <result column="ft_recordid" property="ft_recordid" jdbcType="INTEGER" />
-    <result column="ft_recorder" property="ft_recorder" jdbcType="VARCHAR" />
-    <result column="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    ft_id, ft_name, ft_kind, ft_recordid, ft_recorder, ft_date, companyId, updaterId, 
+    ft_id, ft_name, ft_kind, companyId, updaterId,
     updateTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
@@ -31,11 +28,9 @@
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
     insert into fundinouttype (ft_name, ft_kind,
-      ft_recordid, ft_recorder, ft_date, 
       companyId, updaterId, updateTime
       )
     values (#{ft_name,jdbcType=VARCHAR}, #{ft_kind,jdbcType=VARCHAR},
-      #{ft_recordid,jdbcType=INTEGER}, #{ft_recorder,jdbcType=VARCHAR}, #{ft_date,jdbcType=TIMESTAMP}, 
       #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -51,15 +46,6 @@
       <if test="ft_kind != null" >
         ft_kind,
       </if>
-      <if test="ft_recordid != null" >
-        ft_recordid,
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder,
-      </if>
-      <if test="ft_date != null" >
-        ft_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -77,15 +63,6 @@
       <if test="ft_kind != null" >
         #{ft_kind,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recordid != null" >
-        #{ft_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ft_date != null" >
-        #{ft_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -106,15 +83,6 @@
       <if test="ft_kind != null" >
         ft_kind = #{ft_kind,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recordid != null" >
-        ft_recordid = #{ft_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ft_date != null" >
-        ft_date = #{ft_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -131,9 +99,6 @@
     update fundinouttype
     set ft_name = #{ft_name,jdbcType=VARCHAR},
       ft_kind = #{ft_kind,jdbcType=VARCHAR},
-      ft_recordid = #{ft_recordid,jdbcType=INTEGER},
-      ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
-      ft_date = #{ft_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

@@ -21,9 +21,6 @@
         <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER" />
         <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR" />
         <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_docdate" property="pr_docdate" jdbcType="TIMESTAMP" />
-        <result column="pr_recordmanid" property="pr_recordmanid" jdbcType="INTEGER" />
-        <result column="pr_recordman" property="pr_recordman" jdbcType="VARCHAR" />
         <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
         <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
         <result column="companyId" property="companyId" jdbcType="INTEGER" />
@@ -96,7 +93,7 @@
     <sql id="Base_Column_List" >
         pr_id, pr_code, pr_detail, pr_spec, pr_unit, pr_kind, pr_orispeccode, pr_whid, pr_whcode,
         pr_whname, pr_zxbzs, pr_leadtime, pr_brand, pr_standardprice, pr_purcprice, pr_saleprice,
-        pr_vendid, pr_vendcode, pr_vendname, pr_docdate, pr_recordmanid, pr_recordman, pr_status,
+        pr_vendid, pr_vendcode, pr_vendname, pr_status,
         pr_statuscode, companyId, updaterId, updateTime, pr_text1, pr_text2, pr_text3,
         pr_text4, pr_text5
     </sql>
@@ -120,8 +117,7 @@
         pr_whname, pr_zxbzs, pr_leadtime,
         pr_brand, pr_standardprice, pr_purcprice,
         pr_saleprice, pr_vendid, pr_vendcode,
-        pr_vendname, pr_docdate, pr_recordmanid,
-        pr_recordman, pr_status, pr_statuscode,
+        pr_vendname, pr_status, pr_statuscode,
         companyId, updaterId, updateTime,
         pr_text1, pr_text2, pr_text3,
         pr_text4, pr_text5)
@@ -131,8 +127,7 @@
         #{pr_whname,jdbcType=VARCHAR}, #{pr_zxbzs,jdbcType=DECIMAL}, #{pr_leadtime,jdbcType=DECIMAL},
         #{pr_brand,jdbcType=VARCHAR}, #{pr_standardprice,jdbcType=DECIMAL}, #{pr_purcprice,jdbcType=DECIMAL},
         #{pr_saleprice,jdbcType=DECIMAL}, #{pr_vendid,jdbcType=DECIMAL}, #{pr_vendcode,jdbcType=VARCHAR},
-        #{pr_vendname,jdbcType=VARCHAR}, #{pr_docdate,jdbcType=TIMESTAMP}, #{pr_recordmanid,jdbcType=DECIMAL},
-        #{pr_recordman,jdbcType=VARCHAR}, #{pr_status,jdbcType=VARCHAR}, #{pr_statuscode,jdbcType=VARCHAR},
+        #{pr_vendname,jdbcType=VARCHAR}, #{pr_status,jdbcType=VARCHAR}, #{pr_statuscode,jdbcType=VARCHAR},
         #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL}, #{updateTime,jdbcType=TIMESTAMP},
         #{pr_text1,jdbcType=VARCHAR}, #{pr_text2,jdbcType=VARCHAR}, #{pr_text3,jdbcType=VARCHAR},
         #{pr_text4,jdbcType=VARCHAR}, #{pr_text5,jdbcType=VARCHAR})
@@ -197,15 +192,6 @@
             <if test="pr_vendname != null" >
                 pr_vendname,
             </if>
-            <if test="pr_docdate != null" >
-                pr_docdate,
-            </if>
-            <if test="pr_recordmanid != null" >
-                pr_recordmanid,
-            </if>
-            <if test="pr_recordman != null" >
-                pr_recordman,
-            </if>
             <if test="pr_status != null" >
                 pr_status,
             </if>
@@ -292,15 +278,6 @@
             <if test="pr_vendname != null" >
                 #{pr_vendname,jdbcType=VARCHAR},
             </if>
-            <if test="pr_docdate != null" >
-                #{pr_docdate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="pr_recordmanid != null" >
-                #{pr_recordmanid,jdbcType=DECIMAL},
-            </if>
-            <if test="pr_recordman != null" >
-                #{pr_recordman,jdbcType=VARCHAR},
-            </if>
             <if test="pr_status != null" >
                 #{pr_status,jdbcType=VARCHAR},
             </if>
@@ -390,15 +367,6 @@
             <if test="pr_vendname != null" >
                 pr_vendname = #{pr_vendname,jdbcType=VARCHAR},
             </if>
-            <if test="pr_docdate != null" >
-                pr_docdate = #{pr_docdate,jdbcType=TIMESTAMP},
-            </if>
-            <if test="pr_recordmanid != null" >
-                pr_recordmanid = #{pr_recordmanid,jdbcType=DECIMAL},
-            </if>
-            <if test="pr_recordman != null" >
-                pr_recordman = #{pr_recordman,jdbcType=VARCHAR},
-            </if>
             <if test="pr_status != null" >
                 pr_status = #{pr_status,jdbcType=VARCHAR},
             </if>
@@ -452,9 +420,6 @@
         pr_vendid = #{pr_vendid,jdbcType=DECIMAL},
         pr_vendcode = #{pr_vendcode,jdbcType=VARCHAR},
         pr_vendname = #{pr_vendname,jdbcType=VARCHAR},
-        pr_docdate = #{pr_docdate,jdbcType=TIMESTAMP},
-        pr_recordmanid = #{pr_recordmanid,jdbcType=DECIMAL},
-        pr_recordman = #{pr_recordman,jdbcType=VARCHAR},
         pr_status = #{pr_status,jdbcType=VARCHAR},
         pr_statuscode = #{pr_statuscode,jdbcType=VARCHAR},
         companyId = #{companyId,jdbcType=DECIMAL},

applications/document/document-server/src/main/resources/mapper/ProductbrandMapper.xml

@@ -4,9 +4,6 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Productbrand" >
     <id column="pb_id" property="id" jdbcType="INTEGER" />
     <result column="pb_name" property="pb_name" jdbcType="VARCHAR" />
-    <result column="pb_recordid" property="pb_recordid" jdbcType="INTEGER" />
-    <result column="pb_recorder" property="pb_recorder" jdbcType="VARCHAR" />
-    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -18,7 +15,7 @@
     where pb_id = #{id}
   </select>
   <sql id="Base_Column_List" >
-    pb_id, pb_name, pb_recordid, pb_recorder, pb_date, companyId, updaterId, updateTime
+    pb_id, pb_name, companyId, updaterId, updateTime
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from productbrand
@@ -28,11 +25,9 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into productbrand (pb_name, pb_recordid,
-      pb_recorder, pb_date, companyId, 
+    insert into productbrand (pb_name,companyId,
       updaterId, updateTime)
-    values (#{pb_name,jdbcType=VARCHAR}, #{pb_recordid,jdbcType=INTEGER},
-      #{pb_recorder,jdbcType=VARCHAR}, #{pb_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
+    values (#{pb_name,jdbcType=VARCHAR},#{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
@@ -44,15 +39,6 @@
       <if test="pb_name != null" >
         pb_name,
       </if>
-      <if test="pb_recordid != null" >
-        pb_recordid,
-      </if>
-      <if test="pb_recorder != null" >
-        pb_recorder,
-      </if>
-      <if test="pb_date != null" >
-        pb_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -67,15 +53,6 @@
       <if test="pb_name != null" >
         #{pb_name,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recordid != null" >
-        #{pb_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null" >
-        #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_date != null" >
-        #{pb_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -93,15 +70,6 @@
       <if test="pb_name != null" >
         pb_name = #{pb_name,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recordid != null" >
-        pb_recordid = #{pb_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null" >
-        pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_date != null" >
-        pb_date = #{pb_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -117,9 +85,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Productbrand" >
     update productbrand
     set pb_name = #{pb_name,jdbcType=VARCHAR},
-      pb_recordid = #{pb_recordid,jdbcType=INTEGER},
-      pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      pb_date = #{pb_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

applications/document/document-server/src/main/resources/mapper/ProducttypeMapper.xml

@@ -4,15 +4,12 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Producttype">
     <id column="pt_id" jdbcType="INTEGER" property="id" />
     <result column="pt_name" jdbcType="VARCHAR" property="pt_name" />
-    <result column="pt_recordid" jdbcType="INTEGER" property="pt_recordid" />
-    <result column="pt_recorder" jdbcType="VARCHAR" property="pt_recorder" />
-    <result column="pt_date" jdbcType="TIMESTAMP" property="pt_date" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    pt_id, pt_name, pt_recordid, pt_recorder, pt_date, companyId, updaterId, updateTime
+    pt_id, pt_name, companyId, updaterId, updateTime
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
@@ -28,11 +25,9 @@
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>
-    insert into producttype (pt_name, pt_recordid,
-      pt_recorder, pt_date, companyId, 
+    insert into producttype (pt_name, companyId,
       updaterId, updateTime)
-    values (#{pt_name,jdbcType=VARCHAR}, #{pt_recordid,jdbcType=INTEGER},
-      #{pt_recorder,jdbcType=VARCHAR}, #{pt_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
+    values (#{pt_name,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Producttype">
@@ -44,15 +39,6 @@
       <if test="pt_name != null">
         pt_name,
       </if>
-      <if test="pt_recordid != null">
-        pt_recordid,
-      </if>
-      <if test="pt_recorder != null">
-        pt_recorder,
-      </if>
-      <if test="pt_date != null">
-        pt_date,
-      </if>
       <if test="companyId != null">
         companyId,
       </if>
@@ -67,15 +53,6 @@
       <if test="pt_name != null">
         #{pt_name,jdbcType=VARCHAR},
       </if>
-      <if test="pt_recordid != null">
-        #{pt_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pt_recorder != null">
-        #{pt_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pt_date != null">
-        #{pt_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -93,15 +70,6 @@
       <if test="pt_name != null">
         pt_name = #{pt_name,jdbcType=VARCHAR},
       </if>
-      <if test="pt_recordid != null">
-        pt_recordid = #{pt_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pt_recorder != null">
-        pt_recorder = #{pt_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pt_date != null">
-        pt_date = #{pt_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -117,9 +85,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Producttype">
     update producttype
     set pt_name = #{pt_name,jdbcType=VARCHAR},
-      pt_recordid = #{pt_recordid,jdbcType=INTEGER},
-      pt_recorder = #{pt_recorder,jdbcType=VARCHAR},
-      pt_date = #{pt_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

applications/document/document-server/src/main/resources/mapper/ProductunitMapper.xml

@@ -4,15 +4,12 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Productunit" >
     <id column="pu_id" property="id" jdbcType="INTEGER" />
     <result column="pu_name" property="pu_name" jdbcType="VARCHAR" />
-    <result column="pu_recordid" property="pu_recordid" jdbcType="INTEGER" />
-    <result column="pu_recorder" property="pu_recorder" jdbcType="VARCHAR" />
-    <result column="pu_date" property="pu_date" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    pu_id, pu_name, pu_recordid, pu_recorder, pu_date, companyId, updaterId, updateTime
+    pu_id, pu_name, companyId, updaterId, updateTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select 
@@ -25,11 +22,9 @@
     where pu_id = #{id}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Productunit" >
-    insert into productunit (pu_name, pu_recordid,
-      pu_recorder, pu_date, companyId, 
+    insert into productunit (pu_name, companyId,
       updaterId, updateTime)
-    values (#{pu_name,jdbcType=VARCHAR}, #{pu_recordid,jdbcType=INTEGER},
-      #{pu_recorder,jdbcType=VARCHAR}, #{pu_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}, 
+    values (#{pu_name,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Productunit" >
@@ -38,15 +33,6 @@
       <if test="pu_name != null" >
         pu_name,
       </if>
-      <if test="pu_recordid != null" >
-        pu_recordid,
-      </if>
-      <if test="pu_recorder != null" >
-        pu_recorder,
-      </if>
-      <if test="pu_date != null" >
-        pu_date,
-      </if>
       <if test="companyId != null" >
         companyId,
       </if>
@@ -61,15 +47,6 @@
       <if test="pu_name != null" >
         #{pu_name,jdbcType=VARCHAR},
       </if>
-      <if test="pu_recordid != null" >
-        #{pu_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pu_recorder != null" >
-        #{pu_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pu_date != null" >
-        #{pu_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -87,15 +64,6 @@
       <if test="pu_name != null" >
         pu_name = #{pu_name,jdbcType=VARCHAR},
       </if>
-      <if test="pu_recordid != null" >
-        pu_recordid = #{pu_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="pu_recorder != null" >
-        pu_recorder = #{pu_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pu_date != null" >
-        pu_date = #{pu_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=INTEGER},
       </if>
@@ -111,9 +79,6 @@
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Productunit" >
     update productunit
     set pu_name = #{pu_name,jdbcType=VARCHAR},
-      pu_recordid = #{pu_recordid,jdbcType=INTEGER},
-      pu_recorder = #{pu_recorder,jdbcType=VARCHAR},
-      pu_date = #{pu_date,jdbcType=TIMESTAMP},
       companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updateTime = #{updateTime,jdbcType=TIMESTAMP}

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Bankinformation.java

@@ -23,12 +23,6 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
 
     private String bk_statuscode;
 
-    private Integer bk_recorderid;
-
-    private String bk_recorder;
-
-    private Date bk_recorddate;
-
     private Integer bk_ym;
 
     private String bk_text1;
@@ -111,30 +105,6 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
         this.bk_statuscode = bk_statuscode;
     }
 
-    public Integer getBk_recorderid() {
-        return bk_recorderid;
-    }
-
-    public void setBk_recorderid(Integer bk_recorderid) {
-        this.bk_recorderid = bk_recorderid;
-    }
-
-    public String getBk_recorder() {
-        return bk_recorder;
-    }
-
-    public void setBk_recorder(String bk_recorder) {
-        this.bk_recorder = bk_recorder;
-    }
-
-    public Date getBk_recorddate() {
-        return bk_recorddate;
-    }
-
-    public void setBk_recorddate(Date bk_recorddate) {
-        this.bk_recorddate = bk_recorddate;
-    }
-
     public Integer getBk_ym() {
         return bk_ym;
     }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java

@@ -164,9 +164,6 @@ public class ProdInOutList extends CommonBaseEntity{
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -144,9 +144,6 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/report/PurchaseReportDetail.java

@@ -139,9 +139,6 @@ public class PurchaseReportDetail extends CommonBaseEntity implements Serializab
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseReportMapper.xml

@@ -89,9 +89,6 @@
     <result column="pr_vendid" property="pr_vendid"/>
     <result column="pr_vendname" property="pr_vendname"/>
     <result column="pr_vendcode" property="pr_vendcode"/>
-    <result column="pr_docdate" property="pr_docdate"/>
-    <result column="pr_recordmanid" property="pr_recordmanid"/>
-    <result column="pr_recordman" property="pr_recordman"/>
     <result column="pr_status" property="pr_status"/>
     <result column="pr_statuscode" property="pr_statuscode"/>
     <result column="pr_text1" property="pr_text1"/>

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/PurchaseListDTO.java

@@ -144,9 +144,6 @@ public class PurchaseListDTO extends CommonBaseEntity implements Serializable {
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -133,9 +133,6 @@ public class SaleList implements Serializable {
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

applications/sale/sale-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -63,9 +63,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -71,9 +71,6 @@
         <result column="pr_vendid" property="pr_vendid"/>
         <result column="pr_vendname" property="pr_vendname"/>
         <result column="pr_vendcode" property="pr_vendcode"/>
-        <result column="pr_docdate" property="pr_docdate"/>
-        <result column="pr_recordmanid" property="pr_recordmanid"/>
-        <result column="pr_recordman" property="pr_recordman"/>
         <result column="pr_status" property="pr_status"/>
         <result column="pr_statuscode" property="pr_statuscode"/>
         <result column="pr_text1" property="pr_text1"/>

applications/sale/sale-server/src/main/resources/mapper/SaledetailMapper.xml

@@ -46,9 +46,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutList.java

@@ -160,9 +160,6 @@ public class ProdInOutList extends CommonBaseEntity{
     private long pr_vendid;
     private String pr_vendname;
     private String pr_vendcode;
-    private Date pr_docdate;
-    private long pr_recordmanid;
-    private String pr_recordman;
     private String pr_status;
     private String pr_statuscode;
     private String pr_text1;

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRegDTO.java

@@ -20,10 +20,19 @@ public class CompanyRegDTO implements Serializable{
      */
     private String businessCode;
     private String address;
-    private String logoId;
+    private String logoUrl;
     private String tel;
     private String fax;
     private String signet;      //电子章
+    private String type;        //所属行业
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public Long getId() {
         return id;
@@ -82,11 +91,11 @@ public class CompanyRegDTO implements Serializable{
     }
 
     public String getLogoUrl() {
-        return logoId;
+        return logoUrl;
     }
 
-    public void setLogoUrl(String logoId) {
-        this.logoId = logoId;
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
     }
 
     @Override
@@ -95,7 +104,7 @@ public class CompanyRegDTO implements Serializable{
                 "name='" + name + '\'' +
                 ", businessCode='" + businessCode + '\'' +
                 ", address='" + address + '\'' +
-                ", logoUrl='" + logoId + '\'' +
+                ", logoUrl='" + logoUrl + '\'' +
                 '}';
     }
 }

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRspDTO.java

@@ -23,6 +23,10 @@ public class CompanyRspDTO implements Serializable {
      */
     private boolean saas_;
     private String uu;
+    /**
+     * 所属行业
+     */
+    private String type;
     /**
      * 是否有默认企业
      */
@@ -39,6 +43,14 @@ public class CompanyRspDTO implements Serializable {
 
     private Long adminId;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public Long getAdminId() {
         return adminId;
     }
@@ -127,7 +139,7 @@ public class CompanyRspDTO implements Serializable {
         this.default_ = default_;
     }
 
-    public CompanyRspDTO(String name, String businessCode, String address, boolean default_, boolean saas_, String uu, String admin, Long adminId) {
+    public CompanyRspDTO(String name, String businessCode, String address, boolean default_, boolean saas_, String uu, String admin, Long adminId, String type) {
         this.name = name;
         this.businessCode = businessCode;
         this.address = address;
@@ -136,6 +148,7 @@ public class CompanyRspDTO implements Serializable {
         this.uu = uu;
         this.admin = admin;
         this.adminId = adminId;
+        this.type = type;
     }
 
     public CompanyRspDTO() {

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/po/Company.java

@@ -27,6 +27,18 @@ public class Company implements Serializable {
     private String tel;
     private String fax;
     private String signet;
+    /**
+     * 所属行业
+     */
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public String getTel() {
         return tel;

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountCenterServiceImpl.java

@@ -83,13 +83,13 @@ public class AccountCenterServiceImpl implements AccountCenterService {
 
         //调用存储过程, 对新开账套数据初始化
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("fromCompany", 2);
+        map.put("fromCompany", 3);
         map.put("newCompany", company.getId());
         map.put("accountId", accountId);
         map.put("result", null);
         accountCompanyMapper.initData(map);
 
-        return null;
+        return Result.success();
     }
 
     @Override
@@ -154,7 +154,8 @@ public class AccountCenterServiceImpl implements AccountCenterService {
                         false,
                         ssoUserSpace.getSpaceUU().toString(),
                         ssoUserSpace.getAdmin().getVipName(),
-                        0l
+                        0L,
+                        ssoUserSpace.getProfession()
                 );
                 resultList.add(companyRspDTO);
             }

base-servers/account/account-server/src/main/resources/application.yml

@@ -82,4 +82,7 @@ mybatis:
 auth:
   public-key: auth/pub.key
 sso:
-  base-url: http://192.168.253.12:32323
+  base-url: http://192.168.253.12:32323
+ribbon:
+  ReadTimeout: 6000
+  ConnectTimeout: 2000

base-servers/account/account-server/src/main/resources/mapper/AccountCompanyMapper.xml

@@ -14,7 +14,7 @@
         delete from ac_account_company where company_id=#{companyId}
     </delete>
     <select id="getCompanyListByAccountMobile" resultType="com.usoftchina.saas.account.dto.CompanyRspDTO">
-        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId from ac_company cmp
+        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId,cmp.type from ac_company cmp
         left join ac_account_company accmp on accmp.company_id=cmp.id
         left join ac_account ac on ac.id = accmp.account_id
         left join ac_account aci on aci.id = cmp.creator_id

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -204,6 +204,6 @@
     </update>
     <select id="checkEmail" resultType="int">
         SELECT COUNT(*) FROM AC_ACCOUNT AA LEFT JOIN AC_ACCOUNT_COMPANY AAC ON AAC.ACCOUNT_ID = AA.ID
-        WHERE AAC.COMPANY_ID = #{companyId} WHERE AA.EMAIL = #{email};
+        WHERE AAC.COMPANY_ID = #{companyId} AND AA.EMAIL = #{email};
     </select>
 </mapper>

base-servers/account/account-server/src/main/resources/mapper/CompanyMapper.xml

@@ -32,11 +32,12 @@
             SELECT LAST_INSERT_ID() AS ID
         </selectKey>
         insert into ac_company(name, business_code, address, logo_url, creator_id, create_time, updater_id, update_time,
-        tel, fax, signet, uu)
+        tel, fax, signet, uu, type)
         values (#{name,jdbcType=VARCHAR}, #{businessCode,jdbcType=VARCHAR},
         #{address,jdbcType=VARCHAR}, #{logoUrl,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT},
         #{createTime,jdbcType=TIMESTAMP}, #{updaterId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP},
-        #{tel,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{signet,jdbcType=VARCHAR}, #{uu,jdbcType=VARCHAR})
+        #{tel,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{signet,jdbcType=VARCHAR}, #{uu,jdbcType=VARCHAR},
+        #{type,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.account.po.Company"
             useGeneratedKeys="true" keyProperty="id">
@@ -140,6 +141,9 @@
             <if test="signet != null">
                 signet = #{signet,jdbcType=VARCHAR},
             </if>
+            <if test="type != null">
+                type = #{type,jdbcType=VARCHAR}
+            </if>
         </set>
         where id = #{id}
     </update>

frontend/saas-web/app/model/document/product.js

@@ -21,9 +21,6 @@ Ext.define('saas.model.document.Product', {
         { name: 'pr_vendid', type: 'int' },
         { name: 'pr_vendcode', type: 'string' },
         { name: 'pr_vendname', type: 'string' },
-        { name: 'pr_docdate', type: 'date' },
-        { name: 'pr_recordmanid', type: 'int' },
-        { name: 'pr_recordman', type: 'string' },
         { name: 'pr_status', type: 'string' },
         { name: 'pr_statuscode', type: 'string' },
         { name: 'companyid', type: 'int' },

frontend/saas-web/app/model/document/productDTO.js

@@ -21,9 +21,6 @@ Ext.define('saas.model.document.ProductDTO', {
         { name: 'pr_vendid', type: 'int' },
         { name: 'pr_vendcode', type: 'string' },
         { name: 'pr_vendname', type: 'string' },
-        { name: 'pr_docdate', type: 'date' },
-        { name: 'pr_recordmanid', type: 'int' },
-        { name: 'pr_recordman', type: 'string' },
         { name: 'pr_status', type: 'string' },
         { name: 'pr_statuscode', type: 'string' },
         { name: 'companyid', type: 'int' },

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -211,8 +211,7 @@ Ext.define('saas.view.document.kind.KindModel', {
         address: {
             fields:[
                 {name: 'id', type: 'int'},
-                {name: 'ad_address',  type: 'string'},
-                {name: 'ad_recorddate',  type: 'date'}
+                {name: 'ad_address',  type: 'string'}
             ],
             proxy: {
                 type: 'ajax',