瀏覽代碼

1.资金各单加上中间表逻辑

heqinwei 7 年之前
父節點
當前提交
915c8b7dc3
共有 17 個文件被更改,包括 638 次插入57 次删除
  1. 22 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/MoneyReportColltroller.java
  2. 10 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/AcountbalanceViewMapper.java
  3. 10 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/PaydetailViewMapper.java
  4. 11 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/RecdetailViewMapper.java
  5. 134 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/AcountbalanceView.java
  6. 155 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/PaydetailView.java
  7. 154 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/RecdetailView.java
  8. 3 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/MoneyReportService.java
  9. 31 3
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/MoneyReportServiceImpl.java
  10. 1 6
      applications/money/money-server/src/main/resources/mapper/FundtransferMapper.xml
  11. 1 12
      applications/money/money-server/src/main/resources/mapper/OthreceiptsMapper.xml
  12. 1 11
      applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml
  13. 1 12
      applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml
  14. 2 13
      applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml
  15. 33 0
      applications/money/money-server/src/main/resources/mapper/forms/AcountbalanceViewMapper.xml
  16. 35 0
      applications/money/money-server/src/main/resources/mapper/forms/PaydetailViewMapper.xml
  17. 34 0
      applications/money/money-server/src/main/resources/mapper/forms/RecdetailViewMapper.xml

+ 22 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/MoneyReportColltroller.java

@@ -21,9 +21,31 @@ public class MoneyReportColltroller {
     @Autowired
     private MoneyReportService moneyReportService;
 
+    //供应商对账
     @GetMapping("/vendorCheck")
     public Result vendorCheck(PageRequest page, ListReqDTO req) {
         PageInfo listData = moneyReportService.vendorCheck(page, req);
         return Result.success(listData);
     }
+
+    //应付账款明细
+    @GetMapping("/payDetail")
+    public Result payDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.payDetail(page, req);
+        return Result.success(listData);
+    }
+
+    //应收款明细表
+    @GetMapping("/recDetail")
+    public Result recDetail(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.recDetail(page, req);
+        return Result.success(listData);
+    }
+
+    //资金账号余额表
+    @GetMapping("/accountBalance")
+    public Result acountBalance(PageRequest page, ListReqDTO req) {
+        PageInfo listData = moneyReportService.acountBalance(page, req);
+        return Result.success(listData);
+    }
 }

+ 10 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/AcountbalanceViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper.forms;
+
+import com.usoftchina.saas.money.po.forms.AcountbalanceView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AcountbalanceViewMapper {
+    List<AcountbalanceView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

+ 10 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/PaydetailViewMapper.java

@@ -0,0 +1,10 @@
+package com.usoftchina.saas.money.mapper.forms;
+
+import com.usoftchina.saas.money.po.forms.PaydetailView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PaydetailViewMapper {
+    List<PaydetailView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

+ 11 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/forms/RecdetailViewMapper.java

@@ -0,0 +1,11 @@
+package com.usoftchina.saas.money.mapper.forms;
+
+import com.usoftchina.saas.money.po.forms.RecdetailView;
+import com.usoftchina.saas.money.po.forms.VendorAcountView;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface RecdetailViewMapper {
+    List<RecdetailView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+}

+ 134 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/AcountbalanceView.java

@@ -0,0 +1,134 @@
+package com.usoftchina.saas.money.po.forms;
+
+import java.util.Date;
+
+public class AcountbalanceView {
+    private String bankcode;
+
+    private String bankname;
+
+    private Integer bankid;
+
+    private Date date;
+
+    private String kind;
+
+    private Double outamount;
+
+    private Double inamount;
+
+    private Double thisamount;
+
+    private String bcode;
+
+    private String bname;
+
+    private String bmanname;
+
+    private String remark;
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getBankcode() {
+        return bankcode;
+    }
+
+    public void setBankcode(String bankcode) {
+        this.bankcode = bankcode == null ? null : bankcode.trim();
+    }
+
+    public String getBankname() {
+        return bankname;
+    }
+
+    public void setBankname(String bankname) {
+        this.bankname = bankname == null ? null : bankname.trim();
+    }
+
+    public Integer getBankid() {
+        return bankid;
+    }
+
+    public void setBankid(Integer bankid) {
+        this.bankid = bankid;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind == null ? null : kind.trim();
+    }
+
+    public Double getOutamount() {
+        return outamount;
+    }
+
+    public void setOutamount(Double outamount) {
+        this.outamount = outamount;
+    }
+
+    public Double getInamount() {
+        return inamount;
+    }
+
+    public void setInamount(Double inamount) {
+        this.inamount = inamount;
+    }
+
+    public Double getThisamount() {
+        return thisamount;
+    }
+
+    public void setThisamount(Double thisamount) {
+        this.thisamount = thisamount;
+    }
+
+    public String getBcode() {
+        return bcode;
+    }
+
+    public void setBcode(String bcode) {
+        this.bcode = bcode == null ? null : bcode.trim();
+    }
+
+    public String getBname() {
+        return bname;
+    }
+
+    public void setBname(String bname) {
+        this.bname = bname == null ? null : bname.trim();
+    }
+
+    public String getBmanname() {
+        return bmanname;
+    }
+
+    public void setBmanname(String bmanname) {
+        this.bmanname = bmanname == null ? null : bmanname.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

+ 155 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/PaydetailView.java

@@ -0,0 +1,155 @@
+package com.usoftchina.saas.money.po.forms;
+
+import java.util.Date;
+
+public class PaydetailView {
+    private String pi_inoutno;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private String pi_class;
+
+    private String PU_BUYERCODE;
+
+    private String PU_BUYERNAME;
+
+    private Date pb_date;
+
+    private Double ve_beginapamount;
+
+    private Double pb_pdamount;
+
+    private Double pb_pbdamount;
+
+    private Double mustpay;
+
+    private Long mustdate;
+
+    private Double pi_total;
+
+    private String pi_remark;
+
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno == null ? null : pi_inoutno.trim();
+    }
+
+    public String getPi_vendcode() {
+        return pi_vendcode;
+    }
+
+    public void setPi_vendcode(String pi_vendcode) {
+        this.pi_vendcode = pi_vendcode == null ? null : pi_vendcode.trim();
+    }
+
+    public String getPi_vendname() {
+        return pi_vendname;
+    }
+
+    public void setPi_vendname(String pi_vendname) {
+        this.pi_vendname = pi_vendname == null ? null : pi_vendname.trim();
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class == null ? null : pi_class.trim();
+    }
+
+    public String getPU_BUYERCODE() {
+        return PU_BUYERCODE;
+    }
+
+    public void setPU_BUYERCODE(String PU_BUYERCODE) {
+        this.PU_BUYERCODE = PU_BUYERCODE == null ? null : PU_BUYERCODE.trim();
+    }
+
+    public String getPU_BUYERNAME() {
+        return PU_BUYERNAME;
+    }
+
+    public void setPU_BUYERNAME(String PU_BUYERNAME) {
+        this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
+    }
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
+
+    public Double getVe_beginapamount() {
+        return ve_beginapamount;
+    }
+
+    public void setVe_beginapamount(Double ve_beginapamount) {
+        this.ve_beginapamount = ve_beginapamount;
+    }
+
+    public Double getPb_pdamount() {
+        return pb_pdamount;
+    }
+
+    public void setPb_pdamount(Double pb_pdamount) {
+        this.pb_pdamount = pb_pdamount;
+    }
+
+    public Double getPb_pbdamount() {
+        return pb_pbdamount;
+    }
+
+    public void setPb_pbdamount(Double pb_pbdamount) {
+        this.pb_pbdamount = pb_pbdamount;
+    }
+
+    public Double getMustpay() {
+        return mustpay;
+    }
+
+    public void setMustpay(Double mustpay) {
+        this.mustpay = mustpay;
+    }
+
+    public Long getMustdate() {
+        return mustdate;
+    }
+
+    public void setMustdate(Long mustdate) {
+        this.mustdate = mustdate;
+    }
+
+    public Double getPi_total() {
+        return pi_total;
+    }
+
+    public void setPi_total(Double pi_total) {
+        this.pi_total = pi_total;
+    }
+
+    public String getPi_remark() {
+        return pi_remark;
+    }
+
+    public void setPi_remark(String pi_remark) {
+        this.pi_remark = pi_remark == null ? null : pi_remark.trim();
+    }
+}

+ 154 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/forms/RecdetailView.java

@@ -0,0 +1,154 @@
+package com.usoftchina.saas.money.po.forms;
+
+import java.util.Date;
+
+public class RecdetailView {
+    private String pi_inoutno;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private String pi_class;
+
+    private String PU_BUYERCODE;
+
+    private String PU_BUYERNAME;
+
+    private Date pb_date;
+
+    private Double cu_beginaramount;
+
+    private Double pb_pdamount;
+
+    private Double pb_pbdamount;
+
+    private Double mustpay;
+
+    private Double mustdate;
+
+    private Double pi_total;
+
+    private String pi_remark;
+    private Integer companyId;
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPi_inoutno() {
+        return pi_inoutno;
+    }
+
+    public void setPi_inoutno(String pi_inoutno) {
+        this.pi_inoutno = pi_inoutno == null ? null : pi_inoutno.trim();
+    }
+
+    public String getPi_custcode() {
+        return pi_custcode;
+    }
+
+    public void setPi_custcode(String pi_custcode) {
+        this.pi_custcode = pi_custcode == null ? null : pi_custcode.trim();
+    }
+
+    public String getPi_custname() {
+        return pi_custname;
+    }
+
+    public void setPi_custname(String pi_custname) {
+        this.pi_custname = pi_custname == null ? null : pi_custname.trim();
+    }
+
+    public String getPi_class() {
+        return pi_class;
+    }
+
+    public void setPi_class(String pi_class) {
+        this.pi_class = pi_class == null ? null : pi_class.trim();
+    }
+
+    public String getPU_BUYERCODE() {
+        return PU_BUYERCODE;
+    }
+
+    public void setPU_BUYERCODE(String PU_BUYERCODE) {
+        this.PU_BUYERCODE = PU_BUYERCODE == null ? null : PU_BUYERCODE.trim();
+    }
+
+    public String getPU_BUYERNAME() {
+        return PU_BUYERNAME;
+    }
+
+    public void setPU_BUYERNAME(String PU_BUYERNAME) {
+        this.PU_BUYERNAME = PU_BUYERNAME == null ? null : PU_BUYERNAME.trim();
+    }
+
+    public Date getPb_date() {
+        return pb_date;
+    }
+
+    public void setPb_date(Date pb_date) {
+        this.pb_date = pb_date;
+    }
+
+    public Double getCu_beginaramount() {
+        return cu_beginaramount;
+    }
+
+    public void setCu_beginaramount(Double cu_beginaramount) {
+        this.cu_beginaramount = cu_beginaramount;
+    }
+
+    public Double getPb_pdamount() {
+        return pb_pdamount;
+    }
+
+    public void setPb_pdamount(Double pb_pdamount) {
+        this.pb_pdamount = pb_pdamount;
+    }
+
+    public Double getPb_pbdamount() {
+        return pb_pbdamount;
+    }
+
+    public void setPb_pbdamount(Double pb_pbdamount) {
+        this.pb_pbdamount = pb_pbdamount;
+    }
+
+    public Double getMustpay() {
+        return mustpay;
+    }
+
+    public void setMustpay(Double mustpay) {
+        this.mustpay = mustpay;
+    }
+
+    public Double getMustdate() {
+        return mustdate;
+    }
+
+    public void setMustdate(Double mustdate) {
+        this.mustdate = mustdate;
+    }
+
+    public Double getPi_total() {
+        return pi_total;
+    }
+
+    public void setPi_total(Double pi_total) {
+        this.pi_total = pi_total;
+    }
+
+    public String getPi_remark() {
+        return pi_remark;
+    }
+
+    public void setPi_remark(String pi_remark) {
+        this.pi_remark = pi_remark == null ? null : pi_remark.trim();
+    }
+}

+ 3 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/MoneyReportService.java

@@ -10,4 +10,7 @@ import com.usoftchina.saas.page.PageRequest;
  **/
 public interface MoneyReportService {
     PageInfo vendorCheck(PageRequest page, ListReqDTO req);
+    PageInfo payDetail(PageRequest page, ListReqDTO req);
+    PageInfo recDetail(PageRequest page, ListReqDTO req);
+    PageInfo acountBalance(PageRequest page, ListReqDTO req);
 }

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

@@ -4,7 +4,11 @@ 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.forms.AcountbalanceViewMapper;
+import com.usoftchina.saas.money.mapper.forms.PaydetailViewMapper;
+import com.usoftchina.saas.money.mapper.forms.RecdetailViewMapper;
 import com.usoftchina.saas.money.mapper.forms.VendorAcountViewMapper;
+import com.usoftchina.saas.money.po.forms.AcountbalanceView;
 import com.usoftchina.saas.money.service.MoneyReportService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,12 +24,33 @@ import java.util.List;
 public class MoneyReportServiceImpl implements MoneyReportService {
     @Autowired
     private VendorAcountViewMapper vendorAcountViewMapper;
+    @Autowired
+    private PaydetailViewMapper paydetailViewMapper;
+    @Autowired
+    private RecdetailViewMapper recdetailViewMapper;
+    @Autowired
+    private AcountbalanceViewMapper acountbalanceViewMapper;
 
     @Override
     public PageInfo vendorCheck(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "Supplier");
     }
 
+    @Override
+    public PageInfo payDetail(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "payDetail");
+    }
+
+    @Override
+    public PageInfo recDetail(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "recDetail");
+    }
+
+    @Override
+    public PageInfo acountBalance(PageRequest page, ListReqDTO req) {
+        return getListDATA(page, req, "acountBalance");
+    }
+
     private PageInfo getListDATA(PageRequest page, ListReqDTO req, String type) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
@@ -52,10 +77,13 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         }
         if ("Supplier".equals(type)) {
             list = vendorAcountViewMapper.selectByCondition(con, companyId);
+        } else if("payDetail".equals(type)){
+            list = paydetailViewMapper.selectByCondition(con, companyId);
+        }else if("recDetail".equals(type)){
+            list = recdetailViewMapper.selectByCondition(con, companyId);
+        }else if ("acountBalance".equals(type)){
+            list = acountbalanceViewMapper.selectByCondition(con, companyId);
         }
-//        } else if ("SaleRec".equals(type)){
-//            list = salerecViewMapper.selectByCondition(con, companyId);
-//        }
         return list;
     }
 }

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

@@ -70,9 +70,7 @@
       <if test="ft_recorder != null" >
         ft_recorder,
       </if>
-      <if test="ft_recorddate != null" >
         ft_recorddate,
-      </if>
       <if test="ft_status != null" >
         ft_status,
       </if>
@@ -117,9 +115,7 @@
       <if test="ft_recorder != null" >
         #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ft_recorddate != null" >
-        #{ft_recorddate,jdbcType=TIMESTAMP},
-      </if>
+        now(),
       <if test="ft_status != null" >
         #{ft_status,jdbcType=VARCHAR},
       </if>
@@ -188,7 +184,6 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="ft_text1 != null" >
         ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>

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

@@ -106,9 +106,7 @@
       <if test="or_recorder != null" >
         or_recorder,
       </if>
-      <if test="or_recorddate != null" >
         or_recorddate,
-      </if>
       <if test="or_status != null" >
         or_status,
       </if>
@@ -124,9 +122,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
-      </if>
       <if test="or_text1 != null" >
         or_text1,
       </if>
@@ -177,9 +172,7 @@
       <if test="or_recorder != null" >
         #{or_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="or_recorddate != null" >
-        #{or_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="or_status != null" >
         #{or_status,jdbcType=VARCHAR},
       </if>
@@ -195,9 +188,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="or_text1 != null" >
         #{or_text1,jdbcType=VARCHAR},
       </if>
@@ -272,7 +262,6 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="or_text1 != null" >
         or_text1 = #{or_text1,jdbcType=VARCHAR},
       </if>

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

@@ -100,9 +100,7 @@
       <if test="os_recorder != null" >
         os_recorder,
       </if>
-      <if test="os_recorddate != null" >
         os_recorddate,
-      </if>
       <if test="os_status != null" >
         os_status,
       </if>
@@ -118,9 +116,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-      <if test="updatedate != null" >
-        updatedate,
-      </if>
       <if test="os_text1 != null" >
         os_text1,
       </if>
@@ -165,9 +160,7 @@
       <if test="os_amount != null" >
         #{os_amount,jdbcType=DOUBLE},
       </if>
-      <if test="os_recorderid != null" >
-        #{os_recorderid,jdbcType=INTEGER},
-      </if>
+      now(),
       <if test="os_recorder != null" >
         #{os_recorder,jdbcType=VARCHAR},
       </if>
@@ -189,9 +182,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="os_text1 != null" >
         #{os_text1,jdbcType=VARCHAR},
       </if>

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

@@ -183,9 +183,7 @@
       <if test="pb_recorder != null">
         pb_recorder,
       </if>
-      <if test="pb_recorddate != null">
         pb_recorddate,
-      </if>
       <if test="pb_status != null">
         pb_status,
       </if>
@@ -201,9 +199,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if test="updatedate != null">
-        updatedate,
-      </if>
       <if test="pb_text1 != null">
         pb_text1,
       </if>
@@ -263,9 +258,7 @@
       <if test="pb_recorder != null">
         #{pb_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="pb_recorddate != null">
-        #{pb_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="pb_status != null">
         #{pb_status,jdbcType=INTEGER},
       </if>
@@ -281,9 +274,6 @@
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null">
-        #{updatedate,jdbcType=TIMESTAMP},
-      </if>
       <if test="pb_text1 != null">
         #{pb_text1,jdbcType=VARCHAR},
       </if>
@@ -374,7 +364,6 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -23,7 +23,7 @@
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
     <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rb_text1" jdbcType="VARCHAR" property="rb_text1" />
     <result column="rb_text2" jdbcType="VARCHAR" property="rb_text2" />
     <result column="rb_text3" jdbcType="VARCHAR" property="rb_text3" />
@@ -224,9 +224,7 @@
       <if test="rb_recorder != null">
         rb_recorder,
       </if>
-      <if test="rb_recorddate != null">
         rb_recorddate,
-      </if>
       <if test="rb_status != null">
         rb_status,
       </if>
@@ -242,9 +240,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if test="updateTime != null">
-        updateTime,
-      </if>
       <if test="rb_text1 != null">
         rb_text1,
       </if>
@@ -304,9 +299,7 @@
       <if test="rb_recorder != null">
         #{rb_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="rb_recorddate != null">
-        #{rb_recorddate,jdbcType=TIMESTAMP},
-      </if>
+      now(),
       <if test="rb_status != null">
         #{rb_status,jdbcType=INTEGER},
       </if>
@@ -322,9 +315,6 @@
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="rb_text1 != null">
         #{rb_text1,jdbcType=VARCHAR},
       </if>
@@ -536,7 +526,6 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      updatedate = now(),
       <if test="rb_text1 != null">
         rb_text1 = #{rb_text1,jdbcType=VARCHAR},
       </if>

+ 33 - 0
applications/money/money-server/src/main/resources/mapper/forms/AcountbalanceViewMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.AcountbalanceViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.AcountbalanceView" >
+    <result column="bankcode" property="bankcode" jdbcType="VARCHAR" />
+    <result column="bankname" property="bankname" jdbcType="VARCHAR" />
+    <result column="bankid" property="bankid" jdbcType="INTEGER" />
+    <result column="date" property="date" jdbcType="TIMESTAMP" />
+    <result column="kind" property="kind" jdbcType="VARCHAR" />
+    <result column="outamount" property="outamount" jdbcType="DOUBLE" />
+    <result column="inamount" property="inamount" jdbcType="DOUBLE" />
+    <result column="thisamount" property="thisamount" jdbcType="DOUBLE" />
+    <result column="bcode" property="bcode" jdbcType="VARCHAR" />
+    <result column="bname" property="bname" jdbcType="VARCHAR" />
+    <result column="bmanname" property="bmanname" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from acountbalance_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by date desc
+  </select>
+
+</mapper>

+ 35 - 0
applications/money/money-server/src/main/resources/mapper/forms/PaydetailViewMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.PaydetailViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.PaydetailView" >
+    <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+    <result column="pi_vendcode" property="pi_vendcode" jdbcType="VARCHAR" />
+    <result column="pi_vendname" property="pi_vendname" jdbcType="VARCHAR" />
+    <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+    <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="DOUBLE" />
+    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
+    <result column="mustdate" property="mustdate" jdbcType="DECIMAL" />
+    <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from paydetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_date desc
+  </select>
+
+</mapper>

+ 34 - 0
applications/money/money-server/src/main/resources/mapper/forms/RecdetailViewMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.money.mapper.RecdetailViewMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.RecdetailView" >
+    <result column="pi_inoutno" property="pi_inoutno" jdbcType="VARCHAR" />
+    <result column="pi_custcode" property="pi_custcode" jdbcType="VARCHAR" />
+    <result column="pi_custname" property="pi_custname" jdbcType="VARCHAR" />
+    <result column="pi_class" property="pi_class" jdbcType="VARCHAR" />
+    <result column="PU_BUYERCODE" property="PU_BUYERCODE" jdbcType="VARCHAR" />
+    <result column="PU_BUYERNAME" property="PU_BUYERNAME" jdbcType="VARCHAR" />
+    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="cu_beginaramount" property="cu_beginaramount" jdbcType="DOUBLE" />
+    <result column="pb_pdamount" property="pb_pdamount" jdbcType="DOUBLE" />
+    <result column="pb_pbdamount" property="pb_pbdamount" jdbcType="DOUBLE" />
+    <result column="mustpay" property="mustpay" jdbcType="DOUBLE" />
+    <result column="mustdate" property="mustdate" jdbcType="DOUBLE" />
+    <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
+    <result column="pi_remark" property="pi_remark" jdbcType="VARCHAR" />
+  <result column="companyId" property="companyId" jdbcType="INTEGER" />
+  </resultMap>
+
+  <select id="selectByCondition" resultMap="BaseResultMap">
+    select  *  from recdetail_view
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and  companyId = #{companyId}
+      </if>
+    </where>
+    order by pb_date desc
+  </select>
+</mapper>