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

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -20,6 +21,16 @@ public class ListReqDTO implements Serializable {
 
     private String calculateFields;
 
+    private String ym;
+
+    public String getYm() {
+        return ym;
+    }
+
+    public void setYm(String ym) {
+        this.ym = ym;
+    }
+
     //将列拼成查询语句，直接查询出数据的格式为json
     public String getCalculateFieldsSql() {
         try {

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/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;
@@ -126,29 +120,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/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/Vendor.java

@@ -68,18 +68,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
      * 状态码
      */
     private String ve_statuscode;
-    /**
-     * 录入人ID
-     */
-    private Long ve_recordid;
-    /**
-     * 录入人
-     */
-    private String ve_recordname;
-    /**
-     * 建立日期
-     */
-    private Date ve_initdate;
     /**
      * 自定义字段
      */
@@ -245,30 +233,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
         this.ve_statuscode = ve_statuscode;
     }
 
-    public Long getVe_recordid() {
-        return ve_recordid;
-    }
-
-    public void setVe_recordid(Long ve_recordid) {
-        this.ve_recordid = ve_recordid;
-    }
-
-    public String getVe_recordname() {
-        return ve_recordname;
-    }
-
-    public void setVe_recordname(String ve_recordname) {
-        this.ve_recordname = ve_recordname;
-    }
-
-    public Date getVe_initdate() {
-        return ve_initdate;
-    }
-
-    public void setVe_initdate(Date ve_initdate) {
-        this.ve_initdate = ve_initdate;
-    }
-
     public String getVe_text1() {
         return ve_text1;
     }

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-dto/src/main/java/com/usoftchina/saas/document/entities/Vendorkind.java

@@ -17,21 +17,6 @@ public class Vendorkind extends CommonBaseEntity implements Serializable {
      */
     private String vk_name;
 
-    /**
-     * 录入人ID
-     */
-    private Integer vk_recordid;
-
-    /**
-     * 录入人
-     */
-    private String vk_recorder;
-
-    /**
-     * 录入日期
-     */
-    private Date vk_date;
-
     public String getVk_name() {
         return vk_name;
     }
@@ -40,27 +25,4 @@ public class Vendorkind extends CommonBaseEntity implements Serializable {
         this.vk_name = vk_name == null ? null : vk_name.trim();
     }
 
-    public Integer getVk_recordid() {
-        return vk_recordid;
-    }
-
-    public void setVk_recordid(Integer vk_recordid) {
-        this.vk_recordid = vk_recordid;
-    }
-
-    public String getVk_recorder() {
-        return vk_recorder;
-    }
-
-    public void setVk_recorder(String vk_recorder) {
-        this.vk_recorder = vk_recorder == null ? null : vk_recorder.trim();
-    }
-
-    public Date getVk_date() {
-        return vk_date;
-    }
-
-    public void setVk_date(Date vk_date) {
-        this.vk_date = vk_date;
-    }
 }

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/BankinformationMapper.xml

@@ -11,9 +11,6 @@
     <result column="bk_thisamount" property="bk_thisamount" jdbcType="DOUBLE" />
     <result column="bk_status" property="bk_status" jdbcType="VARCHAR" />
     <result column="bk_statuscode" property="bk_statuscode" jdbcType="VARCHAR" />
-    <result column="bk_recorderid" property="bk_recorderid" jdbcType="INTEGER" />
-    <result column="bk_recorder" property="bk_recorder" jdbcType="VARCHAR" />
-    <result column="bk_recorddate" property="bk_recorddate" jdbcType="TIMESTAMP" />
     <result column="bk_ym" property="bk_ym" jdbcType="INTEGER" />
     <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
@@ -32,7 +29,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
-    bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid, 
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
   </sql>
   <sql id="Blob_Column_List" >
@@ -53,8 +50,7 @@
   <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Bankinformation" >
     insert into bankinformation (bk_id, bk_bankcode, bk_bankname, 
       bk_date, bk_type, bk_beginamount, 
-      bk_thisamount, bk_status, bk_statuscode, 
-      bk_recorderid, bk_recorder, bk_recorddate, 
+      bk_thisamount, bk_status, bk_statuscode,
       bk_ym, companyid, updaterId, 
       updateTime, bk_text1, bk_text2, 
       bk_text3, bk_text4, bk_text5, 
@@ -62,7 +58,6 @@
     values (#{bk_bankcode,jdbcType=VARCHAR}, #{bk_bankname,jdbcType=VARCHAR},
       #{bk_date,jdbcType=TIMESTAMP}, #{bk_type,jdbcType=VARCHAR}, #{bk_beginamount,jdbcType=DOUBLE},
       #{bk_thisamount,jdbcType=DOUBLE}, #{bk_status,jdbcType=VARCHAR}, #{bk_statuscode,jdbcType=VARCHAR},
-      #{bk_recorderid,jdbcType=INTEGER}, #{bk_recorder,jdbcType=VARCHAR}, #{bk_recorddate,jdbcType=TIMESTAMP},
       #{bk_ym,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{bk_text1,jdbcType=VARCHAR}, #{bk_text2,jdbcType=VARCHAR},
       #{bk_text3,jdbcType=VARCHAR}, #{bk_text4,jdbcType=VARCHAR}, #{bk_text5,jdbcType=VARCHAR},
@@ -95,15 +90,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode,
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid,
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder,
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate,
-      </if>
       <if test="bk_ym != null" >
         bk_ym,
       </if>
@@ -166,15 +152,6 @@
       <if test="bk_statuscode != null" >
         #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -240,15 +217,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -298,9 +266,6 @@
       bk_thisamount = #{bkThisamount,jdbcType=DOUBLE},
       bk_status = #{bkStatus,jdbcType=VARCHAR},
       bk_statuscode = #{bkStatuscode,jdbcType=VARCHAR},
-      bk_recorderid = #{bkRecorderid,jdbcType=INTEGER},
-      bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
-      bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
       bk_ym = #{bkYm,jdbcType=INTEGER},
       companyid = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

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/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -17,9 +17,6 @@
         <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
         <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
         <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
-        <result column="ve_recordid" property="ve_recordid" jdbcType="INTEGER" />
-        <result column="ve_recordname" property="ve_recordname" jdbcType="VARCHAR" />
-        <result column="ve_initdate" property="ve_initdate" jdbcType="TIMESTAMP" />
         <result column="companyId" property="companyId" jdbcType="INTEGER" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -70,9 +67,6 @@
         <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
         <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
         <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
-        <result column="ve_recordid" property="ve_recordid" jdbcType="INTEGER" />
-        <result column="ve_recordname" property="ve_recordname" jdbcType="VARCHAR" />
-        <result column="ve_initdate" property="ve_initdate" jdbcType="TIMESTAMP" />
         <result column="ve_leftamount" property="ve_leftamount" jdbcType="INTEGER" />
         <result column="ve_text1" property="ve_text1" jdbcType="VARCHAR" />
         <result column="ve_text2" property="ve_text2" jdbcType="VARCHAR" />
@@ -107,7 +101,7 @@
     <sql id="Base_Column_List" >
         ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
-        ve_recordid, ve_recordname, ve_initdate, companyId, updaterId, updateTime, ve_text1,
+        companyId, updaterId, updateTime, ve_text1,
         ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
@@ -126,8 +120,7 @@
         ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh,
         ve_bankaccount, ve_bankcode, ve_status,
-        ve_statuscode, ve_recordid, ve_recordname,
-        ve_initdate, companyId, updaterId,
+        ve_statuscode, companyId, updaterId,
         updateTime, ve_text1, ve_text2,
         ve_text3, ve_text4, ve_text5,
         ve_payamount, ve_leftamount, ve_beginym ,ve_preamount
@@ -137,8 +130,7 @@
         #{ve_beginapamount,jdbcType=DOUBLE}, #{ve_beginprepayamount,jdbcType=DOUBLE},
         #{ve_promisedays,jdbcType=DECIMAL}, #{ve_taxrate,jdbcType=DOUBLE}, #{ve_nsrzh,jdbcType=VARCHAR},
         #{ve_bankaccount,jdbcType=VARCHAR}, #{ve_bankcode,jdbcType=VARCHAR}, #{ve_status,jdbcType=VARCHAR},
-        #{ve_statuscode,jdbcType=VARCHAR}, #{ve_recordid,jdbcType=DECIMAL}, #{ve_recordname,jdbcType=VARCHAR},
-        #{ve_initdate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL},
+        #{ve_statuscode,jdbcType=VARCHAR}, #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL},
         #{updateTime,jdbcType=TIMESTAMP}, #{ve_text1,jdbcType=VARCHAR}, #{ve_text2,jdbcType=VARCHAR},
         #{ve_text3,jdbcType=VARCHAR}, #{ve_text4,jdbcType=VARCHAR}, #{ve_text5,jdbcType=VARCHAR},
         #{ve_payamount,jdbcType=DOUBLE}, #{ve_leftamount,jdbcType=DOUBLE}, #{ve_beginym,jdbcType=INTEGER},
@@ -193,15 +185,6 @@
             <if test="ve_statuscode != null" >
                 ve_statuscode,
             </if>
-            <if test="ve_recordid != null" >
-                ve_recordid,
-            </if>
-            <if test="ve_recordname != null" >
-                ve_recordname,
-            </if>
-            <if test="ve_initdate != null" >
-                ve_initdate,
-            </if>
             <if test="companyId != null" >
                 companyId,
             </if>
@@ -282,15 +265,6 @@
             <if test="ve_statuscode != null" >
                 #{ve_statuscode,jdbcType=VARCHAR},
             </if>
-            <if test="ve_recordid != null" >
-                #{ve_recordid,jdbcType=DECIMAL},
-            </if>
-            <if test="ve_recordname != null" >
-                #{ve_recordname,jdbcType=VARCHAR},
-            </if>
-            <if test="ve_initdate != null" >
-                #{ve_initdate,jdbcType=TIMESTAMP},
-            </if>
             <if test="companyId != null" >
                 #{companyId,jdbcType=DECIMAL},
             </if>
@@ -374,15 +348,6 @@
             <if test="ve_statuscode != null" >
                 ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
             </if>
-            <if test="ve_recordid != null" >
-                ve_recordid = #{ve_recordid,jdbcType=DECIMAL},
-            </if>
-            <if test="ve_recordname != null" >
-                ve_recordname = #{ve_recordname,jdbcType=VARCHAR},
-            </if>
-            <if test="ve_initdate != null" >
-                ve_initdate = #{ve_initdate,jdbcType=TIMESTAMP},
-            </if>
             <if test="companyId != null" >
                 companyId = #{companyId,jdbcType=DECIMAL},
             </if>
@@ -438,9 +403,6 @@
         ve_bankcode = #{ve_bankcode,jdbcType=VARCHAR},
         ve_status = #{ve_status,jdbcType=VARCHAR},
         ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
-        ve_recordid = #{ve_recordid,jdbcType=DECIMAL},
-        ve_recordname = #{ve_recordname,jdbcType=VARCHAR},
-        ve_initdate = #{ve_initdate,jdbcType=TIMESTAMP},
         companyId = #{companyId,jdbcType=DECIMAL},
         updaterId = #{updaterId,jdbcType=DECIMAL},
         updateTime = #{updateTime,jdbcType=TIMESTAMP},

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

@@ -4,15 +4,12 @@
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.Vendorkind">
     <id column="vk_id" jdbcType="INTEGER" property="id" />
     <result column="vk_name" jdbcType="VARCHAR" property="vk_name" />
-    <result column="vk_recordid" jdbcType="INTEGER" property="vk_recordid" />
-    <result column="vk_recorder" jdbcType="VARCHAR" property="vk_recorder" />
-    <result column="vk_date" jdbcType="TIMESTAMP" property="vk_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">
-    vk_id, vk_name, vk_recordid, vk_recorder, vk_date, companyId, updaterId, updateTime
+    vk_id, vk_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 vendorkind (vk_name, vk_recordid,
-    vk_recorder, vk_date, companyId,
+    insert into vendorkind (vk_name, companyId,
     updaterId, updateTime)
-    values (#{vk_name,jdbcType=VARCHAR}, #{vk_recordid,jdbcType=INTEGER},
-    #{vk_recorder,jdbcType=VARCHAR}, #{vk_date,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER},
+    values (#{vk_name,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
     #{updaterId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendorkind">
@@ -44,15 +39,6 @@
       <if test="vk_name != null">
         vk_name,
       </if>
-      <if test="vk_recordid != null">
-        vk_recordid,
-      </if>
-      <if test="vk_recorder != null">
-        vk_recorder,
-      </if>
-      <if test="vk_date != null">
-        vk_date,
-      </if>
       <if test="companyId != null">
         companyId,
       </if>
@@ -67,15 +53,6 @@
       <if test="vk_name != null">
         #{vk_name,jdbcType=VARCHAR},
       </if>
-      <if test="vk_recordid != null">
-        #{vk_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="vk_recorder != null">
-        #{vk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="vk_date != null">
-        #{vk_date,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -93,15 +70,6 @@
       <if test="vk_name != null">
         vk_name = #{vk_name,jdbcType=VARCHAR},
       </if>
-      <if test="vk_recordid != null">
-        vk_recordid = #{vk_recordid,jdbcType=INTEGER},
-      </if>
-      <if test="vk_recorder != null">
-        vk_recorder = #{vk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="vk_date != null">
-        vk_date = #{vk_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.Vendorkind">
     update vendorkind
     set vk_name = #{vk_name,jdbcType=VARCHAR},
-    vk_recordid = #{vk_recordid,jdbcType=INTEGER},
-    vk_recorder = #{vk_recorder,jdbcType=VARCHAR},
-    vk_date = #{vk_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/mapper/CustomerCheckViewMapper.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.AcountbalanceView;
 import com.usoftchina.saas.money.po.CustomerCheckView;
+import com.usoftchina.saas.money.po.VendOrCustAdd;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -9,4 +10,6 @@ import java.util.List;
 public interface CustomerCheckViewMapper {
     List<CustomerCheckView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
     String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+    VendOrCustAdd selectCustAdd(@Param("sl_custid") Integer sl_vendid, @Param("sl_ym") Integer sl_ym, @Param("companyId") Long companyId);
+    Integer getId(@Param("code") String code, @Param("companyId") Long companyId);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/SubledgerMapper.java

@@ -1,10 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
-import com.usoftchina.saas.money.po.Recbalance;
 import com.usoftchina.saas.money.po.Subledger;
-import com.usoftchina.saas.money.po.VendorAdd;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -27,5 +24,4 @@ public interface SubledgerMapper {
     int updateByPrimaryKey(Subledger record);
 
     List<Subledger> selectSubledgerBycondition(@Param("con") String con, @Param("companyId") Long companyId);
-    VendorAdd selectAdd(@Param("sl_vendid") Integer sl_vendid, @Param("sl_ym") Integer sl_ym);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VendorAcountViewMapper.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.VendorAcountView;
+import com.usoftchina.saas.money.po.VendOrCustAdd;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -8,4 +9,6 @@ import java.util.List;
 public interface VendorAcountViewMapper {
     List<VendorAcountView> selectByCondition(@Param("con")String con, @Param("companyId")Long companyId);
     String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+    VendOrCustAdd selectVendAdd(@Param("sl_vendid") Integer sl_vendid, @Param("sl_ym") Integer sl_ym, @Param("companyId") Long companyId);
+    Integer getId(@Param("code") String code, @Param("companyId") Long companyId);
 }

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/money/money-server/src/main/java/com/usoftchina/saas/money/po/Customer.java

@@ -39,12 +39,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
 
     private String cu_statuscode;
 
-    private Integer cu_recordmanid;
-
-    private String cu_recordman;
-
-    private Date cu_recorddate;
-
     private String cu_text1;
 
     private String cu_text2;
@@ -181,30 +175,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
         this.cu_statuscode = cu_statuscode;
     }
 
-    public Integer getCu_recordmanid() {
-        return cu_recordmanid;
-    }
-
-    public void setCu_recordmanid(Integer cu_recordmanid) {
-        this.cu_recordmanid = cu_recordmanid;
-    }
-
-    public String getCu_recordman() {
-        return cu_recordman;
-    }
-
-    public void setCu_recordman(String cu_recordman) {
-        this.cu_recordman = cu_recordman;
-    }
-
-    public Date getCu_recorddate() {
-        return cu_recorddate;
-    }
-
-    public void setCu_recorddate(Date cu_recorddate) {
-        this.cu_recorddate = cu_recorddate;
-    }
-
     public String getCu_text1() {
         return cu_text1;
     }

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

@@ -35,6 +35,16 @@ public class CustomerCheckView {
 
     private Double pd_nettotal;
 
+    private Long companyId;
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     public String getPi_inoutno() {
         return pi_inoutno;
     }

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

@@ -11,12 +11,6 @@ public class Fundtransfer extends CommonBaseEntity implements Serializable {
 
     private Date ft_date;
 
-    private Integer ft_recorderid;
-
-    private String ft_recorder;
-
-    private Date ft_recorddate;
-
     private String ft_status;
 
     private String ft_statuscode;
@@ -91,30 +85,6 @@ public class Fundtransfer extends CommonBaseEntity implements Serializable {
         this.ft_date = ft_date;
     }
 
-    public Integer getFt_recorderid() {
-        return ft_recorderid;
-    }
-
-    public void setFt_recorderid(Integer ft_recorderid) {
-        this.ft_recorderid = ft_recorderid;
-    }
-
-    public String getFt_recorder() {
-        return ft_recorder;
-    }
-
-    public void setFt_recorder(String ft_recorder) {
-        this.ft_recorder = ft_recorder;
-    }
-
-    public Date getFt_recorddate() {
-        return ft_recorddate;
-    }
-
-    public void setFt_recorddate(Date ft_recorddate) {
-        this.ft_recorddate = ft_recorddate;
-    }
-
     public String getFt_status() {
         return ft_status;
     }

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

@@ -25,12 +25,6 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
 
     private Double or_amount;
 
-    private Integer or_recorderid;
-
-    private String or_recorder;
-
-    private Date or_recorddate;
-
     private String or_status;
 
     private String or_statuscode;
@@ -157,30 +151,6 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
         this.or_amount = or_amount;
     }
 
-    public Integer getOr_recorderid() {
-        return or_recorderid;
-    }
-
-    public void setOr_recorderid(Integer or_recorderid) {
-        this.or_recorderid = or_recorderid;
-    }
-
-    public String getOr_recorder() {
-        return or_recorder;
-    }
-
-    public void setOr_recorder(String or_recorder) {
-        this.or_recorder = or_recorder;
-    }
-
-    public Date getOr_recorddate() {
-        return or_recorddate;
-    }
-
-    public void setOr_recorddate(Date or_recorddate) {
-        this.or_recorddate = or_recorddate;
-    }
-
     public String getOr_status() {
         return or_status;
     }
@@ -289,9 +259,6 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
                 ", or_bankid=" + or_bankid +
                 ", or_bankname='" + or_bankname + '\'' +
                 ", or_amount=" + or_amount +
-                ", or_recorderid=" + or_recorderid +
-                ", or_recorder='" + or_recorder + '\'' +
-                ", or_recorddate=" + or_recorddate +
                 ", or_status='" + or_status + '\'' +
                 ", or_statuscode='" + or_statuscode + '\'' +
                 ", or_remark='" + or_remark + '\'' +

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

@@ -25,12 +25,6 @@ public class Othspendings extends CommonBaseEntity implements Serializable {
 
     private Double os_amount;
 
-    private Integer os_recorderid;
-
-    private String os_recorder;
-
-    private Date os_recorddate;
-
     private String os_status;
 
     private String os_statuscode;
@@ -148,30 +142,6 @@ public class Othspendings extends CommonBaseEntity implements Serializable {
         this.os_amount = os_amount;
     }
 
-    public Integer getOs_recorderid() {
-        return os_recorderid;
-    }
-
-    public void setOs_recorderid(Integer os_recorderid) {
-        this.os_recorderid = os_recorderid;
-    }
-
-    public String getOs_recorder() {
-        return os_recorder;
-    }
-
-    public void setOs_recorder(String os_recorder) {
-        this.os_recorder = os_recorder;
-    }
-
-    public Date getOs_recorddate() {
-        return os_recorddate;
-    }
-
-    public void setOs_recorddate(Date os_recorddate) {
-        this.os_recorddate = os_recorddate;
-    }
-
     public String getOs_status() {
         return os_status;
     }

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

@@ -38,12 +38,6 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
 
     private Double pb_havebalance;
 
-    private Integer pb_recorderid;
-
-    private String pb_recorder;
-
-    private Date pb_recorddate;
-
     private String pb_status;
 
     private String pb_statuscode;
@@ -207,29 +201,6 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
         this.pb_havebalance = pb_havebalance;
     }
 
-    public Integer getPb_recorderid() {
-        return pb_recorderid;
-    }
-
-    public void setPb_recorderid(Integer pb_recorderid) {
-        this.pb_recorderid = pb_recorderid;
-    }
-
-    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_recorddate() {
-        return pb_recorddate;
-    }
-
-    public void setPb_recorddate(Date pb_recorddate) {
-        this.pb_recorddate = pb_recorddate;
-    }
 
     public String getPb_status() {
         return pb_status;

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

@@ -37,12 +37,6 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
 
     private Double rb_havebalance;
 
-    private Integer rb_recorderid;
-
-    private String rb_recorder;
-
-    private Date rb_recorddate;
-
     private String rb_status;
 
     private String rb_statuscode;
@@ -207,30 +201,6 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
         this.rb_havebalance = rb_havebalance;
     }
 
-    public Integer getRb_recorderid() {
-        return rb_recorderid;
-    }
-
-    public void setRb_recorderid(Integer rb_recorderid) {
-        this.rb_recorderid = rb_recorderid;
-    }
-
-    public String getRb_recorder() {
-        return rb_recorder;
-    }
-
-    public void setRb_recorder(String rb_recorder) {
-        this.rb_recorder = rb_recorder == null ? null : rb_recorder.trim();
-    }
-
-    public Date getRb_recorddate() {
-        return rb_recorddate;
-    }
-
-    public void setRb_recorddate(Date rb_recorddate) {
-        this.rb_recorddate = rb_recorddate;
-    }
-
     public String getRb_status() {
         return rb_status;
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendorAdd.java → applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/VendOrCustAdd.java

@@ -4,7 +4,7 @@ package com.usoftchina.saas.money.po;
  * @author heqw
  * @date 2018/11/23 11:44
  **/
-public class VendorAdd {
+public class VendOrCustAdd {
     private Double beginamount;
     private Double nowamount;
     private Double nowpay;

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

@@ -68,18 +68,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
      * 状态码
      */
     private String ve_statuscode;
-    /**
-     * 录入人ID
-     */
-    private Long ve_recordid;
-    /**
-     * 录入人
-     */
-    private String ve_recordname;
-    /**
-     * 建立日期
-     */
-    private Date ve_initdate;
     /**
      * 自定义字段
      */
@@ -245,30 +233,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
         this.ve_statuscode = ve_statuscode;
     }
 
-    public Long getVe_recordid() {
-        return ve_recordid;
-    }
-
-    public void setVe_recordid(Long ve_recordid) {
-        this.ve_recordid = ve_recordid;
-    }
-
-    public String getVe_recordname() {
-        return ve_recordname;
-    }
-
-    public void setVe_recordname(String ve_recordname) {
-        this.ve_recordname = ve_recordname;
-    }
-
-    public Date getVe_initdate() {
-        return ve_initdate;
-    }
-
-    public void setVe_initdate(Date ve_initdate) {
-        this.ve_initdate = ve_initdate;
-    }
-
     public String getVe_text1() {
         return ve_text1;
     }

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

@@ -36,6 +36,15 @@ public class VendorAcountView {
     private Double pd_nettotal;
     private Integer companyId;
     private String pd_remark;
+    private int ym;
+
+    public int getYm() {
+        return ym;
+    }
+
+    public void setYm(int ym) {
+        this.ym = ym;
+    }
 
     public String getPd_remark() {
         return pd_remark;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -72,7 +72,6 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             }
         }else {
             fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
-            fundtransfer.setFt_recorder(BaseContextHolder.getUserName());
             fundtransfer.setCreatorName(BaseContextHolder.getUserName());
             fundtransferMapper.insertSelective(fundtransfer);
             id = fundtransfer.getId();

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/MoneyReportServiceImpl.java

@@ -6,12 +6,16 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.money.mapper.*;
+import com.usoftchina.saas.money.po.CustomerCheckView;
+import com.usoftchina.saas.money.po.VendorAcountView;
+import com.usoftchina.saas.money.po.VendOrCustAdd;
 import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,10 +98,35 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
 
         String res = null;
+        VendOrCustAdd vendOrCustAdd = new VendOrCustAdd();
+        List<Map<String, Double>> list1 = new ArrayList<>();
         if ("Supplier".equals(type)) {
             list = vendorAcountViewMapper.selectByCondition(con, companyId);
-            if (!StringUtils.isEmpty(calculateFieldsSql)) {
-                res = vendorAcountViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+            if (list.size() >0) {
+                VendorAcountView vendorAcountView = (VendorAcountView) list.get(0);
+                Integer vid = new Integer(0);
+                vid = vendorAcountViewMapper.getId(vendorAcountView.getPi_vendcode(), Long.valueOf(vendorAcountView.getCompanyId()));
+                Integer ym = Integer.valueOf(req.getYm());
+                vendOrCustAdd = vendorAcountViewMapper.selectVendAdd(vid, ym, Long.valueOf(vendorAcountView.getCompanyId()));
+                vendOrCustAdd.setNowbalance((vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount())
+                        + (vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount())
+                        - (vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay()));
+                //封装成list
+                Map<String, Double> map1 = new HashMap<>();
+                map1.put("beginamount", vendOrCustAdd.getBeginamount());
+                list1.add(map1);
+
+                Map<String, Double> map2 = new HashMap<>();
+                map2.put("nowamount", vendOrCustAdd.getNowamount());
+                list1.add(map2);
+
+                Map<String, Double> map3 = new HashMap<>();
+                map3.put("nowpay", vendOrCustAdd.getNowpay());
+                list1.add(map3);
+
+                Map<String, Double> map4 = new HashMap<>();
+                map4.put("nowbalance", vendOrCustAdd.getNowbalance());
+                list1.add(map4);
             }
         } else if("payDetail".equals(type)){
             list = paydetailViewMapper.selectByCondition(con, companyId);
@@ -116,8 +145,35 @@ public class MoneyReportServiceImpl implements MoneyReportService {
             }
         }else if ("customercheck".equals(type)){
             list = customerCheckViewMapper.selectByCondition(con, companyId);
-            if (!StringUtils.isEmpty(calculateFieldsSql)) {
-                res = customerCheckViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+//            if (!StringUtils.isEmpty(calculateFieldsSql)) {
+//                res = customerCheckViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+//            }
+            if (list.size() >0) {
+                CustomerCheckView customerCheckView = (CustomerCheckView) list.get(0);
+                Integer vid = new Integer(0);
+
+                vid = customerCheckViewMapper.getId(customerCheckView.getPi_custcode(), Long.valueOf(customerCheckView.getCompanyId()));
+                Integer ym = Integer.valueOf(req.getYm());
+                vendOrCustAdd = customerCheckViewMapper.selectCustAdd(vid, ym, Long.valueOf(customerCheckView.getCompanyId()));
+                vendOrCustAdd.setNowbalance((vendOrCustAdd.getBeginamount() == null ? new Double(0) : vendOrCustAdd.getBeginamount())
+                        + (vendOrCustAdd.getNowamount() == null ? new Double(0) : vendOrCustAdd.getNowamount())
+                        - (vendOrCustAdd.getNowpay() == null ? new Double(0) : vendOrCustAdd.getNowpay()));
+                //封装成list
+                Map<String, Double> map1 = new HashMap<>();
+                map1.put("beginamount", vendOrCustAdd.getBeginamount());
+                list1.add(map1);
+
+                Map<String, Double> map2 = new HashMap<>();
+                map2.put("nowamount", vendOrCustAdd.getNowamount());
+                list1.add(map2);
+
+                Map<String, Double> map3 = new HashMap<>();
+                map3.put("nowpay", vendOrCustAdd.getNowpay());
+                list1.add(map3);
+
+                Map<String, Double> map4 = new HashMap<>();
+                map4.put("nowbalance", vendOrCustAdd.getNowbalance());
+                list1.add(map4);
             }
         }else if ("accountdetails".equals(type)){
             list = accountDetailsViewMapper.selectByCondition(con, companyId);
@@ -132,7 +188,13 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("list", list);
-        map.put("calculate", arr);
+        Object arrs = null;
+        if ("Supplier".equals(type) || "customercheck".equals(type)){
+            arrs = JSONArray.toJSON(list1);
+            map.put("calculate", arrs);
+        }else {
+            map.put("calculate", arr);
+        }
         return map;
     }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -81,7 +81,6 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             }
         }else {
             othreceipts.setCompanyId(BaseContextHolder.getCompanyId());
-            othreceipts.setOr_recorder(BaseContextHolder.getUserName());
             othreceipts.setCreatorName(BaseContextHolder.getUserName());
             othreceipts.setCreateTime(new Date());
             othreceiptsMapper.insertSelective(othreceipts);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -76,7 +76,6 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
             }
         }else {
             othspendings.setCompanyId(BaseContextHolder.getCompanyId());
-            othspendings.setOs_recorder(BaseContextHolder.getUserName());
             othspendings.setCreatorName(BaseContextHolder.getUserName());
             othspendings.setCreateTime(new Date());
             othspendingsMapper.insertSelective(othspendings);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -81,7 +81,6 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             }
         }else {
             paybalance.setCompanyId(BaseContextHolder.getCompanyId());
-            paybalance.setPb_recorder(BaseContextHolder.getUserName());
             paybalance.setCreatorName(BaseContextHolder.getUserName());
             paybalance.setCreateTime(new Date());
             paybalanceMapper.insertSelective(paybalance);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -79,7 +79,6 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             }
         }else {
             recbalance.setCompanyId(BaseContextHolder.getCompanyId());
-            recbalance.setRb_recorder(BaseContextHolder.getUserName());
             recbalance.setCreatorName(BaseContextHolder.getUserName());
             recbalance.setCreateTime(new Date());
             recbalanceMapper.insertSelective(recbalance);

applications/money/money-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -11,9 +11,6 @@
     <result column="bk_thisamount" property="bk_thisamount" jdbcType="DOUBLE" />
     <result column="bk_status" property="bk_status" jdbcType="VARCHAR" />
     <result column="bk_statuscode" property="bk_statuscode" jdbcType="VARCHAR" />
-    <result column="bk_recorderid" property="bk_recorderid" jdbcType="INTEGER" />
-    <result column="bk_recorder" property="bk_recorder" jdbcType="VARCHAR" />
-    <result column="bk_recorddate" property="bk_recorddate" jdbcType="TIMESTAMP" />
     <result column="bk_ym" property="bk_ym" jdbcType="INTEGER" />
     <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
@@ -32,7 +29,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
-    bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid, 
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_spending,  bk_income
   </sql>
   <sql id="Blob_Column_List" >
@@ -53,8 +50,7 @@
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Bankinformation" >
     insert into bankinformation (bk_id, bk_bankcode, bk_bankname, 
       bk_date, bk_type, bk_beginamount, 
-      bk_thisamount, bk_status, bk_statuscode, 
-      bk_recorderid, bk_recorder, bk_recorddate, 
+      bk_thisamount, bk_status, bk_statuscode,
       bk_ym, companyid, updaterId, 
       updateTime, bk_text1, bk_text2, 
       bk_text3, bk_text4, bk_text5, 
@@ -62,7 +58,6 @@
     values (#{bk_bankcode,jdbcType=VARCHAR}, #{bk_bankname,jdbcType=VARCHAR},
       #{bk_date,jdbcType=TIMESTAMP}, #{bk_type,jdbcType=VARCHAR}, #{bk_beginamount,jdbcType=DOUBLE},
       #{bk_thisamount,jdbcType=DOUBLE}, #{bk_status,jdbcType=VARCHAR}, #{bk_statuscode,jdbcType=VARCHAR},
-      #{bk_recorderid,jdbcType=INTEGER}, #{bk_recorder,jdbcType=VARCHAR}, #{bk_recorddate,jdbcType=TIMESTAMP},
       #{bk_ym,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{bk_text1,jdbcType=VARCHAR}, #{bk_text2,jdbcType=VARCHAR},
       #{bk_text3,jdbcType=VARCHAR}, #{bk_text4,jdbcType=VARCHAR}, #{bk_text5,jdbcType=VARCHAR},
@@ -95,15 +90,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode,
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid,
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder,
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate,
-      </if>
       <if test="bk_ym != null" >
         bk_ym,
       </if>
@@ -166,15 +152,6 @@
       <if test="bk_statuscode != null" >
         #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -240,15 +217,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -298,9 +266,6 @@
       bk_thisamount = #{bkThisamount,jdbcType=DOUBLE},
       bk_status = #{bkStatus,jdbcType=VARCHAR},
       bk_statuscode = #{bkStatuscode,jdbcType=VARCHAR},
-      bk_recorderid = #{bkRecorderid,jdbcType=INTEGER},
-      bk_recorder = #{bkRecorder,jdbcType=VARCHAR},
-      bk_recorddate = #{bkRecorddate,jdbcType=TIMESTAMP},
       bk_ym = #{bkYm,jdbcType=INTEGER},
       companyid = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},

applications/money/money-server/src/main/resources/mapper/CustomerCheckViewMapper.xml

@@ -45,4 +45,23 @@
         </where>
     </select>
 
+
+    <resultMap id="BaseAddMap" type="com.usoftchina.saas.money.po.VendOrCustAdd" >
+        <result column="beginamount" property="beginamount" jdbcType="DOUBLE" />
+        <result column="nowamount" property="nowamount" jdbcType="DOUBLE" />
+        <result column="nowpay" property="beginamount" jdbcType="DOUBLE" />
+    </resultMap>
+    <select id="selectCustAdd" resultMap="BaseAddMap">
+    select distinct a.sl_orderamount as beginamount, b.sl_orderamount as nowamount, c.sl_orderamount as nowpay FROM
+(select sl_orderamount,sl_custid,sl_ym, companyid from subledger where sl_kind = '期初余额') a
+left join (select sum(sl_orderamount) sl_orderamount,sl_custid,sl_ym from subledger where sl_kind = '出货单' or sl_kind = '销售退货单'
+group by sl_custid,sl_ym) b on a.sl_custid=b.sl_custid
+left join (select sum(sl_orderamount) sl_orderamount,sl_custid,sl_ym from subledger where sl_kind = '收款单' or sl_kind = '其他收入单'
+group by sl_custid,sl_ym) c on a.sl_custid=c.sl_custid
+ where a.sl_custid=#{sl_custid,jdbcType=INTEGER} and a.sl_ym=#{sl_ym, jdbcType=INTEGER} and a.companyid = #{companyId}
+  </select>
+
+    <select id="getId" resultType="java.lang.Integer">
+    select cu_id from customer where cu_code = #{code} and companyId = #{companyId}
+  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/FundtransferMapper.xml

@@ -5,9 +5,6 @@
     <id column="ft_id" property="id" jdbcType="INTEGER" />
     <result column="ft_code" property="ft_code" jdbcType="VARCHAR" />
     <result column="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
-    <result column="ft_recorderid" property="ft_recorderid" jdbcType="INTEGER" />
-    <result column="ft_recorder" property="ft_recorder" jdbcType="VARCHAR" />
-    <result column="ft_recorddate" property="ft_recorddate" jdbcType="TIMESTAMP" />
     <result column="ft_status" property="ft_status" jdbcType="VARCHAR" />
     <result column="ft_statuscode" property="ft_statuscode" jdbcType="VARCHAR" />
     <result column="ft_remark" property="ft_remark" jdbcType="VARCHAR" />
@@ -32,7 +29,7 @@
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    ft_id, ft_code, ft_date, ft_recorderid, ft_recorder, ft_recorddate, ft_status, ft_statuscode, 
+    ft_id, ft_code, ft_date, ft_status, ft_statuscode,
     ft_remark, fundtransfer.companyId, fundtransfer.updaterId, fundtransfer.updatedate,
     ft_text1, ft_text2, ft_text3, ft_text4, ft_text5, fundtransfer.creatorName, fundtransfer.createTime,
     ft_auditman, ft_auditdate
@@ -57,14 +54,12 @@
     where ft_id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
-    insert into fundtransfer (ft_id, ft_code, ft_date, 
-      ft_recorderid, ft_recorder, ft_recorddate, 
+    insert into fundtransfer (ft_id, ft_code, ft_date,
       ft_status, ft_statuscode, ft_remark, 
       companyId, updaterId, updatedate, 
       ft_text1, ft_text2, ft_text3, 
       ft_text4, ft_text5)
-    values (#{ftId,jdbcType=INTEGER}, #{ftCode,jdbcType=VARCHAR}, #{ftDate,jdbcType=TIMESTAMP}, 
-      #{ftRecorderid,jdbcType=INTEGER}, #{ftRecorder,jdbcType=VARCHAR}, #{ftRecorddate,jdbcType=TIMESTAMP}, 
+    values (#{ftId,jdbcType=INTEGER}, #{ftCode,jdbcType=VARCHAR}, #{ftDate,jdbcType=TIMESTAMP},
       #{ftStatus,jdbcType=VARCHAR}, #{ftStatuscode,jdbcType=VARCHAR}, #{ftRemark,jdbcType=VARCHAR}, 
       #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
       #{ftText1,jdbcType=VARCHAR}, #{ftText2,jdbcType=VARCHAR}, #{ftText3,jdbcType=VARCHAR}, 
@@ -79,13 +74,6 @@
       <if test="ft_date != null" >
         ft_date,
       </if>
-      <if test="ft_recorderid != null" >
-        ft_recorderid,
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder,
-      </if>
-        ft_recorddate,
       <if test="ft_status != null" >
         ft_status,
       </if>
@@ -130,13 +118,6 @@
       <if test="ft_date != null" >
         #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ft_recorderid != null" >
-        #{ft_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-        now(),
       <if test="ft_status != null" >
         #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -187,15 +168,6 @@
       <if test="ft_date != null" >
         ft_date = #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ft_recorderid != null" >
-        ft_recorderid = #{ft_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="ft_recorder != null" >
-        ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="ft_recorddate != null" >
-        ft_recorddate = #{ft_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="ft_status != null" >
         ft_status = #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -235,9 +207,6 @@
     update fundtransfer
     set ft_code = #{ftCode,jdbcType=VARCHAR},
       ft_date = #{ftDate,jdbcType=TIMESTAMP},
-      ft_recorderid = #{ftRecorderid,jdbcType=INTEGER},
-      ft_recorder = #{ftRecorder,jdbcType=VARCHAR},
-      ft_recorddate = #{ftRecorddate,jdbcType=TIMESTAMP},
       ft_status = #{ftStatus,jdbcType=VARCHAR},
       ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
       ft_remark = #{ftRemark,jdbcType=VARCHAR},

applications/money/money-server/src/main/resources/mapper/OthreceiptsMapper.xml

@@ -12,9 +12,6 @@
     <result column="or_bankid" property="or_bankid" jdbcType="INTEGER" />
     <result column="or_bankname" property="or_bankname" jdbcType="VARCHAR" />
     <result column="or_amount" property="or_amount" jdbcType="DOUBLE" />
-    <result column="or_recorderid" property="or_recorderid" jdbcType="INTEGER" />
-    <result column="or_recorder" property="or_recorder" jdbcType="VARCHAR" />
-    <result column="or_recorddate" property="or_recorddate" jdbcType="TIMESTAMP" />
     <result column="or_status" property="or_status" jdbcType="VARCHAR" />
     <result column="or_statuscode" property="or_statuscode" jdbcType="VARCHAR" />
     <result column="or_remark" property="or_remark" jdbcType="VARCHAR" />
@@ -37,7 +34,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     or_id, or_code, or_date, or_custid, or_custcode, or_custname, or_bankcode, or_bankid, 
-    or_bankname, or_amount, or_recorderid, or_recorder, or_recorddate, or_status, or_statuscode, 
+    or_bankname, or_amount, or_status, or_statuscode,
     or_remark, Othreceipts.companyId, Othreceipts.updaterId, Othreceipts.updatedate, or_text1,
     or_text2, or_text3, or_text4, or_text5, othreceipts.creatorName, othreceipts.createTime, or_auditman, or_auditdate
   </sql>
@@ -65,8 +62,7 @@
     insert into othreceipts (or_id, or_code, or_date, 
       or_custid, or_custcode, or_custname, 
       or_bankcode, or_bankid, or_bankname, 
-      or_amount, or_recorderid, or_recorder, 
-      or_recorddate, or_status, or_statuscode, 
+      or_amount, or_status, or_statuscode,
       or_remark, companyId, updaterId, 
       updatedate, or_text1, or_text2, 
       or_text3, or_text4, or_text5
@@ -74,8 +70,7 @@
     values (#{orId,jdbcType=INTEGER}, #{orCode,jdbcType=VARCHAR}, #{orDate,jdbcType=TIMESTAMP}, 
       #{orCustid,jdbcType=INTEGER}, #{orCustcode,jdbcType=VARCHAR}, #{orCustname,jdbcType=VARCHAR}, 
       #{orBankcode,jdbcType=VARCHAR}, #{orBankid,jdbcType=INTEGER}, #{orBankname,jdbcType=VARCHAR}, 
-      #{orAmount,jdbcType=DOUBLE}, #{orRecorderid,jdbcType=INTEGER}, #{orRecorder,jdbcType=VARCHAR}, 
-      #{orRecorddate,jdbcType=TIMESTAMP}, #{orStatus,jdbcType=INTEGER}, #{orStatuscode,jdbcType=DECIMAL}, 
+      #{orAmount,jdbcType=DOUBLE}, #{orStatus,jdbcType=INTEGER}, #{orStatuscode,jdbcType=DECIMAL},
       #{orRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatedate,jdbcType=TIMESTAMP}, #{orText1,jdbcType=VARCHAR}, #{orText2,jdbcType=VARCHAR}, 
       #{orText3,jdbcType=VARCHAR}, #{orText4,jdbcType=VARCHAR}, #{orText5,jdbcType=VARCHAR}
@@ -111,13 +106,6 @@
       <if test="or_amount != null" >
         or_amount,
       </if>
-      <if test="or_recorderid != null" >
-        or_recorderid,
-      </if>
-      <if test="or_recorder != null" >
-        or_recorder,
-      </if>
-        or_recorddate,
       <if test="or_status != null" >
         or_status,
       </if>
@@ -183,13 +171,6 @@
       <if test="or_amount != null" >
         #{or_amount,jdbcType=DOUBLE},
       </if>
-      <if test="or_recorderid != null" >
-        #{or_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="or_recorder != null" >
-        #{or_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="or_status != null" >
         #{or_status,jdbcType=VARCHAR},
       </if>
@@ -261,15 +242,6 @@
       <if test="or_amount != null" >
         or_amount = #{or_amount,jdbcType=DOUBLE},
       </if>
-      <if test="or_recorderid != null" >
-        or_recorderid = #{or_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="or_recorder != null" >
-        or_recorder = #{or_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="or_recorddate != null" >
-        or_recorddate = #{or_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="or_status != null" >
         or_status = #{or_status,jdbcType=VARCHAR},
       </if>
@@ -316,9 +288,6 @@
       or_bankid = #{orBankid,jdbcType=INTEGER},
       or_bankname = #{orBankname,jdbcType=VARCHAR},
       or_amount = #{orAmount,jdbcType=DOUBLE},
-      or_recorderid = #{orRecorderid,jdbcType=INTEGER},
-      or_recorder = #{orRecorder,jdbcType=VARCHAR},
-      or_recorddate = #{orRecorddate,jdbcType=TIMESTAMP},
       or_status = #{orStatus,jdbcType=INTEGER},
       or_statuscode = #{orStatuscode,jdbcType=DECIMAL},
       or_remark = #{orRemark,jdbcType=VARCHAR},

applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml

@@ -12,9 +12,6 @@
     <result column="os_bankcode" property="os_bankcode" jdbcType="VARCHAR" />
     <result column="os_bankname" property="os_bankname" jdbcType="VARCHAR" />
     <result column="os_amount" property="os_amount" jdbcType="DOUBLE" />
-    <result column="os_recorderid" property="os_recorderid" jdbcType="INTEGER" />
-    <result column="os_recorder" property="os_recorder" jdbcType="VARCHAR" />
-    <result column="os_recorddate" property="os_recorddate" jdbcType="TIMESTAMP" />
     <result column="os_status" property="os_status" jdbcType="VARCHAR" />
     <result column="os_statuscode" property="os_statuscode" jdbcType="VARCHAR" />
     <result column="os_remark" property="os_remark" jdbcType="VARCHAR" />
@@ -36,7 +33,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     os_id, os_code, os_date, os_vendid, os_vendcode, os_vendname, os_bankid, os_bankcode, 
-    os_bankname, os_amount, os_recorderid, os_recorder, os_recorddate, os_status, os_statuscode, 
+    os_bankname, os_amount, os_status, os_statuscode,
     os_remark, othspendings.companyId, othspendings.updaterId,
     othspendings.updatedate, os_text1, os_text2, os_text3, os_text4,
     os_text5,othspendings.creatorName, othspendings.createTime, os_auditman, os_auditdate
@@ -58,8 +55,7 @@
     insert into othspendings (os_id, os_code, os_date, 
       os_vendid, os_vendcode, os_vendname, 
       os_bankid, os_bankcode, os_bankname, 
-      os_amount, os_recorderid, os_recorder, 
-      os_recorddate, os_status, os_statuscode, 
+      os_amount, os_status, os_statuscode,
       os_remark, companyId, updaterId, 
       updatedate, os_text1, os_text2, 
       os_text3, os_text4, os_text5
@@ -67,8 +63,7 @@
     values (#{osId,jdbcType=INTEGER}, #{osCode,jdbcType=VARCHAR}, #{osDate,jdbcType=TIMESTAMP}, 
       #{osVendid,jdbcType=INTEGER}, #{osVendcode,jdbcType=VARCHAR}, #{osVendname,jdbcType=VARCHAR}, 
       #{osBankid,jdbcType=INTEGER}, #{osBankcode,jdbcType=VARCHAR}, #{osBankname,jdbcType=VARCHAR}, 
-      #{osAmount,jdbcType=DOUBLE}, #{osRecorderid,jdbcType=INTEGER}, #{osRecorder,jdbcType=VARCHAR}, 
-      #{osRecorddate,jdbcType=TIMESTAMP}, #{osStatus,jdbcType=INTEGER}, #{osStatuscode,jdbcType=DECIMAL}, 
+      #{osAmount,jdbcType=DOUBLE}, #{osStatus,jdbcType=INTEGER}, #{osStatuscode,jdbcType=DECIMAL},
       #{osRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatedate,jdbcType=TIMESTAMP}, #{osText1,jdbcType=VARCHAR}, #{osText2,jdbcType=VARCHAR}, 
       #{osText3,jdbcType=VARCHAR}, #{osText4,jdbcType=VARCHAR}, #{osText5,jdbcType=VARCHAR}
@@ -105,13 +100,6 @@
       <if test="os_amount != null" >
         os_amount,
       </if>
-      <if test="os_recorderid != null" >
-        os_recorderid,
-      </if>
-      <if test="os_recorder != null" >
-        os_recorder,
-      </if>
-        os_recorddate,
       <if test="os_status != null" >
         os_status,
       </if>
@@ -177,13 +165,6 @@
       <if test="os_amount != null" >
         #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        #{os_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="os_recorder != null" >
-        #{os_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="os_status != null" >
         #{os_status,jdbcType=VARCHAR},
       </if>
@@ -255,15 +236,6 @@
       <if test="os_amount != null" >
         os_amount = #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        os_recorderid = #{os_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="os_recorder != null" >
-        os_recorder = #{os_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="os_recorddate != null" >
-        os_recorddate = #{os_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="os_status != null" >
         os_status = #{os_status,jdbcType=VARCHAR},
       </if>
@@ -311,9 +283,6 @@
       os_bankcode = #{osBankcode,jdbcType=VARCHAR},
       os_bankname = #{osBankname,jdbcType=VARCHAR},
       os_amount = #{osAmount,jdbcType=DOUBLE},
-      os_recorderid = #{osRecorderid,jdbcType=INTEGER},
-      os_recorder = #{osRecorder,jdbcType=VARCHAR},
-      os_recorddate = #{osRecorddate,jdbcType=TIMESTAMP},
       os_status = #{osStatus,jdbcType=INTEGER},
       os_statuscode = #{osStatuscode,jdbcType=DECIMAL},
       os_remark = #{osRemark,jdbcType=VARCHAR},

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -15,9 +15,6 @@
     <result column="pb_preamount" jdbcType="DOUBLE" property="pb_preamount" />
     <result column="pb_discounts" jdbcType="DOUBLE" property="pb_discounts" />
     <result column="pb_havebalance" jdbcType="DOUBLE" property="pb_havebalance" />
-    <result column="pb_recorderid" jdbcType="INTEGER" property="pb_recorderid" />
-    <result column="pb_recorder" jdbcType="VARCHAR" property="pb_recorder" />
-    <result column="pb_recorddate" jdbcType="TIMESTAMP" property="pb_recorddate" />
     <result column="pb_status" jdbcType="VARCHAR" property="pb_status" />
     <result column="pb_statuscode" jdbcType="VARCHAR" property="pb_statuscode" />
     <result column="pb_remark" jdbcType="VARCHAR" property="pb_remark" />
@@ -105,8 +102,8 @@
   </sql>
   <sql id="Base_Column_List">
     pb_id, pb_code, pb_kind, pb_date, pb_vendid, pb_vendcode, pb_vendname, pb_manname, 
-    pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance, pb_recorderid, 
-    pb_recorder, pb_recorddate, pb_status, pb_statuscode, pb_remark, paybalance.companyId,
+    pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance,
+     pb_status, pb_statuscode, pb_remark, paybalance.companyId,
     paybalance.updaterId,paybalance.updatedate, pb_text1, pb_text2, pb_text3, pb_text4, pb_text5, paybalance.creatorName,
     paybalance.createTime, pb_auditdate, pb_auditman
   </sql>
@@ -143,8 +140,7 @@
       pb_date, pb_vendid, pb_vendcode, 
       pb_vendname, pb_manname, pb_pdamount, 
       pb_pbdamount, pb_preamount, pb_discounts, 
-      pb_havebalance, pb_recorderid, pb_recorder, 
-      pb_recorddate, pb_status, pb_statuscode, 
+      pb_havebalance, pb_status, pb_statuscode,
       pb_remark, companyId, updaterId,
       updatedate, pb_text1, pb_text2, 
       pb_text3, pb_text4, pb_text5
@@ -153,8 +149,7 @@
       #{pb_date,jdbcType=TIMESTAMP}, #{pb_vendid,jdbcType=INTEGER}, #{pb_vendcode,jdbcType=VARCHAR}, 
       #{pb_vendname,jdbcType=VARCHAR}, #{pb_manname,jdbcType=VARCHAR}, #{pb_pdamount,jdbcType=DOUBLE}, 
       #{pb_pbdamount,jdbcType=DOUBLE}, #{pb_preamount,jdbcType=DOUBLE}, #{pb_discounts,jdbcType=DOUBLE}, 
-      #{pb_havebalance,jdbcType=DOUBLE}, #{pb_recorderid,jdbcType=INTEGER}, #{pb_recorder,jdbcType=VARCHAR}, 
-      #{pb_recorddate,jdbcType=TIMESTAMP}, #{pb_status,jdbcType=INTEGER}, #{pb_statuscode,jdbcType=DECIMAL}, 
+      #{pb_havebalance,jdbcType=DOUBLE},  #{pb_status,jdbcType=INTEGER}, #{pb_statuscode,jdbcType=DECIMAL},
       #{pb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{pb_text1,jdbcType=VARCHAR}, #{pb_text2,jdbcType=VARCHAR},
       #{pb_text3,jdbcType=VARCHAR}, #{pb_text4,jdbcType=VARCHAR}, #{pb_text5,jdbcType=VARCHAR}
@@ -199,13 +194,6 @@
       <if test="pb_havebalance != null">
         pb_havebalance,
       </if>
-      <if test="pb_recorderid != null">
-        pb_recorderid,
-      </if>
-      <if test="pb_recorder != null">
-        pb_recorder,
-      </if>
-        pb_recorddate,
       <if test="pb_status != null">
         pb_status,
       </if>
@@ -280,13 +268,6 @@
       <if test="pb_havebalance != null">
         #{pb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="pb_recorderid != null">
-        #{pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null">
-        #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="pb_status != null">
         #{pb_status,jdbcType=INTEGER},
       </if>
@@ -374,15 +355,6 @@
       <if test="pb_havebalance != null">
         pb_havebalance = #{pb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="pb_recorderid != null">
-        pb_recorderid = #{pb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="pb_recorder != null">
-        pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="pb_recorddate != null">
-        pb_recorddate = #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="pb_status != null">
         pb_status = #{pb_status,jdbcType=INTEGER},
       </if>
@@ -436,9 +408,6 @@
       pb_preamount = #{pb_preamount,jdbcType=DOUBLE},
       pb_discounts = #{pb_discounts,jdbcType=DOUBLE},
       pb_havebalance = #{pb_havebalance,jdbcType=DOUBLE},
-      pb_recorderid = #{pb_recorderid,jdbcType=INTEGER},
-      pb_recorder = #{pb_recorder,jdbcType=VARCHAR},
-      pb_recorddate = #{pb_recorddate,jdbcType=TIMESTAMP},
       pb_status = #{pb_status,jdbcType=INTEGER},
       pb_statuscode = #{pb_statuscode,jdbcType=DECIMAL},
       pb_remark = #{pb_remark,jdbcType=VARCHAR},
@@ -500,7 +469,7 @@
   <!-- 银行账户-->
   <sql id="Bank_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount,
-    bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid,
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_spending,bk_income
   </sql>
   <sql id="Blob_Column_List" >
@@ -527,9 +496,6 @@
     <result column="bk_thisamount" property="bk_thisamount" jdbcType="DOUBLE" />
     <result column="bk_status" property="bk_status" jdbcType="VARCHAR" />
     <result column="bk_statuscode" property="bk_statuscode" jdbcType="VARCHAR" />
-    <result column="bk_recorderid" property="bk_recorderid" jdbcType="INTEGER" />
-    <result column="bk_recorder" property="bk_recorder" jdbcType="VARCHAR" />
-    <result column="bk_recorddate" property="bk_recorddate" jdbcType="TIMESTAMP" />
     <result column="bk_ym" property="bk_ym" jdbcType="INTEGER" />
     <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
@@ -570,15 +536,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -645,9 +602,6 @@
     <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
     <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
     <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
-    <result column="ve_recordid" property="ve_recordid" jdbcType="INTEGER" />
-    <result column="ve_recordname" property="ve_recordname" jdbcType="VARCHAR" />
-    <result column="ve_initdate" property="ve_initdate" jdbcType="TIMESTAMP" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -670,7 +624,7 @@
   <sql id="Vendor_Column_List" >
         ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
-        ve_recordid, ve_recordname, ve_initdate, companyId, updaterId, updateTime, ve_text1,
+       companyId, updaterId, updateTime, ve_text1,
         ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount
     </sql>
 
@@ -719,15 +673,6 @@
       <if test="ve_statuscode != null" >
         ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="ve_recordid != null" >
-        ve_recordid = #{ve_recordid,jdbcType=DECIMAL},
-      </if>
-      <if test="ve_recordname != null" >
-        ve_recordname = #{ve_recordname,jdbcType=VARCHAR},
-      </if>
-      <if test="ve_initdate != null" >
-        ve_initdate = #{ve_initdate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null" >
         companyId = #{companyId,jdbcType=DECIMAL},
       </if>

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -15,9 +15,6 @@
     <result column="rb_preamount" jdbcType="DOUBLE" property="rb_preamount" />
     <result column="rb_discounts" jdbcType="DOUBLE" property="rb_discounts" />
     <result column="rb_havebalance" jdbcType="DOUBLE" property="rb_havebalance" />
-    <result column="rb_recorderid" jdbcType="INTEGER" property="rb_recorderid" />
-    <result column="rb_recorder" jdbcType="VARCHAR" property="rb_recorder" />
-    <result column="rb_recorddate" jdbcType="TIMESTAMP" property="rb_recorddate" />
     <result column="rb_status" jdbcType="VARCHAR" property="rb_status" />
     <result column="rb_statuscode" jdbcType="VARCHAR" property="rb_statuscode" />
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
@@ -105,8 +102,8 @@
   </sql>
   <sql id="Base_Column_List">
     rb_id, rb_code, rb_kind, rb_date, rb_custid, rb_custcode, rb_custname, rb_manname,
-    rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_recorderid,
-    rb_recorder, rb_recorddate, rb_status, rb_statuscode, rb_remark, recbalance.companyId,
+    rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_status, rb_statuscode, rb_remark,
+    recbalance.companyId,
     recbalance.updaterId,recbalance.updatedate, rb_text1, rb_text2, rb_text3, rb_text4, rb_text5,
     recbalance.creatorName, recbalance.createTime, rb_auditman, rb_auditdate
   </sql>
@@ -184,8 +181,7 @@
       rb_date, rb_custid, rb_custcode, 
       rb_custname, rb_manname, rb_rdamount, 
       rb_rbdamount, rb_preamount, rb_discounts, 
-      rb_havebalance, rb_recorderid, rb_recorder, 
-      rb_recorddate, rb_status, rb_statuscode, 
+      rb_havebalance, rb_status, rb_statuscode,
       rb_remark, companyId, updaterId,
       updatedate, rb_text1, rb_text2, 
       rb_text3, rb_text4, rb_text5
@@ -194,8 +190,7 @@
       #{rb_date,jdbcType=TIMESTAMP}, #{rb_custid,jdbcType=INTEGER}, #{rb_custcode,jdbcType=VARCHAR}, 
       #{rb_custname,jdbcType=VARCHAR}, #{rb_manname,jdbcType=VARCHAR}, #{rb_rdamount,jdbcType=DOUBLE}, 
       #{rb_rbdamount,jdbcType=DOUBLE}, #{rb_preamount,jdbcType=DOUBLE}, #{rb_discounts,jdbcType=DOUBLE}, 
-      #{rb_havebalance,jdbcType=DOUBLE}, #{rb_recorderid,jdbcType=INTEGER}, #{rb_recorder,jdbcType=VARCHAR}, 
-      #{rb_recorddate,jdbcType=TIMESTAMP}, #{rb_status,jdbcType=INTEGER}, #{rb_statuscode,jdbcType=DECIMAL}, 
+      #{rb_havebalance,jdbcType=DOUBLE}, #{rb_status,jdbcType=INTEGER}, #{rb_statuscode,jdbcType=DECIMAL},
       #{rb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updateTime,jdbcType=TIMESTAMP}, #{rb_text1,jdbcType=VARCHAR}, #{rb_text2,jdbcType=VARCHAR},
       #{rb_text3,jdbcType=VARCHAR}, #{rb_text4,jdbcType=VARCHAR}, #{rb_text5,jdbcType=VARCHAR}
@@ -243,13 +238,6 @@
       <if test="rb_havebalance != null">
         rb_havebalance,
       </if>
-      <if test="rb_recorderid != null">
-        rb_recorderid,
-      </if>
-      <if test="rb_recorder != null">
-        rb_recorder,
-      </if>
-        rb_recorddate,
       <if test="rb_status != null">
         rb_status,
       </if>
@@ -324,13 +312,6 @@
       <if test="rb_havebalance != null">
         #{rb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="rb_recorderid != null">
-        #{rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_recorder != null">
-        #{rb_recorder,jdbcType=VARCHAR},
-      </if>
-      now(),
       <if test="rb_status != null">
         #{rb_status,jdbcType=INTEGER},
       </if>
@@ -420,15 +401,6 @@
       <if test="record.rb_havebalance != null">
         rb_havebalance = #{record.rb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="record.rb_recorderid != null">
-        rb_recorderid = #{record.rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.rb_recorder != null">
-        rb_recorder = #{record.rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="record.rb_recorddate != null">
-        rb_recorddate = #{record.rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="record.rb_status != null">
         rb_status = #{record.rb_status,jdbcType=INTEGER},
       </if>
@@ -482,9 +454,6 @@
       rb_preamount = #{record.rb_preamount,jdbcType=DOUBLE},
       rb_discounts = #{record.rb_discounts,jdbcType=DOUBLE},
       rb_havebalance = #{record.rb_havebalance,jdbcType=DOUBLE},
-      rb_recorderid = #{record.rb_recorderid,jdbcType=INTEGER},
-      rb_recorder = #{record.rb_recorder,jdbcType=VARCHAR},
-      rb_recorddate = #{record.rb_recorddate,jdbcType=TIMESTAMP},
       rb_status = #{record.rb_status,jdbcType=INTEGER},
       rb_statuscode = #{record.rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
@@ -539,15 +508,6 @@
       <if test="rb_havebalance != null">
         rb_havebalance = #{rb_havebalance,jdbcType=DOUBLE},
       </if>
-      <if test="rb_recorderid != null">
-        rb_recorderid = #{rb_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="rb_recorder != null">
-        rb_recorder = #{rb_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="rb_recorddate != null">
-        rb_recorddate = #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="rb_status != null">
         rb_status = #{rb_status,jdbcType=INTEGER},
       </if>
@@ -601,9 +561,6 @@
       rb_preamount = #{rb_preamount,jdbcType=DOUBLE},
       rb_discounts = #{rb_discounts,jdbcType=DOUBLE},
       rb_havebalance = #{rb_havebalance,jdbcType=DOUBLE},
-      rb_recorderid = #{rb_recorderid,jdbcType=INTEGER},
-      rb_recorder = #{rb_recorder,jdbcType=VARCHAR},
-      rb_recorddate = #{rb_recorddate,jdbcType=TIMESTAMP},
       rb_status = #{rb_status,jdbcType=INTEGER},
       rb_statuscode = #{rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{rb_remark,jdbcType=VARCHAR},
@@ -635,7 +592,7 @@
   <!-- 银行账户-->
   <sql id="Bank_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount,
-    bk_status, bk_statuscode, bk_recorderid, bk_recorder, bk_recorddate, bk_ym, companyid,
+    bk_status, bk_statuscode, bk_ym, companyid,
     updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_spending,bk_income
   </sql>
   <sql id="Blob_Column_List" >
@@ -662,9 +619,6 @@
     <result column="bk_thisamount" property="bk_thisamount" jdbcType="DOUBLE" />
     <result column="bk_status" property="bk_status" jdbcType="VARCHAR" />
     <result column="bk_statuscode" property="bk_statuscode" jdbcType="VARCHAR" />
-    <result column="bk_recorderid" property="bk_recorderid" jdbcType="INTEGER" />
-    <result column="bk_recorder" property="bk_recorder" jdbcType="VARCHAR" />
-    <result column="bk_recorddate" property="bk_recorddate" jdbcType="TIMESTAMP" />
     <result column="bk_ym" property="bk_ym" jdbcType="INTEGER" />
     <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
@@ -705,15 +659,6 @@
       <if test="bk_statuscode != null" >
         bk_statuscode = #{bk_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="bk_recorderid != null" >
-        bk_recorderid = #{bk_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="bk_recorder != null" >
-        bk_recorder = #{bk_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="bk_recorddate != null" >
-        bk_recorddate = #{bk_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="bk_ym != null" >
         bk_ym = #{bk_ym,jdbcType=INTEGER},
       </if>
@@ -772,9 +717,6 @@
     <result column="cu_credit" jdbcType="DOUBLE" property="cu_credit" />
     <result column="cu_status" jdbcType="VARCHAR" property="cu_status" />
     <result column="cu_statuscode" jdbcType="VARCHAR" property="cu_statuscode" />
-    <result column="cu_recordmanid" jdbcType="INTEGER" property="cu_recordmanid" />
-    <result column="cu_recordman" jdbcType="VARCHAR" property="cu_recordman" />
-    <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
     <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
@@ -789,7 +731,7 @@
   <sql id="Customer_Column_List">
     cu_id, cu_code, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount,
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit,
-    cu_status, cu_statuscode, cu_recordmanid, cu_recordman, cu_recorddate, companyid,
+    cu_status, cu_statuscode, companyid,
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount,
     cu_recamount,cu_preamount
   </sql>
@@ -848,15 +790,6 @@
       <if test="cu_statuscode != null">
         cu_statuscode = #{cu_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="cu_recordmanid != null">
-        cu_recordmanid = #{cu_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="cu_recordman != null">
-        cu_recordman = #{cu_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="cu_recorddate != null">
-        cu_recorddate = #{cu_recorddate,jdbcType=TIMESTAMP},
-      </if>
       <if test="companyId != null">
         companyid = #{companyId,jdbcType=INTEGER},
       </if>

applications/money/money-server/src/main/resources/mapper/SubledgerMapper.xml

@@ -21,11 +21,6 @@
     <result column="sl_ym" property="sl_ym" jdbcType="INTEGER" />
   </resultMap>
 
-  <resultMap id="BaseAddMap" type="com.usoftchina.saas.money.po.VendorAdd" >
-    <result column="beginamount" property="beginamount" jdbcType="DOUBLE" />
-    <result column="nowamount" property="nowamount" jdbcType="DOUBLE" />
-    <result column="nowpay" property="beginamount" jdbcType="DOUBLE" />
-  </resultMap>
   <sql id="Base_Column_List" >
     sl_id, sl_code, sl_kind, sl_custid, sl_vendid, sl_date, sl_amount, sl_preamount, 
     sl_yamount, sl_namount, sl_remark, companyId, updaterId, updateTime, sl_orderamount, 
@@ -254,13 +249,4 @@
         where sl_code = #{sl_code,jdbcType=VARCHAR}
     </select>
 
-  <select id="selectAdd" resultMap="BaseAddMap">
-    select a.sl_orderamount as beginamount, b.sl_orderamount as nowamount, c.sl_orderamount as nowpay FROM
-(select sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '期初余额') a
-left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '采购验收单' or sl_kind = '采购验退单'
-group by sl_vendid,sl_ym) b on a.sl_vendid=b.sl_vendid
-left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '付款单' or sl_kind = '其他支出单'
-group by sl_vendid,sl_ym) c on a.sl_vendid=c.sl_vendid
- where a.sl_vendid=#{sl_vendid,jdbcType=INTEGER} and a.sl_ym=#{sl_ym, jdbcType=INTEGER}
-  </select>
 </mapper>

applications/money/money-server/src/main/resources/mapper/VendorAcountViewMapper.xml

@@ -20,6 +20,7 @@
     <result column="pd_nettotal" property="pd_nettotal" jdbcType="DOUBLE" />
     <result column="companyId" property="companyId" jdbcType="INTEGER" />
     <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR"/>
+    <result column="ym" property="ym" jdbcType="INTEGER" />
   </resultMap>
 
   <select id="selectByCondition" resultMap="BaseResultMap">
@@ -46,4 +47,24 @@
       </if>
     </where>
   </select>
+
+
+  <resultMap id="BaseAddMap" type="com.usoftchina.saas.money.po.VendOrCustAdd" >
+    <result column="beginamount" property="beginamount" jdbcType="DOUBLE" />
+    <result column="nowamount" property="nowamount" jdbcType="DOUBLE" />
+    <result column="nowpay" property="beginamount" jdbcType="DOUBLE" />
+  </resultMap>
+  <select id="selectVendAdd" resultMap="BaseAddMap">
+    select distinct a.sl_orderamount as beginamount, b.sl_orderamount as nowamount, c.sl_orderamount as nowpay FROM
+(select sl_orderamount,sl_vendid,sl_ym, companyid from subledger where sl_kind = '期初余额') a
+left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '采购验收单' or sl_kind = '采购验退单'
+group by sl_vendid,sl_ym) b on a.sl_vendid=b.sl_vendid
+left join (select sum(sl_orderamount) sl_orderamount,sl_vendid,sl_ym from subledger where sl_kind = '付款单' or sl_kind = '其他支出单'
+group by sl_vendid,sl_ym) c on a.sl_vendid=c.sl_vendid
+ where a.sl_vendid=#{sl_vendid,jdbcType=INTEGER} and a.sl_ym=#{sl_ym, jdbcType=INTEGER} and a.companyid = #{companyId}
+  </select>
+
+  <select id="getId" resultType="java.lang.Integer">
+    select ve_id from vendor where ve_code = #{code} and companyId = #{companyId}
+  </select>
 </mapper>

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-portal-web/src/components/conenter/addgongsi.vue

@@ -6,7 +6,7 @@
                 <div class="qy-title" style="position: relative;">
                     <span>完善企业信息</span>
                     <div class="qy-anniu">
-                        <span @click= "Preservation" class="qy-xiugai dianji" style="left: 0">保存</span>
+                        <span @click= "Preservation" class="qy-xiugai dianji" style="left: -2px">保存</span>
                         <span @click= "tjquxiao" class="qy-quxiao xs">取消</span>
                     </div>
                 </div>
@@ -19,18 +19,32 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select ref="qyindustry" style="width:71%" name="selectAge" id="selectAge">   
-                                <option value="贸易类">贸易类</option>   
-                                <option value="制造类">制造类</option>   
+                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                                <option value="贸易零售">贸易零售</option>
+                                <option value="制造加工">制造加工</option>
+                                <option value="服务业">服务业</option>
+                                <option value="教育">教育</option>
+                                <option value="信息传媒">信息传媒</option>
+                                <option value="金融">金融</option>
+                                <option value="高新科技">高新科技</option>
+                                <option value="电子商务">电子商务</option>
+                                <option value="互联网">互联网</option>
+                                <option value="医疗服务">医疗服务</option>
+                                <option value="艺术娱乐">艺术娱乐</option>
+                                <option value="地产建筑">地产建筑</option>
+                                <option value="公共服务">公共服务</option>
+                                <option value="开采冶金">开采冶金</option>
+                                <option value="交通仓储">交通仓储</option>
+                                <option value="农林牧渔">农林牧渔</option>
                                 <option value="其他">其他</option>   
                             </select>
                         </li>
-                        <li style="height:60px;">
+                        <li style="height:70px;">
                             <span class="qy-biaoti left">公司地址</span>
                             <div class="addbiaoqian" style="float: left;margin: 0;">
                                 <!-- <v-distpicker @province= 'qyprovince' @city= 'qycity' @area= 'qyarea'></v-distpicker> -->
                                 <v-distpicker @selected= 'selected'></v-distpicker>
-                                <input ref="address" @change="address" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
+                                <input ref="address" @change="address" :disabled="disabled" class="qy-xiangxi" type="text" placeholder="输入企业详细地址">
                                 
                             </div>
                             <span ref="ress" style="color:red;margin-top: 40px;display: inline-block;"></span>
@@ -73,11 +87,12 @@ import VDistpicker from 'v-distpicker'
                 qymingzi: false,//企业名是否注册
                 Email: '',
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')),//本地储存的用户信息
-                // reg: new RegExp("[`~!@#$^&*()=+-|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]"),
-                reg: new RegExp(/[\@\#\$\%\&\*!\￥]/),
+                reg: new RegExp(/[\@\#\$\%\&\*!\￥]/),//非法字符
                 isaddress: false,//公司地址验证
                 isname: false,//姓名验证
                 isspaceName: false,//公司名验证
+                isemail: false,//邮箱
+                disabled: true
             }
         },
         components:{
@@ -160,9 +175,11 @@ import VDistpicker from 'v-distpicker'
                 let reg = new RegExp("^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$"); 
                 let email = this.$refs.email.value;//邮箱
                 if (!reg.test(email)) {
-                    this.Email = '邮箱格式错误'
+                    this.Email = '请填写正确的邮箱'
+                    this.isemail = false
                 } else {
                     this.Email = ''
+                    this.isemail = true
                 }
             },
             //保存
@@ -176,9 +193,9 @@ import VDistpicker from 'v-distpicker'
                 let token = String(mytoken.token);
                 let uu = mytoken.account.uu;
                 let mobile = mytoken.account.mobile;//手机号
-                let company = {'name':qyname,'address':address};
+                let company = {'name':qyname,'address':address,'type':qyindustry};
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
-                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName) {
+                if (name != '' && qyname != '' && this.qymingzi && this.isaddress && this.isname && this.isspaceName && this.isemail) {
                     this.$ajax({
                         url: this.$url.api+"/api/account/accountCenter/companyAccount/save",//http://192.168.253.31:8560
                         method: 'post',
@@ -207,17 +224,12 @@ import VDistpicker from 'v-distpicker'
                 }
                 
             },
-            //获取省
-            qyprovince(sheng){
-                this.province = sheng.value;
-            },
-            //市
-            qycity(shi){
-                this.city = shi.value;
-            },
-            //区
-            qyarea(qu){
-                this.area = qu.value;
+            //获取省市区
+            selected(data){
+                this.province = data.province.value;
+                this.city = data.city.value;
+                this.area = data.area.value;
+                this.disabled= false
             },
         }
     }
@@ -236,6 +248,7 @@ import VDistpicker from 'v-distpicker'
     border-bottom: 0;
     padding-bottom: 1px;
     border-radius: 4px 4px 0 0;
+    /* margin-top: -30px; */
 }
 .tj-up li {
     margin-bottom: 26px;
@@ -249,7 +262,7 @@ import VDistpicker from 'v-distpicker'
     margin-bottom: 26px;
 }
 .tj-down div:nth-child(2) {
-    margin-bottom: 100px;
+    margin-bottom: 70px;
 }
 .addbiaoqian>>>.distpicker-address-wrapper select {
     height: 30px;

frontend/saas-portal-web/src/components/conenter/company.vue

@@ -56,7 +56,7 @@
       </div>
     </div>
 
-        <div class="gs-qiyebox" ref="qiyebox">
+        <div class="gs-qiyebox" ref="qiyebox" style="margin-top: 70px;">
             <!-- 点击查看企业详情 -->
             <div v-for="(d , i) in arr " :key="i" class="gs-xiangqing xs">
                 <div class="left gs-xqleft" @click= "getEnterpriseInfo(d)">
@@ -122,7 +122,7 @@
             let token = String(mytoken.token);
             //企业列表
             this.$ajax({
-                    url: this.$url.api+"/api/account/accountCenter/company/list",
+                    url: this.$url.api+"/api/account/accountCenter/company/list",//http://192.168.253.31:8560
                     method: 'get',
                     params: {
                         mobile: mytoken.account.mobile
@@ -192,7 +192,7 @@
                 let token = this.mytoken.token;
                 const frame = window.frames[window.frames.length - 1];
                 this.$ajax({
-                    url: this.$url.api+'/api/auth/switch/company?companyId='+id,//http://192.168.253.31:8560
+                    url: this.$url.api+'/api/auth/switch/company?companyId='+id,
                     method :'get',
                     headers: {
                         "Authorization":token

frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue

@@ -24,7 +24,7 @@
                 <div class="qy-conent">
                     <ul>
                         <li><span class="qy-biaoti">公司名称</span><span>{{content.name}}</span></li>
-                        <li><span class="qy-biaoti">所属行业</span><span></span></li>
+                        <li><span class="qy-biaoti">所属行业</span><span>{{content.type}}</span></li>
                         <li><span class="qy-biaoti">公司地址</span><span>{{content.address}}</span></li>
                     </ul>
                 </div>
@@ -60,7 +60,26 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <span></span>
+                            <select ref="qyindustry" style="width:59%;height: 30px" name="selectAge" id="selectAge">   
+                                <option value="">请选择所属行业</option>
+                                <option value="贸易零售">贸易零售</option>
+                                <option value="制造加工">制造加工</option>
+                                <option value="服务业">服务业</option>
+                                <option value="教育">教育</option>
+                                <option value="信息传媒">信息传媒</option>
+                                <option value="金融">金融</option>
+                                <option value="高新科技">高新科技</option>
+                                <option value="电子商务">电子商务</option>
+                                <option value="互联网">互联网</option>
+                                <option value="医疗服务">医疗服务</option>
+                                <option value="艺术娱乐">艺术娱乐</option>
+                                <option value="地产建筑">地产建筑</option>
+                                <option value="公共服务">公共服务</option>
+                                <option value="开采冶金">开采冶金</option>
+                                <option value="交通仓储">交通仓储</option>
+                                <option value="农林牧渔">农林牧渔</option>
+                                <option value="其他">其他</option>   
+                            </select>
                         </li>
                         <li>
                             <span class="qy-biaoti">公司地址</span>
@@ -79,7 +98,7 @@
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
                         <li>
                             <span class="qy-biaoti">邮箱</span>
-                            <input @input="email" ref="email" type="text" value="">
+                            <input @change="email" ref="email" type="text" value="">
                             <span style="color:red">{{Email}}</span>
                         </li>
                     </ul>
@@ -121,7 +140,8 @@
                 let reg = new RegExp("^[a-z0-9A-Z]+[- | a-z0-9A-Z . _]+@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-z]{2,}$"); 
                 let email = this.$refs.email.value;//邮箱
                 if (!reg.test(email)) {
-                    this.Email = '邮箱格式错误'
+                    this.Email = '请填写正确的邮箱'
+                    this.isemail = false
                 } else {
                     this.Email = '',
                     this.isemail = true
@@ -137,12 +157,13 @@
                 if (this.isemail) {
                     let email = this.$refs.email.value;
                     let qyname = this.content.name;//公司名字
+                    let qyindustry = this.$refs.qyindustry.value;//所属行业
                     let address = this.content.address;//公司详细地址
                     let companyId = this.content.id;
                     let name = this.content.realname;//名字
                     let mobile = this.mytoken.account.mobile;//手机号
                     let uu = this.content.uu;
-                    let company = {'name':qyname,'address':address, 'id':companyId};
+                    let company = {'name':qyname,'address':address, 'id':companyId, 'type':qyindustry};
                     let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu};
                     this.$ajax({
                         url: this.$url.api+"/api/account/accountCenter/companyAccount/update",//http://192.168.253.31:8560
@@ -156,17 +177,18 @@
                         }
                     })
                     .then(res=>{
-                        console.log("请求成功",res)
+                        // console.log("请求成功",res)
                         if (res.data.success) {
                             document.documentElement.scrollTop = 0;
                             this.xiugai = true;
+                            this.content.type = qyindustry
                         };
                     })
                     .catch(err=>{
-                        console.log("请求失败",err)
+                        // console.log("请求失败",err)
                     })
                 } else {
-                    this.$refs.Tips.innerHTML= "邮箱格式错误"
+                    this.$refs.Tips.innerHTML= "请填写正确的邮箱"
                     // this.isTipsmail = true;
                     setTimeout(()=>{
                         this.$refs.Tips.innerHTML= ""

frontend/saas-portal-web/static/css/gongsi.css

@@ -1,7 +1,7 @@
 .xs:hover {
     cursor:pointer;
-    border-bottom: 1px solid #2868c8;
-    box-shadow: 1px 1px 1px #ccc;
+    /* border-bottom: 1px solid #2868c8; */
+    /* box-shadow: 1px 1px 1px #ccc; */
 }
 .dianji:hover{
     border-bottom: 1px solid #2868c8;
@@ -73,7 +73,7 @@
 
 /* 主体 */
 .gs-worp {
-    width: 68%;
+    width: 55%;
     margin: 0 auto;
     font-size: 14px;
     color: #243A52;
@@ -99,6 +99,7 @@
 }
 .gsqiye {
     display: block !important;
+    margin-top: -30px;
 }
 .gs-xiangqing {
     height: 112px;
@@ -190,7 +191,7 @@
     color: #1E88F5;
     text-align: center;
     position: relative;
-    padding: 6px 33px;
+    padding: 6px 26px;
     font-size: 14px;
 }
 .xingxing {
@@ -199,11 +200,11 @@
 .qy-anniu {
     position: absolute;
     top: 0;
-    right: 100px;
+    right: 40px;
 }
 .qy-conent input {
     border: 1px solid #1E88F5;
-    width: 71%;
+    width: 59%;
 }
 .tj-biaoqian {
     border: 1px dashed #7CBAFA;
@@ -227,8 +228,10 @@
     margin-right: 102px;
 }
 .qy-xiangxi {
-    width: 100% !important;
-    margin-top: 8px;
+    width: 84% !important;
+    margin-top: 10px;
+    font-size: 12px;
+    padding-left: 10px;
 }
 .tj-bqleft {
     float: left;
@@ -302,6 +305,7 @@
     box-shadow: 0 20px 60px 8px #F4F8FC;
     border-radius: 4px;
     margin-bottom: 25px;
+    /* margin-top: -30px; */
 }
 .qy-title {
     background: #F4F8FC;
@@ -320,7 +324,7 @@
     text-align: center;
     position: relative;
     left: 200px;
-    padding: 6px 33px;
+    padding: 6px 26px;
     background: #1E88F5;
     border-radius: 2px;
 }

frontend/saas-portal-web/static/css/main.css

@@ -326,10 +326,11 @@ main > section {
     width: 100%;
     padding: 0;
     margin: 0;
+    margin-top: 100px;
 }
 .ts-box {
     overflow: hidden;
-    margin-top: 50px;
+    /* margin-top: 50px; */
     position: relative;
 }
 .ts-minimg {
@@ -743,7 +744,7 @@ main > section {
 }
 
 .section-title {
-    margin-bottom: 80px;
+    /* margin-bottom: 80px; */
 }
 
 .section-title.white {

frontend/saas-web/Dockerfile.test

@@ -0,0 +1,6 @@
+FROM hub.c.163.com/library/nginx
+MAINTAINER USOFTCHINA <yingp@usoftchina.com>
+RUN rm /etc/nginx/conf.d/default.conf
+ADD runtime/nginx/default.conf /etc/nginx/conf.d/
+COPY build/testing/saas/ /usr/share/nginx/html/
+COPY set-token.html /usr/share/nginx/html/

frontend/saas-web/app.json

@@ -291,15 +291,11 @@
         "cache": {
             "enable": true
         },
-        /**"compressor": {
+        "compressor": {
             "type": "yui"
-        },*/
-        "compressor":null,
+        },
         "server": {
-            "basePath": {
-                "https": "https://saas-api-dev.usoftchina.com:5443",
-                "http": "http://192.168.0.181:8560"
-            },
+            "basePath": "https://saas-api.usoftchina.com",
             "urlPattern": "^\/api\/"
         }
     },

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/core/base/BasePanel.scss

@@ -32,4 +32,56 @@
 .x-basepanel-pagingtoolbar{
     border:1px solid #abdaff !important;
     border-top-width: 0 !important;
+}
+
+.x-btn-import-middle:after{
+    content: ' ';
+    display: block;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 15px 0 16px 18px;
+    border-color: transparent transparent transparent #34baf6;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.x-btn-import-middle-next:after{
+    content: ' ';
+    display: block;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 15px 0 16px 18px;
+    border-color: transparent transparent transparent #fff;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.x-btn-import-first{
+    .x-btn-wrap{
+        .x-btn-button{
+          .x-btn-inner{
+            color:#fff !important
+          }
+        }
+    }
+}
+
+.x-btn-import-last{
+    .x-btn-wrap{
+        .x-btn-button{
+          .x-btn-inner{
+            color:#34baf6 !important
+          }
+        }
+    }
+}
+
+.x-btn-import-last{
+    .x-btn.x-btn-disabled.x-btn-default-toolbar-small .x-btn-inner-default-toolbar-small {
+        color: #34baf6;
+    }
 }

frontend/saas-web/app/view/core/base/ImportWindow.js

@@ -4,35 +4,172 @@ Ext.define('saas.view.core.base.ImportWindow', {
     layout:'fit',
 
     requires: [
+        'Ext.form.field.File',
         'Ext.container.ButtonGroup'
     ],
 
-    items:[{
-        xtype:'panel',
-        layout:'column',
-        defaults:{
-            columnWidth:1
-        },
-        tbar:['->',{
-            width:300,
-            text:'下载模板并填写'
-        },{
-            width:300,
-            text:'上传导入文件'
-        },'->'],
-        items:[{
-            xtype:'container',
-            html:'asddddddddddddddddddddd',
-        },{
-            xtype:'fieldset',
-            items:[{
-                text:'asddddddddddddddddddddd'
-            }]
-        }]
+    bbar:['->',{
+        hidden:true,
+        name:'prev',
+        text:'上一步',
+        handler:function(b){
+            var p = this.ownerCt.ownerCt.items.items[0];
+            var tbar = p.dockedItems.items[0];
+            //first
+            var first = tbar.down('[name=first]').el.dom;
+            first.classList.add('x-btn-import-first');
+            first.style.background = '#34baf6';
+            first.childNodes[0].childNodes[0].childNodes[1].style.color = '#fff';
+            //middle
+            var middle = tbar.down('[name=middle]').el.dom;
+            middle.classList.add('x-btn-import-middle');
+            middle.classList.remove('x-btn-import-middle-next');
+            middle.style.background = '#fff';
+            //last
+            var last = tbar.down('[name=last]').el.dom;
+            last.classList.add('x-btn-import-last');
+            last.style.background = '#fff';
+            last.childNodes[0].childNodes[0].childNodes[1].style.color = '#34baf6';
+            //按钮逻辑
+            b.hide();
+            b.ownerCt.down('[name=next]').show();
+            b.ownerCt.down('[name=over]').hide();
+            //字段逻辑
+            p.down('[name=download]').show();
+            p.down('[name=upload]').hide();
+            p.down('[name=detail]').show();
+            p.down('[name=message]').hide();
+        }
+    },{
+        name:'next',
+        text:'下一步',
+        handler:function(b){
+            var p = this.ownerCt.ownerCt.items.items[0];
+            var tbar = p.dockedItems.items[0];
+            //first
+            var first = tbar.down('[name=first]').el.dom;
+            first.classList.remove('x-btn-import-first');
+            first.style.background = '#fff';
+            first.childNodes[0].childNodes[0].childNodes[1].style.color = '#34baf6';
+            //middle
+            var middle = tbar.down('[name=middle]').el.dom;
+            middle.classList.remove('x-btn-import-middle');
+            middle.classList.add('x-btn-import-middle-next');
+            middle.style.background = '#34baf6';
+            //last
+            var last = tbar.down('[name=last]').el.dom;
+            last.classList.remove('x-btn-import-last');
+            last.style.background = '#34baf6';
+            last.childNodes[0].childNodes[0].childNodes[1].style.color = '#fff';
+            //按钮逻辑
+            b.hide();
+            b.ownerCt.down('[name=prev]').show();
+            b.ownerCt.down('[name=over]').show();
+            //字段逻辑
+            p.down('[name=download]').hide();
+            p.down('[name=upload]').show();
+            p.down('[name=detail]').hide();
+            p.down('[name=message]').show();
+        }
+    },{
+        hidden:true,
+        name:'over',
+        text:'完成',
+        handler:function(b){
+            b.ownerCt.ownerCt.close()
+        }
+    },{
+        name:'close',
+        text:'关闭',
+        handler:function(b){
+            b.ownerCt.ownerCt.close()
+        }
     }],
 
     initComponent: function() {
         var me = this;
+        Ext.apply(me, {
+            items:[{
+                cls:'x-panel-import',
+                padding:'10px 100px 10px 100px',
+                xtype:'panel',
+                layout:'vbox',
+                tbar:['->',{
+                    name:'first',
+                    cls:'x-btn-import-first',
+                    style:'background: #34baf6;border-color: #35baf6;    opacity: 1;',
+                    focusable:false,
+                    disabled:true,
+                    width:300,
+                    text:'下载模板并填写',
+                },{
+                    name:'middle',
+                    disabled:true,
+                    focusable:false,
+                    style:'width: 20px;margin: 0px;margin-left: -16px;border-width: 1px 0px;min-width: 0px;border-style: solid;border-color: rgb(53, 186, 246);    opacity: 1;    background-color: #fff;',
+                    width:20,
+                    cls:'x-btn-import-middle'
+                },{
+                    name:'last',
+                    disabled:true,
+                    cls:'x-btn-import-last',
+                    style:'border-left-width: 0px;background: #fff;border-color: #35baf6;opacity:1;background-color: #fff;',
+                    focusable:false,
+                    margin:'0 0 0 -1',
+                    width:300,
+                    text:'上传导入文件',
+                },'->'],
+                items:[{
+                    margin:'15px 0 0 0',
+                    width: 240,
+                    labelWidth:160,
+                    buttonOnly:true,
+                    fieldLabel:'客户导入模板下载',
+                    name:'download',
+                    xtype: 'filefield',
+                    buttonText: '下载模板',
+                    buttonConfig:{
+                        xtype:'button',
+                        handler:function(b){
+                        }
+                    }
+                },{
+                    margin:'10px 0 0 45px',
+                    xtype: 'fieldset',
+                    title: '导入说明',
+                    name:'detail',
+                    collapsible: false,
+                    items: [{
+                        xtype : 'fieldcontainer',
+                        html: me.showDetail?me.showDetail:'请配置showDetail属性',
+                    }]
+                },{
+                    hidden:true,
+                    margin:'15px 0 0 0',
+                    width: 180,
+                    labelWidth:100,
+                    buttonOnly:true,
+                    fieldLabel:'上传文件',
+                    name:'upload',
+                    xtype: 'filefield',
+                    buttonText: '选择文件',
+                    buttonConfig:{
+                        xtype:'button',
+                    }
+                },{
+                    hidden:true,
+                    margin:'10px 0 0 45px',
+                    xtype: 'fieldset',
+                    title: '导入详情',
+                    name:'message',
+                    collapsible: false,
+                    items: [{
+                        xtype : 'fieldcontainer',
+                        html: '暂无',
+                    }]
+                }]
+            }]
+        });
         me.callParent(arguments);
     }
 

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -210,23 +210,23 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                         hidden: '{!auditEnable}'
                     }
                 },  {
-                    text: '导入',
+                    text: '导出',
                     handler: me.onImport,
-                    menu: {
-                        cls:'x-query-menu',
-                        width: 80,
-                        items: [{
-                            text:'导出',
-                            handler:function(){
-                                me.onExport(this)
-                            }
-                        }],
-                        listeners: {
-                            'mouseleave':function(enu){
-                                this.hide();
-                            } 
-                        }
-                    },
+                    // menu: {
+                    //     cls:'x-query-menu',
+                    //     width: 80,
+                    //     items: [{
+                    //         text:'导出',
+                    //         handler:function(){
+                    //             me.onExport(this)
+                    //         }
+                    //     }],
+                    //     // listeners: {
+                    //     //     'mouseleave':function(enu){
+                    //     //         this.hide();
+                    //     //     } 
+                    //     // }
+                    // },
                     bind: {
                         hidden: '{!importEnable}'
                     }

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -16,7 +16,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
         reference: 'queryform',
         xtype: 'core-query-queryformpanel',
         width: '100%',
-        height:56,
+        height:54,
         margin: '0 0 12 0',
     }, {
         // margin: '12 0 0 0',

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

@@ -15,6 +15,17 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
           if(w.record){
               w.down('form').loadRecord(w.record);
           }
+          //自动适应窗口
+          var items = w.down('form').items.items;
+          var count = 0;
+          Ext.Array.each(items,function(item) {
+            if(item.xtype!='hidden'){
+                count++;
+            }
+          });
+          if(count!=0&&count<4){
+            w.setHeight(114+40*count)
+          }
       }
     },
     initComponent:function(){
@@ -325,9 +336,49 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel: '邮箱',
                 name: 'email',
                 allowBlank:false,
+                beforeLabelTextTpl: "",
                 regex:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
                 regexText:'请输入正确的邮箱',
                 maxLength: 30,
+                listeners:{
+                    blur:function(f,a,b,c){
+                        var form = f.ownerCt;
+                        if(f.value&&f.value!=''&&f.isValid()&&f._lastCheckValue!=f.value){
+                            form.setLoading(true);
+                            f._lastCheckValue = f.value
+                            Ext.Ajax.request({
+                                url: '/api/account/account/checkEmail?email='+f.value,
+                                method: 'GET',
+                                headers:{
+                                    'Access-Control-Allow-Origin': '*',
+                                    "Content-Type": 'application/json;charset=UTF-8'
+                                },
+                                success: function (response) {
+                                    form.setLoading(false);
+                                    var localJson = Ext.decode(response.responseText);
+                                    if(localJson.success){
+                                        if(localJson.data.hasRegister){
+                                            saas.util.BaseUtil.showSuccessToast('校验成功:手机号已在优软云注册');
+                                        }else{
+                                            saas.util.BaseUtil.showErrorToast('校验失败:手机号未在优软云注册');
+                                            f.setValue('');
+                                        }
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                    }
+                                },
+                                failure: function (response) {
+                                    if(response.responseText){
+                                        var localJson = Ext.decode(response.responseText);
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('邮箱校验接口连接超时');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
             }]
         },
         warehouse:{

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',

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -11,20 +11,25 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     listUrl: '/api/money/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
-    QueryWidth:0.25,
+    QueryWidth:0.2,
     autoLoad:false,
     //筛选：客户、日期（必填）
     searchItems: [ {
         xtype: 'customerDbfindTrigger',
         name: 'pi_custname',
         fieldLabel: '客户名称',
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         allowBlank:false,
+    }, {
+        xtype: 'monthdatefield',
+        name: 'ym',
+        fieldLabel: '期初日期',
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        columnWidth: 0.4
     }],
 
     reportColumns: [
@@ -129,5 +134,39 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             text: '备注',
             dataIndex: 'pd_remark',
             width: 250
-        }]
+        }, {
+            text: '期初应付',
+            dataIndex: 'beginamount',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }, {
+            text: '本期发生',
+            dataIndex: 'nowamount',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }, {
+            text: '本期付款',
+            dataIndex: 'nowpay',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }, {
+            text: '本期结余',
+            dataIndex: 'nowbalance',
+            hidden: true,
+            width: 0,
+            summaryType: 'cus',
+        }],
+        applyParams: function(p) {
+            var me = this,
+            viewModel = me.getViewModel(),
+            formData = viewModel.get('form'),
+            ym = formData.ym;
+    
+            return Ext.Object.merge(p, {
+                ym: ym
+            });
+        }
 });

frontend/saas-web/app/view/sys/account/DataList.js

@@ -19,10 +19,10 @@ Ext.define('saas.view.sys.account.DataList', {
         xtype: 'textfield',
         emptyText : '账户名称'
     },{
-        width: 110,
+        width: 140,
         name: 'mobile',
         xtype: 'textfield',
-        emptyText : '电话'
+        emptyText : '联系电话'
     },{
         xtype:'button',
         text:'查询',

frontend/saas-web/app/view/sys/baseconfig/FormPanel.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
     //字段属性
     _idField: 'id',
     _readUrl:'/api/commons/configs/list',
-    _saveUrl:'/api/commons/configs/save',
+    _saveUrl:'/api/commons/configs/update',
 
     //基础属性
     frame:true,

frontend/saas-web/package.json

@@ -4,7 +4,10 @@
   "description": "saas在线进销存系统",
   "main": "app.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "sencha app watch",
+    "build-test": "sencha app build --testing",
+    "build": "sencha app build"
   },
   "keywords": [
     "saas"