合并代码

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

@@ -120,6 +120,7 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
         this.bk_statuscode = bk_statuscode;
     }
 
+
     public Integer getBk_ym() {
         return bk_ym;
     }

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

@@ -24,4 +24,5 @@ public class Vendorkind extends CommonBaseEntity implements Serializable {
     public void setVk_name(String vk_name) {
         this.vk_name = vk_name == null ? null : vk_name.trim();
     }
+
 }

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

@@ -27,5 +27,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.VendorAdd;
 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);
+    VendorAdd 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/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/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/MoneyReportServiceImpl.java

@@ -1,17 +1,24 @@
 package com.usoftchina.saas.money.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
 import com.github.pagehelper.PageHelper;
 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.VendorAcountView;
+import com.usoftchina.saas.money.po.VendorAdd;
 import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import springfox.documentation.spring.web.json.Json;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,11 +101,41 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
 
         String res = null;
+        VendorAdd vendorAdd = new VendorAdd();
+        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 (!StringUtils.isEmpty(calculateFieldsSql)) {
+//                res = vendorAcountViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
+//            }
+
+            VendorAcountView vendorAcountView = (VendorAcountView) list.get(0);
+            Integer vid = new Integer(0);
+            if (list.size() >0){
+                vid = vendorAcountViewMapper.getId(vendorAcountView.getPi_vendcode(), Long.valueOf(vendorAcountView.getCompanyId()));
             }
+            Integer ym = Integer.valueOf(req.getYm());
+            vendorAdd = vendorAcountViewMapper.selectVendAdd(vid, ym, Long.valueOf(vendorAcountView.getCompanyId()));
+            vendorAdd.setNowbalance((vendorAdd.getBeginamount() == null ? new Double(0) : vendorAdd.getBeginamount())
+                    + (vendorAdd.getNowamount() == null ? new Double(0) : vendorAdd.getNowamount())
+                    - (vendorAdd.getNowpay() == null ? new Double(0) : vendorAdd.getNowpay()));
+            //封装成list
+            Map<String, Double> map1 = new HashMap<>();
+            map1.put("beginamount", vendorAdd.getBeginamount());
+            list1.add(map1);
+
+            Map<String, Double> map2 = new HashMap<>();
+            map2.put("nowamount" ,vendorAdd.getNowamount());
+            list1.add(map2);
+
+            Map<String, Double> map3 = new HashMap<>();
+            map3.put("nowpay" ,vendorAdd.getNowpay());
+            list1.add(map3);
+
+            Map<String, Double> map4 = new HashMap<>();
+            map4.put("nowbalance",vendorAdd.getNowbalance());
+            list1.add(map4);
+
         } else if("payDetail".equals(type)){
             list = paydetailViewMapper.selectByCondition(con, companyId);
             if (!StringUtils.isEmpty(calculateFieldsSql)) {
@@ -132,7 +169,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/FundtransferMapper.xml

@@ -59,8 +59,7 @@
       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}, 

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},
@@ -655,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,
-        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>
 

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

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.VendorAdd" >
+    <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 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>