Browse Source

1.收款单
2.付款单

heqinwei 7 years ago
parent
commit
b623cf61d3
35 changed files with 2060 additions and 114 deletions
  1. 55 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/PaybalanceController.java
  2. 49 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/RecbalanceContorller.java
  3. 3 9
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java
  4. 17 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetMapper.java
  5. 18 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetailMapper.java
  6. 4 2
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java
  7. 3 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalancedetMapper.java
  8. 17 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalancedetailMapper.java
  9. 19 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java
  10. 4 4
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/BanksubledgerExample.java
  11. 35 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Pay.java
  12. 20 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java
  13. 4 4
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/PaybalanceExample.java
  14. 217 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedet.java
  15. 217 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedetail.java
  16. 35 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Rec.java
  17. 20 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java
  18. 4 4
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/RecbalanceExample.java
  19. 20 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java
  20. 4 4
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/RecbalancedetExample.java
  21. 218 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedetail.java
  22. 24 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/PaybalanceService.java
  23. 18 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/RecbalanceService.java
  24. 79 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java
  25. 73 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java
  26. 16 15
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java
  27. 4 3
      applications/money/money-server/src/main/resources/application.yml
  28. 14 22
      applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml
  29. 259 0
      applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml
  30. 259 0
      applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml
  31. 21 14
      applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml
  32. 14 14
      applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml
  33. 259 0
      applications/money/money-server/src/main/resources/mapper/RecbalancedetailMapper.xml
  34. 35 1
      applications/money/money-server/src/main/resources/mapper/VerificationListMapper.xml
  35. 2 17
      base-servers/account/account-server/src/main/resources/application.yml

+ 55 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/PaybalanceController.java

@@ -0,0 +1,55 @@
+package com.usoftchina.saas.money.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.money.po.Pay;
+import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.money.service.PaybalanceService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author heqw
+ * @date 2018/10/22 15:03
+ **/
+@RestController
+@RequestMapping("/money")
+public class PaybalanceController {
+    @Autowired
+    private PaybalanceService paybalanceService;
+
+    @RequestMapping("/insertPaybalance")
+    public Result insertPaybalance(@RequestBody Pay body) {
+        int id = paybalanceService.insert(body);
+        return Result.success(id);
+    }
+
+
+    @RequestMapping("/updatePaybalance")
+    public Result updatePaybalance(@RequestBody Pay body){
+        paybalanceService.updatePaybalance(body);
+        return Result.success();
+    }
+
+    @GetMapping("/deletePaybalance")
+    public Result deletePaybalance(int id){
+        paybalanceService.deletePaybalance(id);
+        return Result.success();
+    }
+
+    @GetMapping("/getPaybalance")
+    public Result getPaybalance(int id){
+        return Result.success(paybalanceService.selectByPrimaryKey(id));
+    }
+
+    @GetMapping("/getPaybalanceList")
+    public Result getPaybalanceList(PageRequest page){
+        PageInfo<Paybalance> list = paybalanceService.selectList(page);
+        return Result.success(list);
+    }
+}

+ 49 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/RecbalanceContorller.java

@@ -0,0 +1,49 @@
+package com.usoftchina.saas.money.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.service.RecbalanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 15:40
+ **/
+@RestController
+@RequestMapping("/money")
+public class RecbalanceContorller {
+    @Autowired
+    private RecbalanceService recbalanceService;
+
+    @RequestMapping("/insertRecbalance")
+    public Result insert(@RequestBody Rec body){
+        recbalanceService.insert(body);
+        return Result.success();
+    }
+
+    @GetMapping("/deleteRecbalance")
+    public Result deleteRecbalance(int id){
+        recbalanceService.delectRecbalance(id);
+        return Result.success();
+    }
+
+    @RequestMapping("/updateRecbalance")
+    public Result updateRecbalance(@RequestBody Rec body){
+        recbalanceService.updateRecbalance(body);
+        return Result.success();
+    }
+
+    @GetMapping("/selectRecbalance")
+    public Result selectRecbalance(int id){
+        return Result.success(recbalanceService.selectRecbalance(id));
+    }
+
+    @GetMapping("/selectRecbalanceList")
+    public Result selectRecbalanceList(){
+        return Result.success(recbalanceService.selectRecbalanceList());
+    }
+}

+ 3 - 9
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java

@@ -2,14 +2,12 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Paybalance;
-import com.usoftchina.saas.money.po.PaybalanceExample;
+
 import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
-    int countByExample(PaybalanceExample example);
-
-    int deleteByExample(PaybalanceExample example);
 
     int deleteByPrimaryKey(Integer pb_id);
 
@@ -17,14 +15,10 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
 
     int insertSelective(Paybalance record);
 
-    List<Paybalance> selectByExample(PaybalanceExample example);
+    List<Paybalance> selectList();
 
     Paybalance selectByPrimaryKey(Integer pb_id);
 
-    int updateByExampleSelective(@Param("record") Paybalance record, @Param("example") PaybalanceExample example);
-
-    int updateByExample(@Param("record") Paybalance record, @Param("example") PaybalanceExample example);
-
     int updateByPrimaryKeySelective(Paybalance record);
 
     int updateByPrimaryKey(Paybalance record);

+ 17 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetMapper.java

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.Paybalancedet;
+
+public interface PaybalancedetMapper {
+    int deleteByPrimaryKey(Integer pdId);
+
+    int insert(Paybalancedet record);
+
+    int insertSelective(Paybalancedet record);
+
+    Paybalancedet selectByPrimaryKey(Integer pdId);
+
+    int updateByPrimaryKeySelective(Paybalancedet record);
+
+    int updateByPrimaryKey(Paybalancedet record);
+}

+ 18 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalancedetailMapper.java

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.money.mapper;
+
+
+import com.usoftchina.saas.money.po.Paybalancedetail;
+
+public interface PaybalancedetailMapper {
+    int deleteByPrimaryKey(Integer pbdId);
+
+    int insert(Paybalancedetail record);
+
+    int insertSelective(Paybalancedetail record);
+
+    Paybalancedetail selectByPrimaryKey(Integer pbdId);
+
+    int updateByPrimaryKeySelective(Paybalancedetail record);
+
+    int updateByPrimaryKey(Paybalancedetail record);
+}

+ 4 - 2
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java

@@ -2,8 +2,10 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Recbalance;
-import com.usoftchina.saas.money.po.RecbalanceExample;
+
 import java.util.List;
+
+import com.usoftchina.saas.money.po.RecbalanceExample;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -22,7 +24,7 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
 
     int insertSelective(Recbalance record);
 
-    List<Recbalance> selectByExample(RecbalanceExample example);
+    List<Recbalance> selectList();
 
     Recbalance selectByPrimaryKey(Integer rb_id);
 

+ 3 - 1
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalancedetMapper.java

@@ -2,8 +2,10 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.money.po.Recbalancedet;
-import com.usoftchina.saas.money.po.RecbalancedetExample;
+
 import java.util.List;
+
+import com.usoftchina.saas.money.po.RecbalancedetExample;
 import org.apache.ibatis.annotations.Param;
 
 public interface RecbalancedetMapper extends CommonBaseMapper<Recbalancedet> {

+ 17 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalancedetailMapper.java

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.money.mapper;
+
+import com.usoftchina.saas.money.po.Recbalancedetail;
+
+public interface RecbalancedetailMapper {
+    int deleteByPrimaryKey(Integer rbdId);
+
+    int insert(Recbalancedetail record);
+
+    int insertSelective(Recbalancedetail record);
+
+    Recbalancedetail selectByPrimaryKey(Integer rbdId);
+
+    int updateByPrimaryKeySelective(Recbalancedetail record);
+
+    int updateByPrimaryKey(Recbalancedetail record);
+}

+ 19 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -162,4 +162,23 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
         this.bl_remark = bl_remark == null ? null : bl_remark.trim();
     }
 
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
 }

+ 4 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/BanksubledgerExample.java

@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:03
- */
+ * @author heqw
+ * @date 2018/10/23 14:41
+ **/
 public class BanksubledgerExample {
     protected String orderByClause;
 
@@ -1372,4 +1372,4 @@ public class BanksubledgerExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

+ 35 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Pay.java

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.money.po;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 10:19
+ **/
+public class Pay {
+    private Paybalance paybalance;
+    private Paybalancedet paybalancedet;
+    private Paybalancedetail paybalancedetail;
+
+    public Paybalance getPaybalance() {
+        return paybalance;
+    }
+
+    public void setPaybalance(Paybalance paybalance) {
+        this.paybalance = paybalance;
+    }
+
+    public Paybalancedet getPaybalancedet() {
+        return paybalancedet;
+    }
+
+    public void setPaybalancedet(Paybalancedet paybalancedet) {
+        this.paybalancedet = paybalancedet;
+    }
+
+    public Paybalancedetail getPaybalancedetail() {
+        return paybalancedetail;
+    }
+
+    public void setPaybalancedetail(Paybalancedetail paybalancedetail) {
+        this.paybalancedetail = paybalancedetail;
+    }
+}

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

@@ -252,4 +252,24 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
     public void setPb_text5(String pb_text5) {
         this.pb_text5 = pb_text5 == null ? null : pb_text5.trim();
     }
+
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
 }

+ 4 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/PaybalanceExample.java

@@ -6,9 +6,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:03
- */
+ * @author heqw
+ * @date 2018/10/23 14:58
+ **/
 public class PaybalanceExample {
     protected String orderByClause;
 
@@ -1943,4 +1943,4 @@ public class PaybalanceExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

+ 217 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedet.java

@@ -0,0 +1,217 @@
+package com.usoftchina.saas.money.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Paybalancedet extends CommonBaseEntity implements Serializable {
+    private Integer pdId;
+
+    private Integer pdRbid;
+
+    private Integer pdDetno;
+
+    private Integer pdYm;
+
+    private Integer pdBankid;
+
+    private String pdBankcode;
+
+    private String pdBankname;
+
+    private Double pdAmount;
+
+    private String pdPaymethod;
+
+    private String pdPaycode;
+
+    private String pdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String pdText1;
+
+    private String pdText2;
+
+    private String pdText3;
+
+    private String pdText4;
+
+    private String pdText5;
+
+    public Integer getPdId() {
+        return pdId;
+    }
+
+    public void setPdId(Integer pdId) {
+        this.pdId = pdId;
+    }
+
+    public Integer getPdRbid() {
+        return pdRbid;
+    }
+
+    public void setPdRbid(Integer pdRbid) {
+        this.pdRbid = pdRbid;
+    }
+
+    public Integer getPdDetno() {
+        return pdDetno;
+    }
+
+    public void setPdDetno(Integer pdDetno) {
+        this.pdDetno = pdDetno;
+    }
+
+    public Integer getPdYm() {
+        return pdYm;
+    }
+
+    public void setPdYm(Integer pdYm) {
+        this.pdYm = pdYm;
+    }
+
+    public Integer getPdBankid() {
+        return pdBankid;
+    }
+
+    public void setPdBankid(Integer pdBankid) {
+        this.pdBankid = pdBankid;
+    }
+
+    public String getPdBankcode() {
+        return pdBankcode;
+    }
+
+    public void setPdBankcode(String pdBankcode) {
+        this.pdBankcode = pdBankcode == null ? null : pdBankcode.trim();
+    }
+
+    public String getPdBankname() {
+        return pdBankname;
+    }
+
+    public void setPdBankname(String pdBankname) {
+        this.pdBankname = pdBankname == null ? null : pdBankname.trim();
+    }
+
+    public Double getPdAmount() {
+        return pdAmount;
+    }
+
+    public void setPdAmount(Double pdAmount) {
+        this.pdAmount = pdAmount;
+    }
+
+    public String getPdPaymethod() {
+        return pdPaymethod;
+    }
+
+    public void setPdPaymethod(String pdPaymethod) {
+        this.pdPaymethod = pdPaymethod == null ? null : pdPaymethod.trim();
+    }
+
+    public String getPdPaycode() {
+        return pdPaycode;
+    }
+
+    public void setPdPaycode(String pdPaycode) {
+        this.pdPaycode = pdPaycode == null ? null : pdPaycode.trim();
+    }
+
+    public String getPdRemark() {
+        return pdRemark;
+    }
+
+    public void setPdRemark(String pdRemark) {
+        this.pdRemark = pdRemark == null ? null : pdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getPdText1() {
+        return pdText1;
+    }
+
+    public void setPdText1(String pdText1) {
+        this.pdText1 = pdText1 == null ? null : pdText1.trim();
+    }
+
+    public String getPdText2() {
+        return pdText2;
+    }
+
+    public void setPdText2(String pdText2) {
+        this.pdText2 = pdText2 == null ? null : pdText2.trim();
+    }
+
+    public String getPdText3() {
+        return pdText3;
+    }
+
+    public void setPdText3(String pdText3) {
+        this.pdText3 = pdText3 == null ? null : pdText3.trim();
+    }
+
+    public String getPdText4() {
+        return pdText4;
+    }
+
+    public void setPdText4(String pdText4) {
+        this.pdText4 = pdText4 == null ? null : pdText4.trim();
+    }
+
+    public String getPdText5() {
+        return pdText5;
+    }
+
+    public void setPdText5(String pdText5) {
+        this.pdText5 = pdText5 == null ? null : pdText5.trim();
+    }
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
+}

+ 217 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedetail.java

@@ -0,0 +1,217 @@
+package com.usoftchina.saas.money.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Paybalancedetail extends CommonBaseEntity implements Serializable {
+    private Integer pbdId;
+
+    private Integer pbdPbid;
+
+    private Integer pbdDetno;
+
+    private Integer pbdYm;
+
+    private Integer pbdSild;
+
+    private String pbdSlcode;
+
+    private String pbdSlkind;
+
+    private Date pbdSldate;
+
+    private Double pbdAmount;
+
+    private Double pbdNowbalance;
+
+    private String pbdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String pbdText1;
+
+    private String pbdText2;
+
+    private String pbdText3;
+
+    private String pbdText4;
+
+    private String pbdText5;
+
+    public Integer getPbdId() {
+        return pbdId;
+    }
+
+    public void setPbdId(Integer pbdId) {
+        this.pbdId = pbdId;
+    }
+
+    public Integer getPbdPbid() {
+        return pbdPbid;
+    }
+
+    public void setPbdPbid(Integer pbdPbid) {
+        this.pbdPbid = pbdPbid;
+    }
+
+    public Integer getPbdDetno() {
+        return pbdDetno;
+    }
+
+    public void setPbdDetno(Integer pbdDetno) {
+        this.pbdDetno = pbdDetno;
+    }
+
+    public Integer getPbdYm() {
+        return pbdYm;
+    }
+
+    public void setPbdYm(Integer pbdYm) {
+        this.pbdYm = pbdYm;
+    }
+
+    public Integer getPbdSild() {
+        return pbdSild;
+    }
+
+    public void setPbdSild(Integer pbdSild) {
+        this.pbdSild = pbdSild;
+    }
+
+    public String getPbdSlcode() {
+        return pbdSlcode;
+    }
+
+    public void setPbdSlcode(String pbdSlcode) {
+        this.pbdSlcode = pbdSlcode == null ? null : pbdSlcode.trim();
+    }
+
+    public String getPbdSlkind() {
+        return pbdSlkind;
+    }
+
+    public void setPbdSlkind(String pbdSlkind) {
+        this.pbdSlkind = pbdSlkind == null ? null : pbdSlkind.trim();
+    }
+
+    public Date getPbdSldate() {
+        return pbdSldate;
+    }
+
+    public void setPbdSldate(Date pbdSldate) {
+        this.pbdSldate = pbdSldate;
+    }
+
+    public Double getPbdAmount() {
+        return pbdAmount;
+    }
+
+    public void setPbdAmount(Double pbdAmount) {
+        this.pbdAmount = pbdAmount;
+    }
+
+    public Double getPbdNowbalance() {
+        return pbdNowbalance;
+    }
+
+    public void setPbdNowbalance(Double pbdNowbalance) {
+        this.pbdNowbalance = pbdNowbalance;
+    }
+
+    public String getPbdRemark() {
+        return pbdRemark;
+    }
+
+    public void setPbdRemark(String pbdRemark) {
+        this.pbdRemark = pbdRemark == null ? null : pbdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getPbdText1() {
+        return pbdText1;
+    }
+
+    public void setPbdText1(String pbdText1) {
+        this.pbdText1 = pbdText1 == null ? null : pbdText1.trim();
+    }
+
+    public String getPbdText2() {
+        return pbdText2;
+    }
+
+    public void setPbdText2(String pbdText2) {
+        this.pbdText2 = pbdText2 == null ? null : pbdText2.trim();
+    }
+
+    public String getPbdText3() {
+        return pbdText3;
+    }
+
+    public void setPbdText3(String pbdText3) {
+        this.pbdText3 = pbdText3 == null ? null : pbdText3.trim();
+    }
+
+    public String getPbdText4() {
+        return pbdText4;
+    }
+
+    public void setPbdText4(String pbdText4) {
+        this.pbdText4 = pbdText4 == null ? null : pbdText4.trim();
+    }
+
+    public String getPbdText5() {
+        return pbdText5;
+    }
+
+    public void setPbdText5(String pbdText5) {
+        this.pbdText5 = pbdText5 == null ? null : pbdText5.trim();
+    }
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
+}

+ 35 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Rec.java

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.money.po;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 15:59
+ **/
+public class Rec {
+    private Recbalance recbalance;
+    private Recbalancedet recbalancedet;
+    private Recbalancedetail recbalancedetail;
+
+    public Recbalance getRecbalance() {
+        return recbalance;
+    }
+
+    public void setRecbalance(Recbalance recbalance) {
+        this.recbalance = recbalance;
+    }
+
+    public Recbalancedet getRecbalancedet() {
+        return recbalancedet;
+    }
+
+    public void setRecbalancedet(Recbalancedet recbalancedet) {
+        this.recbalancedet = recbalancedet;
+    }
+
+    public Recbalancedetail getRecbalancedetail() {
+        return recbalancedetail;
+    }
+
+    public void setRecbalancedetail(Recbalancedetail recbalancedetail) {
+        this.recbalancedetail = recbalancedetail;
+    }
+}

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

@@ -251,4 +251,24 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
     public void setRb_text5(String rb_text5) {
         this.rb_text5 = rb_text5 == null ? null : rb_text5.trim();
     }
+
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
 }

+ 4 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/RecbalanceExample.java

@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:13
- */
+ * @author heqw
+ * @date 2018/10/23 14:43
+ **/
 public class RecbalanceExample {
     protected String orderByClause;
 
@@ -1942,4 +1942,4 @@ public class RecbalanceExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

+ 20 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java

@@ -171,4 +171,24 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
     public void setRd_text5(String rd_text5) {
         this.rd_text5 = rd_text5 == null ? null : rd_text5.trim();
     }
+
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
 }

+ 4 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/RecbalancedetExample.java

@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @author hx
- * @createtime 2018-10-19 16:03
- */
+ * @author heqw
+ * @date 2018/10/23 14:45
+ **/
 public class RecbalancedetExample {
     protected String orderByClause;
 
@@ -1442,4 +1442,4 @@ public class RecbalancedetExample {
             this(condition, value, secondValue, null);
         }
     }
-}
+}

+ 218 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedetail.java

@@ -0,0 +1,218 @@
+package com.usoftchina.saas.money.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Recbalancedetail extends CommonBaseEntity implements Serializable {
+    private Integer rbdId;
+
+    private Integer rbdRbid;
+
+    private Integer rbdDetno;
+
+    private Integer rbdYm;
+
+    private Integer rbdSlid;
+
+    private String rbdSlcode;
+
+    private String rbdSlkind;
+
+    private Date rbdSldate;
+
+    private Double rbdAmount;
+
+    private Double rbdNowbalance;
+
+    private String rbdRemark;
+
+    private Integer companyid;
+
+    private Integer updaterid;
+
+    private Date updatedate;
+
+    private String rbdText1;
+
+    private String rbdText2;
+
+    private String rbdText3;
+
+    private String rbdText4;
+
+    private String rbdText5;
+
+    public Integer getRbdId() {
+        return rbdId;
+    }
+
+    public void setRbdId(Integer rbdId) {
+        this.rbdId = rbdId;
+    }
+
+    public Integer getRbdRbid() {
+        return rbdRbid;
+    }
+
+    public void setRbdRbid(Integer rbdRbid) {
+        this.rbdRbid = rbdRbid;
+    }
+
+    public Integer getRbdDetno() {
+        return rbdDetno;
+    }
+
+    public void setRbdDetno(Integer rbdDetno) {
+        this.rbdDetno = rbdDetno;
+    }
+
+    public Integer getRbdYm() {
+        return rbdYm;
+    }
+
+    public void setRbdYm(Integer rbdYm) {
+        this.rbdYm = rbdYm;
+    }
+
+    public Integer getRbdSlid() {
+        return rbdSlid;
+    }
+
+    public void setRbdSlid(Integer rbdSlid) {
+        this.rbdSlid = rbdSlid;
+    }
+
+    public String getRbdSlcode() {
+        return rbdSlcode;
+    }
+
+    public void setRbdSlcode(String rbdSlcode) {
+        this.rbdSlcode = rbdSlcode == null ? null : rbdSlcode.trim();
+    }
+
+    public String getRbdSlkind() {
+        return rbdSlkind;
+    }
+
+    public void setRbdSlkind(String rbdSlkind) {
+        this.rbdSlkind = rbdSlkind == null ? null : rbdSlkind.trim();
+    }
+
+    public Date getRbdSldate() {
+        return rbdSldate;
+    }
+
+    public void setRbdSldate(Date rbdSldate) {
+        this.rbdSldate = rbdSldate;
+    }
+
+    public Double getRbdAmount() {
+        return rbdAmount;
+    }
+
+    public void setRbdAmount(Double rbdAmount) {
+        this.rbdAmount = rbdAmount;
+    }
+
+    public Double getRbdNowbalance() {
+        return rbdNowbalance;
+    }
+
+    public void setRbdNowbalance(Double rbdNowbalance) {
+        this.rbdNowbalance = rbdNowbalance;
+    }
+
+    public String getRbdRemark() {
+        return rbdRemark;
+    }
+
+    public void setRbdRemark(String rbdRemark) {
+        this.rbdRemark = rbdRemark == null ? null : rbdRemark.trim();
+    }
+
+    public Integer getCompanyid() {
+        return companyid;
+    }
+
+    public void setCompanyid(Integer companyid) {
+        this.companyid = companyid;
+    }
+
+    public Integer getUpdaterid() {
+        return updaterid;
+    }
+
+    public void setUpdaterid(Integer updaterid) {
+        this.updaterid = updaterid;
+    }
+
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    public String getRbdText1() {
+        return rbdText1;
+    }
+
+    public void setRbdText1(String rbdText1) {
+        this.rbdText1 = rbdText1 == null ? null : rbdText1.trim();
+    }
+
+    public String getRbdText2() {
+        return rbdText2;
+    }
+
+    public void setRbdText2(String rbdText2) {
+        this.rbdText2 = rbdText2 == null ? null : rbdText2.trim();
+    }
+
+    public String getRbdText3() {
+        return rbdText3;
+    }
+
+    public void setRbdText3(String rbdText3) {
+        this.rbdText3 = rbdText3 == null ? null : rbdText3.trim();
+    }
+
+    public String getRbdText4() {
+        return rbdText4;
+    }
+
+    public void setRbdText4(String rbdText4) {
+        this.rbdText4 = rbdText4 == null ? null : rbdText4.trim();
+    }
+
+    public String getRbdText5() {
+        return rbdText5;
+    }
+
+    public void setRbdText5(String rbdText5) {
+        this.rbdText5 = rbdText5 == null ? null : rbdText5.trim();
+    }
+
+    @Override
+    public void setCreatorId(long creatorId) {
+
+    }
+
+    @Override
+    public void setUpdaterId(long updaterId) {
+
+    }
+
+    @Override
+    public long getCompanyId() {
+        return 0;
+    }
+
+    @Override
+    public void setCompanyId(long companyId) {
+
+    }
+}

+ 24 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/PaybalanceService.java

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.money.service;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.money.po.Pay;
+import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.page.PageRequest;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/22 14:25
+ **/
+public interface PaybalanceService {
+    int insert(Pay pay);
+
+    void updatePaybalance(Pay pay);
+
+    void deletePaybalance(int id);
+
+    Pay selectByPrimaryKey(int id);
+
+    PageInfo<Paybalance> selectList(PageRequest page);
+}

+ 18 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/RecbalanceService.java

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.money.service;
+
+import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.po.Recbalance;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 16:02
+ **/
+public interface RecbalanceService {
+    int insert(Rec rec);
+    void delectRecbalance(int id);
+    void updateRecbalance(Rec rec);
+    Rec selectRecbalance(int id);
+    List<Recbalance> selectRecbalanceList();
+}

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

@@ -0,0 +1,79 @@
+package com.usoftchina.saas.money.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.money.mapper.PaybalanceMapper;
+import com.usoftchina.saas.money.mapper.PaybalancedetMapper;
+import com.usoftchina.saas.money.mapper.PaybalancedetailMapper;
+import com.usoftchina.saas.money.po.Pay;
+import com.usoftchina.saas.money.po.Paybalance;
+import com.usoftchina.saas.money.po.Paybalancedet;
+import com.usoftchina.saas.money.po.Paybalancedetail;
+import com.usoftchina.saas.money.service.PaybalanceService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/22 14:28
+ **/
+@Service
+public class PaybalanceServiceImpl implements PaybalanceService {
+    @Autowired
+    private PaybalanceMapper paybalanceMapper;
+    @Autowired
+    private PaybalancedetMapper paybalancedetMapper;
+    @Autowired
+    private PaybalancedetailMapper paybalancedetailMapper;
+
+    public int insert(Pay pay) {
+        Paybalance paybalance = pay.getPaybalance();
+        Paybalancedet paybalancedet = pay.getPaybalancedet();
+        Paybalancedetail paybalancedetail = pay.getPaybalancedetail();
+        paybalanceMapper.insert(paybalance);
+        paybalancedetMapper.insert(paybalancedet);
+        paybalancedetailMapper.insert(paybalancedetail);
+        return 0;
+    }
+
+    @Override
+    public void updatePaybalance(Pay pay) {
+        Paybalance paybalance = pay.getPaybalance();
+        Paybalancedet paybalancedet = pay.getPaybalancedet();
+        Paybalancedetail paybalancedetail = pay.getPaybalancedetail();
+        paybalanceMapper.updateByPrimaryKeySelective(paybalance);
+        paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet);
+        paybalancedetailMapper.updateByPrimaryKeySelective(paybalancedetail);
+    }
+
+    public void deletePaybalance(int id){
+        paybalanceMapper.deleteByPrimaryKey(id);
+        paybalancedetailMapper.deleteByPrimaryKey(id);
+        paybalancedetMapper.deleteByPrimaryKey(id);
+    }
+
+    public Pay selectByPrimaryKey(int id){
+        Pay pay = new Pay();
+        pay.setPaybalance(paybalanceMapper.selectByPrimaryKey(id));
+        pay.setPaybalancedet(paybalancedetMapper.selectByPrimaryKey(id));
+        pay.setPaybalancedetail(paybalancedetailMapper.selectByPrimaryKey(id));
+        return pay;
+    }
+
+    public PageInfo<Paybalance> selectList(PageRequest page){
+        //设置默认分页
+        if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
+            page = new PageRequest();
+            page.setNumber(1);
+            page.setSize(10);
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<Paybalance> paybalances = paybalanceMapper.selectList();
+        //取分页信息
+        PageInfo<Paybalance> pageInfo = new PageInfo<Paybalance>(paybalances);
+        return pageInfo;
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.usoftchina.saas.money.service.impl;
+
+import com.usoftchina.saas.money.mapper.RecbalanceMapper;
+import com.usoftchina.saas.money.mapper.RecbalancedetMapper;
+import com.usoftchina.saas.money.mapper.RecbalancedetailMapper;
+import com.usoftchina.saas.money.po.Rec;
+import com.usoftchina.saas.money.po.Recbalance;
+import com.usoftchina.saas.money.po.Recbalancedet;
+import com.usoftchina.saas.money.po.Recbalancedetail;
+import com.usoftchina.saas.money.service.RecbalanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/23 16:18
+ **/
+@Service
+public class RecbalanceServiceImpl implements RecbalanceService {
+    @Autowired
+    RecbalanceMapper recbalanceMapper;
+    @Autowired
+    RecbalancedetMapper recbalancedetMapper;
+    @Autowired
+    RecbalancedetailMapper recbalancedetailMapper;
+
+    @Override
+    public int insert(Rec rec) {
+        Recbalance recbalance = rec.getRecbalance();
+        Recbalancedet recbalancedet = rec.getRecbalancedet();
+        Recbalancedetail recbalancedetail = rec.getRecbalancedetail();
+        recbalanceMapper.insert(recbalance);
+        recbalancedetMapper.insert(recbalancedet);
+        recbalancedetailMapper.insert(recbalancedetail);
+        return 0;
+    }
+
+    @Override
+    public void delectRecbalance(int id) {
+        recbalanceMapper.deleteByPrimaryKey(id);
+        recbalancedetMapper.deleteByPrimaryKey(id);
+        recbalancedetailMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public void updateRecbalance(Rec rec) {
+        Recbalance recbalance = rec.getRecbalance();
+        Recbalancedet recbalancedet = rec.getRecbalancedet();
+        Recbalancedetail recbalancedetail = rec.getRecbalancedetail();
+        recbalanceMapper.updateByPrimaryKey(recbalance);
+        recbalancedetMapper.updateByPrimaryKey(recbalancedet);
+        recbalancedetailMapper.updateByPrimaryKey(recbalancedetail);
+    }
+
+    @Override
+    public Rec selectRecbalance(int id) {
+        Recbalance recbalance = recbalanceMapper.selectByPrimaryKey(id);
+        Recbalancedet recbalancedet = recbalancedetMapper.selectByPrimaryKey(id);
+        Recbalancedetail recbalancedetail = recbalancedetailMapper.selectByPrimaryKey(id);
+        Rec rec = new Rec();
+        rec.setRecbalance(recbalance);
+        rec.setRecbalancedet(recbalancedet);
+        rec.setRecbalancedetail(recbalancedetail);
+        return rec;
+    }
+
+    @Override
+    public List<Recbalance> selectRecbalanceList() {
+        return recbalanceMapper.selectList();
+    }
+}

+ 16 - 15
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -30,8 +30,8 @@ import java.util.List;
 
 @Service
 public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationMapper,Verification> implements VerificationService {
-    @Autowired
-    private MaxnumberService maxnumberService;
+//    @Autowired
+//    private MaxnumberService maxnumberService;
     @Autowired
     private VerificationMapper verificationMapper;
     @Autowired
@@ -40,8 +40,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
     private VerificationdetailMapper verificationdetailMapper;
     @Autowired
     private VerificationListMapper verificationListMapper;
-    @Autowired
-    private MessageLogService messageLogService;
+//    @Autowired
+//    private MessageLogService messageLogService;
 
 
     @Override
@@ -125,7 +125,8 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         verification.setCreatorId(userId);
         verification.setCreateTime(new Date());
         //编号获取
-        code = pushMaxnubmer(code,id);
+//        code = pushMaxnubmer(code,id);
+        code = "1";
         verification.setVc_code(code);
         saveDTO.setCode(code);
         //判断更新与保存动作
@@ -208,7 +209,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
             baseDTO.setCode(code);
             baseDTO.setName("Verification");
             //日志
-            messageLogService.delete(baseDTO);
+//            messageLogService.delete(baseDTO);
         }
     }
 
@@ -254,15 +255,15 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         baseDTO.setCode(code);
         baseDTO.setName("Verification");
         //日志
-        messageLogService.unAudit(baseDTO);
+//        messageLogService.unAudit(baseDTO);
     }
 
-    private String pushMaxnubmer(String code, Long id) {
-        if (null == code) {
-            throw new BizException(BizExceptionCode.NULL_CODE);
-        }
-        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
-                verificationMapper.validateCodeWhenUpdate(code, id);
-        return maxnumberService.pushMaxnubmer(count, code, "Verification");
-    }
+//    private String pushMaxnubmer(String code, Long id) {
+//        if (null == code) {
+//            throw new BizException(BizExceptionCode.NULL_CODE);
+//        }
+//        Integer count = "0".equals(String.valueOf(id)) ? verificationMapper.validateCodeWhenInsert(code) :
+//                verificationMapper.validateCodeWhenUpdate(code, id);
+//        return maxnumberService.pushMaxnubmer(count, code, "Verification");
+//    }
 }

+ 4 - 3
applications/money/money-server/src/main/resources/application.yml

@@ -21,8 +21,9 @@ spring:
   rabbitmq:
     host: 192.168.0.176
     port: 5672
-    password: guest
-    username: guest
+    virtual-host: dev
+    password: saas
+    username: select123***
   zipkin:
     sender:
       type: rabbit
@@ -43,7 +44,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@localhost:8500/eureka/
 server:
   port: 8920
   tomcat:

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

@@ -21,9 +21,9 @@
     <result column="pb_status" jdbcType="INTEGER" property="pb_status" />
     <result column="pb_statuscode" jdbcType="DECIMAL" property="pb_statuscode" />
     <result column="pb_remark" jdbcType="VARCHAR" property="pb_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
-    <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
+    <result column="updatedate" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="pb_text1" jdbcType="VARCHAR" property="pb_text1" />
     <result column="pb_text2" jdbcType="VARCHAR" property="pb_text2" />
     <result column="pb_text3" jdbcType="VARCHAR" property="pb_text3" />
@@ -91,23 +91,15 @@
   <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, companyid, updaterId, 
+    pb_recorder, pb_recorddate, pb_status, pb_statuscode, pb_remark, companyId, updaterId,
     updatedate, pb_text1, pb_text2, pb_text3, pb_text4, pb_text5
   </sql>
-  <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.PaybalanceExample" resultMap="BaseResultMap">
+  <select id="selectList" resultMap="BaseResultMap">
     select
-    <if test="distinct">
-      distinct
-    </if>
     <include refid="Base_Column_List" />
     from paybalance
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
   </select>
+
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
@@ -125,24 +117,24 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalance">
-    insert into paybalance (pb_id, pb_code, pb_kind, 
+    insert into paybalance (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, companyid, updaterId, 
+      pb_remark, companyId, updaterId,
       updatedate, pb_text1, pb_text2, 
       pb_text3, pb_text4, pb_text5
       )
-    values (#{pb_id,jdbcType=INTEGER}, #{pb_code,jdbcType=VARCHAR}, #{pb_kind,jdbcType=VARCHAR}, 
+    values (#{pb_code,jdbcType=VARCHAR}, #{pb_kind,jdbcType=VARCHAR},
       #{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_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
-      #{updatedate,jdbcType=TIMESTAMP}, #{pb_text1,jdbcType=VARCHAR}, #{pb_text2,jdbcType=VARCHAR}, 
+      #{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}
       )
   </insert>
@@ -500,14 +492,14 @@
       <if test="pb_remark != null">
         pb_remark = #{pb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null">
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      <if test="updateTime != null">
+        updatedate = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},

+ 259 - 0
applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -0,0 +1,259 @@
+<?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.PaybalancedetMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedet" >
+    <id column="pd_id" property="pdId" jdbcType="INTEGER" />
+    <result column="pd_rbid" property="pdRbid" jdbcType="INTEGER" />
+    <result column="pd_detno" property="pdDetno" jdbcType="INTEGER" />
+    <result column="pd_ym" property="pdYm" jdbcType="INTEGER" />
+    <result column="pd_bankid" property="pdBankid" jdbcType="INTEGER" />
+    <result column="pd_bankcode" property="pdBankcode" jdbcType="VARCHAR" />
+    <result column="pd_bankname" property="pdBankname" jdbcType="VARCHAR" />
+    <result column="pd_amount" property="pdAmount" jdbcType="DOUBLE" />
+    <result column="pd_paymethod" property="pdPaymethod" jdbcType="VARCHAR" />
+    <result column="pd_paycode" property="pdPaycode" jdbcType="VARCHAR" />
+    <result column="pd_remark" property="pdRemark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="pd_text1" property="pdText1" jdbcType="VARCHAR" />
+    <result column="pd_text2" property="pdText2" jdbcType="VARCHAR" />
+    <result column="pd_text3" property="pdText3" jdbcType="VARCHAR" />
+    <result column="pd_text4" property="pdText4" jdbcType="VARCHAR" />
+    <result column="pd_text5" property="pdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    pd_id, pd_rbid, pd_detno, pd_ym, pd_bankid, pd_bankcode, pd_bankname, pd_amount, 
+    pd_paymethod, pd_paycode, pd_remark, companyId, updaterId, updatedate, pd_text1, 
+    pd_text2, pd_text3, pd_text4, pd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from paybalancedet
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from paybalancedet
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    insert into paybalancedet (pd_id, pd_rbid, pd_detno, 
+      pd_ym, pd_bankid, pd_bankcode, 
+      pd_bankname, pd_amount, pd_paymethod, 
+      pd_paycode, pd_remark, companyId, 
+      updaterId, updatedate, pd_text1, 
+      pd_text2, pd_text3, pd_text4, 
+      pd_text5)
+    values (#{pdId,jdbcType=INTEGER}, #{pdRbid,jdbcType=INTEGER}, #{pdDetno,jdbcType=INTEGER}, 
+      #{pdYm,jdbcType=INTEGER}, #{pdBankid,jdbcType=INTEGER}, #{pdBankcode,jdbcType=VARCHAR}, 
+      #{pdBankname,jdbcType=VARCHAR}, #{pdAmount,jdbcType=DOUBLE}, #{pdPaymethod,jdbcType=VARCHAR}, 
+      #{pdPaycode,jdbcType=VARCHAR}, #{pdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{pdText1,jdbcType=VARCHAR}, 
+      #{pdText2,jdbcType=VARCHAR}, #{pdText3,jdbcType=VARCHAR}, #{pdText4,jdbcType=VARCHAR}, 
+      #{pdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    insert into paybalancedet
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="pdId != null" >
+        pd_id,
+      </if>
+      <if test="pdRbid != null" >
+        pd_rbid,
+      </if>
+      <if test="pdDetno != null" >
+        pd_detno,
+      </if>
+      <if test="pdYm != null" >
+        pd_ym,
+      </if>
+      <if test="pdBankid != null" >
+        pd_bankid,
+      </if>
+      <if test="pdBankcode != null" >
+        pd_bankcode,
+      </if>
+      <if test="pdBankname != null" >
+        pd_bankname,
+      </if>
+      <if test="pdAmount != null" >
+        pd_amount,
+      </if>
+      <if test="pdPaymethod != null" >
+        pd_paymethod,
+      </if>
+      <if test="pdPaycode != null" >
+        pd_paycode,
+      </if>
+      <if test="pdRemark != null" >
+        pd_remark,
+      </if>
+      <if test="companyid != null" >
+        companyId,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="pdText1 != null" >
+        pd_text1,
+      </if>
+      <if test="pdText2 != null" >
+        pd_text2,
+      </if>
+      <if test="pdText3 != null" >
+        pd_text3,
+      </if>
+      <if test="pdText4 != null" >
+        pd_text4,
+      </if>
+      <if test="pdText5 != null" >
+        pd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="pdId != null" >
+        #{pdId,jdbcType=INTEGER},
+      </if>
+      <if test="pdRbid != null" >
+        #{pdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="pdDetno != null" >
+        #{pdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pdYm != null" >
+        #{pdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankid != null" >
+        #{pdBankid,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankcode != null" >
+        #{pdBankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdBankname != null" >
+        #{pdBankname,jdbcType=VARCHAR},
+      </if>
+      <if test="pdAmount != null" >
+        #{pdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pdPaymethod != null" >
+        #{pdPaymethod,jdbcType=VARCHAR},
+      </if>
+      <if test="pdPaycode != null" >
+        #{pdPaycode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdRemark != null" >
+        #{pdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pdText1 != null" >
+        #{pdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText2 != null" >
+        #{pdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText3 != null" >
+        #{pdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText4 != null" >
+        #{pdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText5 != null" >
+        #{pdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    update paybalancedet
+    <set >
+      <if test="pdRbid != null" >
+        pd_rbid = #{pdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="pdDetno != null" >
+        pd_detno = #{pdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pdYm != null" >
+        pd_ym = #{pdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankid != null" >
+        pd_bankid = #{pdBankid,jdbcType=INTEGER},
+      </if>
+      <if test="pdBankcode != null" >
+        pd_bankcode = #{pdBankcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdBankname != null" >
+        pd_bankname = #{pdBankname,jdbcType=VARCHAR},
+      </if>
+      <if test="pdAmount != null" >
+        pd_amount = #{pdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pdPaymethod != null" >
+        pd_paymethod = #{pdPaymethod,jdbcType=VARCHAR},
+      </if>
+      <if test="pdPaycode != null" >
+        pd_paycode = #{pdPaycode,jdbcType=VARCHAR},
+      </if>
+      <if test="pdRemark != null" >
+        pd_remark = #{pdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        companyId = #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pdText1 != null" >
+        pd_text1 = #{pdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText2 != null" >
+        pd_text2 = #{pdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText3 != null" >
+        pd_text3 = #{pdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText4 != null" >
+        pd_text4 = #{pdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pdText5 != null" >
+        pd_text5 = #{pdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
+    update paybalancedet
+    set pd_rbid = #{pdRbid,jdbcType=INTEGER},
+      pd_detno = #{pdDetno,jdbcType=INTEGER},
+      pd_ym = #{pdYm,jdbcType=INTEGER},
+      pd_bankid = #{pdBankid,jdbcType=INTEGER},
+      pd_bankcode = #{pdBankcode,jdbcType=VARCHAR},
+      pd_bankname = #{pdBankname,jdbcType=VARCHAR},
+      pd_amount = #{pdAmount,jdbcType=DOUBLE},
+      pd_paymethod = #{pdPaymethod,jdbcType=VARCHAR},
+      pd_paycode = #{pdPaycode,jdbcType=VARCHAR},
+      pd_remark = #{pdRemark,jdbcType=VARCHAR},
+      companyId = #{companyid,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      pd_text1 = #{pdText1,jdbcType=VARCHAR},
+      pd_text2 = #{pdText2,jdbcType=VARCHAR},
+      pd_text3 = #{pdText3,jdbcType=VARCHAR},
+      pd_text4 = #{pdText4,jdbcType=VARCHAR},
+      pd_text5 = #{pdText5,jdbcType=VARCHAR}
+    where pd_id = #{pdId,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 259 - 0
applications/money/money-server/src/main/resources/mapper/PaybalancedetailMapper.xml

@@ -0,0 +1,259 @@
+<?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.PaybalancedetailMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Paybalancedetail" >
+    <id column="pbd_id" property="pbdId" jdbcType="INTEGER" />
+    <result column="pbd_pbid" property="pbdPbid" jdbcType="INTEGER" />
+    <result column="pbd_detno" property="pbdDetno" jdbcType="INTEGER" />
+    <result column="pbd_ym" property="pbdYm" jdbcType="INTEGER" />
+    <result column="pbd_sild" property="pbdSild" jdbcType="INTEGER" />
+    <result column="pbd_slcode" property="pbdSlcode" jdbcType="VARCHAR" />
+    <result column="pbd_slkind" property="pbdSlkind" jdbcType="VARCHAR" />
+    <result column="pbd_sldate" property="pbdSldate" jdbcType="TIMESTAMP" />
+    <result column="pbd_amount" property="pbdAmount" jdbcType="DOUBLE" />
+    <result column="pbd_nowbalance" property="pbdNowbalance" jdbcType="DOUBLE" />
+    <result column="pbd_remark" property="pbdRemark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyid" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="pbd_text1" property="pbdText1" jdbcType="VARCHAR" />
+    <result column="pbd_text2" property="pbdText2" jdbcType="VARCHAR" />
+    <result column="pbd_text3" property="pbdText3" jdbcType="VARCHAR" />
+    <result column="pbd_text4" property="pbdText4" jdbcType="VARCHAR" />
+    <result column="pbd_text5" property="pbdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    pbd_id, pbd_pbid, pbd_detno, pbd_ym, pbd_sild, pbd_slcode, pbd_slkind, pbd_sldate, 
+    pbd_amount, pbd_nowbalance, pbd_remark, companyId, updaterId, updatedate, pbd_text1, 
+    pbd_text2, pbd_text3, pbd_text4, pbd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from paybalancedetail
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from paybalancedetail
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    insert into paybalancedetail (pbd_id, pbd_pbid, pbd_detno, 
+      pbd_ym, pbd_sild, pbd_slcode, 
+      pbd_slkind, pbd_sldate, pbd_amount, 
+      pbd_nowbalance, pbd_remark, companyId, 
+      updaterId, updatedate, pbd_text1, 
+      pbd_text2, pbd_text3, pbd_text4, 
+      pbd_text5)
+    values (#{pbdId,jdbcType=INTEGER}, #{pbdPbid,jdbcType=INTEGER}, #{pbdDetno,jdbcType=INTEGER}, 
+      #{pbdYm,jdbcType=INTEGER}, #{pbdSild,jdbcType=INTEGER}, #{pbdSlcode,jdbcType=VARCHAR}, 
+      #{pbdSlkind,jdbcType=VARCHAR}, #{pbdSldate,jdbcType=TIMESTAMP}, #{pbdAmount,jdbcType=DOUBLE}, 
+      #{pbdNowbalance,jdbcType=DOUBLE}, #{pbdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{pbdText1,jdbcType=VARCHAR}, 
+      #{pbdText2,jdbcType=VARCHAR}, #{pbdText3,jdbcType=VARCHAR}, #{pbdText4,jdbcType=VARCHAR}, 
+      #{pbdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    insert into paybalancedetail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="pbdId != null" >
+        pbd_id,
+      </if>
+      <if test="pbdPbid != null" >
+        pbd_pbid,
+      </if>
+      <if test="pbdDetno != null" >
+        pbd_detno,
+      </if>
+      <if test="pbdYm != null" >
+        pbd_ym,
+      </if>
+      <if test="pbdSild != null" >
+        pbd_sild,
+      </if>
+      <if test="pbdSlcode != null" >
+        pbd_slcode,
+      </if>
+      <if test="pbdSlkind != null" >
+        pbd_slkind,
+      </if>
+      <if test="pbdSldate != null" >
+        pbd_sldate,
+      </if>
+      <if test="pbdAmount != null" >
+        pbd_amount,
+      </if>
+      <if test="pbdNowbalance != null" >
+        pbd_nowbalance,
+      </if>
+      <if test="pbdRemark != null" >
+        pbd_remark,
+      </if>
+      <if test="companyid != null" >
+        companyId,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="pbdText1 != null" >
+        pbd_text1,
+      </if>
+      <if test="pbdText2 != null" >
+        pbd_text2,
+      </if>
+      <if test="pbdText3 != null" >
+        pbd_text3,
+      </if>
+      <if test="pbdText4 != null" >
+        pbd_text4,
+      </if>
+      <if test="pbdText5 != null" >
+        pbd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="pbdId != null" >
+        #{pbdId,jdbcType=INTEGER},
+      </if>
+      <if test="pbdPbid != null" >
+        #{pbdPbid,jdbcType=INTEGER},
+      </if>
+      <if test="pbdDetno != null" >
+        #{pbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pbdYm != null" >
+        #{pbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSild != null" >
+        #{pbdSild,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSlcode != null" >
+        #{pbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSlkind != null" >
+        #{pbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSldate != null" >
+        #{pbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdAmount != null" >
+        #{pbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdNowbalance != null" >
+        #{pbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdRemark != null" >
+        #{pbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdText1 != null" >
+        #{pbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText2 != null" >
+        #{pbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText3 != null" >
+        #{pbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText4 != null" >
+        #{pbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText5 != null" >
+        #{pbdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    update paybalancedetail
+    <set >
+      <if test="pbdPbid != null" >
+        pbd_pbid = #{pbdPbid,jdbcType=INTEGER},
+      </if>
+      <if test="pbdDetno != null" >
+        pbd_detno = #{pbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="pbdYm != null" >
+        pbd_ym = #{pbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSild != null" >
+        pbd_sild = #{pbdSild,jdbcType=INTEGER},
+      </if>
+      <if test="pbdSlcode != null" >
+        pbd_slcode = #{pbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSlkind != null" >
+        pbd_slkind = #{pbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdSldate != null" >
+        pbd_sldate = #{pbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdAmount != null" >
+        pbd_amount = #{pbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdNowbalance != null" >
+        pbd_nowbalance = #{pbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="pbdRemark != null" >
+        pbd_remark = #{pbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyid != null" >
+        companyId = #{companyid,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="pbdText1 != null" >
+        pbd_text1 = #{pbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText2 != null" >
+        pbd_text2 = #{pbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText3 != null" >
+        pbd_text3 = #{pbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText4 != null" >
+        pbd_text4 = #{pbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="pbdText5 != null" >
+        pbd_text5 = #{pbdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Paybalancedetail" >
+    update paybalancedetail
+    set pbd_pbid = #{pbdPbid,jdbcType=INTEGER},
+      pbd_detno = #{pbdDetno,jdbcType=INTEGER},
+      pbd_ym = #{pbdYm,jdbcType=INTEGER},
+      pbd_sild = #{pbdSild,jdbcType=INTEGER},
+      pbd_slcode = #{pbdSlcode,jdbcType=VARCHAR},
+      pbd_slkind = #{pbdSlkind,jdbcType=VARCHAR},
+      pbd_sldate = #{pbdSldate,jdbcType=TIMESTAMP},
+      pbd_amount = #{pbdAmount,jdbcType=DOUBLE},
+      pbd_nowbalance = #{pbdNowbalance,jdbcType=DOUBLE},
+      pbd_remark = #{pbdRemark,jdbcType=VARCHAR},
+      companyId = #{companyid,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      pbd_text1 = #{pbdText1,jdbcType=VARCHAR},
+      pbd_text2 = #{pbdText2,jdbcType=VARCHAR},
+      pbd_text3 = #{pbdText3,jdbcType=VARCHAR},
+      pbd_text4 = #{pbdText4,jdbcType=VARCHAR},
+      pbd_text5 = #{pbdText5,jdbcType=VARCHAR}
+    where pbd_id = #{pbdId,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -21,7 +21,7 @@
     <result column="rb_status" jdbcType="INTEGER" property="rb_status" />
     <result column="rb_statuscode" jdbcType="DECIMAL" property="rb_statuscode" />
     <result column="rb_remark" jdbcType="VARCHAR" property="rb_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+    <result column="companyId" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rb_text1" jdbcType="VARCHAR" property="rb_text1" />
@@ -91,7 +91,7 @@
   <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, companyid, updaterId, 
+    rb_recorder, rb_recorddate, rb_status, rb_statuscode, rb_remark, companyId, updaterId,
     updatedate, rb_text1, rb_text2, rb_text3, rb_text4, rb_text5
   </sql>
   <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalanceExample" resultMap="BaseResultMap">
@@ -114,6 +114,13 @@
     from recbalance
     where rb_id = #{rb_id,jdbcType=INTEGER}
   </select>
+
+  <select id="selectList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from recbalance
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from recbalance
     where rb_id = #{rb_id,jdbcType=INTEGER}
@@ -131,7 +138,7 @@
       rb_rbdamount, rb_preamount, rb_discounts, 
       rb_havebalance, rb_recorderid, rb_recorder, 
       rb_recorddate, rb_status, rb_statuscode, 
-      rb_remark, companyid, updaterId, 
+      rb_remark, companyId, updaterId,
       updatedate, rb_text1, rb_text2, 
       rb_text3, rb_text4, rb_text5
       )
@@ -141,7 +148,7 @@
       #{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_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER}, 
+      #{rb_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, #{updaterId,jdbcType=INTEGER},
       #{updatedate,jdbcType=TIMESTAMP}, #{rb_text1,jdbcType=VARCHAR}, #{rb_text2,jdbcType=VARCHAR}, 
       #{rb_text3,jdbcType=VARCHAR}, #{rb_text4,jdbcType=VARCHAR}, #{rb_text5,jdbcType=VARCHAR}
       )
@@ -206,8 +213,8 @@
       <if test="rb_remark != null">
         rb_remark,
       </if>
-      <if test="companyid != null">
-        companyid,
+      <if test="companyId != null">
+        companyId,
       </if>
       <if test="updaterId != null">
         updaterId,
@@ -289,8 +296,8 @@
       <if test="rb_remark != null">
         #{rb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
@@ -381,8 +388,8 @@
       <if test="record.rb_remark != null">
         rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null">
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null">
         updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -431,7 +438,7 @@
       rb_status = #{record.rb_status,jdbcType=INTEGER},
       rb_statuscode = #{record.rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{record.rb_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
       updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
       rb_text1 = #{record.rb_text1,jdbcType=VARCHAR},
@@ -500,8 +507,8 @@
       <if test="rb_remark != null">
         rb_remark = #{rb_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -547,7 +554,7 @@
       rb_status = #{rb_status,jdbcType=INTEGER},
       rb_statuscode = #{rb_statuscode,jdbcType=DECIMAL},
       rb_remark = #{rb_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       rb_text1 = #{rb_text1,jdbcType=VARCHAR},

+ 14 - 14
applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml

@@ -13,7 +13,7 @@
     <result column="rd_paymethod" jdbcType="VARCHAR" property="rd_paymethod" />
     <result column="rd_paycode" jdbcType="VARCHAR" property="rd_paycode" />
     <result column="rd_remark" jdbcType="VARCHAR" property="rd_remark" />
-    <result column="companyid" jdbcType="INTEGER" property="companyid" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
     <result column="rd_text1" jdbcType="VARCHAR" property="rd_text1" />
@@ -82,7 +82,7 @@
   </sql>
   <sql id="Base_Column_List">
     rd_id, rd_rbid, rd_detno, rd_ym, rd_bankid, rd_bankcode, rd_bankname, rd_amount, 
-    rd_paymethod, rd_paycode, rd_remark, companyid, updaterId, updatedate, rd_text1, 
+    rd_paymethod, rd_paycode, rd_remark, companyId, updaterId, updatedate, rd_text1,
     rd_text2, rd_text3, rd_text4, rd_text5
   </sql>
   <select id="selectByExample" parameterType="com.usoftchina.saas.money.po.RecbalancedetExample" resultMap="BaseResultMap">
@@ -119,14 +119,14 @@
     insert into recbalancedet (rd_id, rd_rbid, rd_detno, 
       rd_ym, rd_bankid, rd_bankcode, 
       rd_bankname, rd_amount, rd_paymethod, 
-      rd_paycode, rd_remark, companyid, 
+      rd_paycode, rd_remark, companyId,
       updaterId, updatedate, rd_text1, 
       rd_text2, rd_text3, rd_text4, 
       rd_text5)
     values (#{rd_id,jdbcType=INTEGER}, #{rd_rbid,jdbcType=INTEGER}, #{rd_detno,jdbcType=INTEGER}, 
       #{rd_ym,jdbcType=INTEGER}, #{rd_bankid,jdbcType=INTEGER}, #{rd_bankcode,jdbcType=VARCHAR}, 
       #{rd_bankname,jdbcType=VARCHAR}, #{rd_amount,jdbcType=DOUBLE}, #{rd_paymethod,jdbcType=VARCHAR}, 
-      #{rd_paycode,jdbcType=VARCHAR}, #{rd_remark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{rd_paycode,jdbcType=VARCHAR}, #{rd_remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
       #{updaterId,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{rd_text1,jdbcType=VARCHAR}, 
       #{rd_text2,jdbcType=VARCHAR}, #{rd_text3,jdbcType=VARCHAR}, #{rd_text4,jdbcType=VARCHAR}, 
       #{rd_text5,jdbcType=VARCHAR})
@@ -167,8 +167,8 @@
       <if test="rd_remark != null">
         rd_remark,
       </if>
-      <if test="companyid != null">
-        companyid,
+      <if test="companyId != null">
+        companyId,
       </if>
       <if test="updaterId != null">
         updaterId,
@@ -226,8 +226,8 @@
       <if test="rd_remark != null">
         #{rd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         #{updaterId,jdbcType=INTEGER},
@@ -294,8 +294,8 @@
       <if test="record.rd_remark != null">
         rd_remark = #{record.rd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyid != null">
-        companyid = #{record.companyid,jdbcType=INTEGER},
+      <if test="record.companyId != null">
+        companyId = #{record.companyId,jdbcType=INTEGER},
       </if>
       <if test="record.updaterId != null">
         updaterId = #{record.updaterId,jdbcType=INTEGER},
@@ -336,7 +336,7 @@
       rd_paymethod = #{record.rd_paymethod,jdbcType=VARCHAR},
       rd_paycode = #{record.rd_paycode,jdbcType=VARCHAR},
       rd_remark = #{record.rd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
+      companyId = #{record.companyId,jdbcType=INTEGER},
       updaterId = #{record.updaterId,jdbcType=INTEGER},
       updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
       rd_text1 = #{record.rd_text1,jdbcType=VARCHAR},
@@ -381,8 +381,8 @@
       <if test="rd_remark != null">
         rd_remark = #{rd_remark,jdbcType=VARCHAR},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyId = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -420,7 +420,7 @@
       rd_paymethod = #{rd_paymethod,jdbcType=VARCHAR},
       rd_paycode = #{rd_paycode,jdbcType=VARCHAR},
       rd_remark = #{rd_remark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterId,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       rd_text1 = #{rd_text1,jdbcType=VARCHAR},

+ 259 - 0
applications/money/money-server/src/main/resources/mapper/RecbalancedetailMapper.xml

@@ -0,0 +1,259 @@
+<?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.RecbalancedetailMapper" >
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Recbalancedetail" >
+    <id column="rbd_id" property="rbdId" jdbcType="INTEGER" />
+    <result column="rbd_rbid" property="rbdRbid" jdbcType="INTEGER" />
+    <result column="rbd_detno" property="rbdDetno" jdbcType="INTEGER" />
+    <result column="rbd_ym" property="rbdYm" jdbcType="INTEGER" />
+    <result column="rbd_slid" property="rbdSlid" jdbcType="INTEGER" />
+    <result column="rbd_slcode" property="rbdSlcode" jdbcType="VARCHAR" />
+    <result column="rbd_slkind" property="rbdSlkind" jdbcType="VARCHAR" />
+    <result column="rbd_sldate" property="rbdSldate" jdbcType="TIMESTAMP" />
+    <result column="rbd_amount" property="rbdAmount" jdbcType="DOUBLE" />
+    <result column="rbd_nowbalance" property="rbdNowbalance" jdbcType="DOUBLE" />
+    <result column="rbd_remark" property="rbdRemark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="rbd_text1" property="rbdText1" jdbcType="VARCHAR" />
+    <result column="rbd_text2" property="rbdText2" jdbcType="VARCHAR" />
+    <result column="rbd_text3" property="rbdText3" jdbcType="VARCHAR" />
+    <result column="rbd_text4" property="rbdText4" jdbcType="VARCHAR" />
+    <result column="rbd_text5" property="rbdText5" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    rbd_id, rbd_rbid, rbd_detno, rbd_ym, rbd_slid, rbd_slcode, rbd_slkind, rbd_sldate, 
+    rbd_amount, rbd_nowbalance, rbd_remark, companyId, updaterId, updatedate, rbd_text1,
+    rbd_text2, rbd_text3, rbd_text4, rbd_text5
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from recbalancedetail
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from recbalancedetail
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    insert into recbalancedetail (rbd_id, rbd_rbid, rbd_detno, 
+      rbd_ym, rbd_slid, rbd_slcode, 
+      rbd_slkind, rbd_sldate, rbd_amount, 
+      rbd_nowbalance, rbd_remark, companyId,
+      updaterId, updatedate, rbd_text1, 
+      rbd_text2, rbd_text3, rbd_text4, 
+      rbd_text5)
+    values (#{rbdId,jdbcType=INTEGER}, #{rbdRbid,jdbcType=INTEGER}, #{rbdDetno,jdbcType=INTEGER}, 
+      #{rbdYm,jdbcType=INTEGER}, #{rbdSlid,jdbcType=INTEGER}, #{rbdSlcode,jdbcType=VARCHAR}, 
+      #{rbdSlkind,jdbcType=VARCHAR}, #{rbdSldate,jdbcType=TIMESTAMP}, #{rbdAmount,jdbcType=DOUBLE}, 
+      #{rbdNowbalance,jdbcType=DOUBLE}, #{rbdRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER},
+      #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{rbdText1,jdbcType=VARCHAR}, 
+      #{rbdText2,jdbcType=VARCHAR}, #{rbdText3,jdbcType=VARCHAR}, #{rbdText4,jdbcType=VARCHAR}, 
+      #{rbdText5,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    insert into recbalancedetail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="rbdId != null" >
+        rbd_id,
+      </if>
+      <if test="rbdRbid != null" >
+        rbd_rbid,
+      </if>
+      <if test="rbdDetno != null" >
+        rbd_detno,
+      </if>
+      <if test="rbdYm != null" >
+        rbd_ym,
+      </if>
+      <if test="rbdSlid != null" >
+        rbd_slid,
+      </if>
+      <if test="rbdSlcode != null" >
+        rbd_slcode,
+      </if>
+      <if test="rbdSlkind != null" >
+        rbd_slkind,
+      </if>
+      <if test="rbdSldate != null" >
+        rbd_sldate,
+      </if>
+      <if test="rbdAmount != null" >
+        rbd_amount,
+      </if>
+      <if test="rbdNowbalance != null" >
+        rbd_nowbalance,
+      </if>
+      <if test="rbdRemark != null" >
+        rbd_remark,
+      </if>
+      <if test="companyId != null" >
+        companyId,
+      </if>
+      <if test="updaterid != null" >
+        updaterId,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="rbdText1 != null" >
+        rbd_text1,
+      </if>
+      <if test="rbdText2 != null" >
+        rbd_text2,
+      </if>
+      <if test="rbdText3 != null" >
+        rbd_text3,
+      </if>
+      <if test="rbdText4 != null" >
+        rbd_text4,
+      </if>
+      <if test="rbdText5 != null" >
+        rbd_text5,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="rbdId != null" >
+        #{rbdId,jdbcType=INTEGER},
+      </if>
+      <if test="rbdRbid != null" >
+        #{rbdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdDetno != null" >
+        #{rbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="rbdYm != null" >
+        #{rbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlid != null" >
+        #{rbdSlid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlcode != null" >
+        #{rbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSlkind != null" >
+        #{rbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSldate != null" >
+        #{rbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdAmount != null" >
+        #{rbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdNowbalance != null" >
+        #{rbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdRemark != null" >
+        #{rbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdText1 != null" >
+        #{rbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText2 != null" >
+        #{rbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText3 != null" >
+        #{rbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText4 != null" >
+        #{rbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText5 != null" >
+        #{rbdText5,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    update recbalancedetail
+    <set >
+      <if test="rbdRbid != null" >
+        rbd_rbid = #{rbdRbid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdDetno != null" >
+        rbd_detno = #{rbdDetno,jdbcType=INTEGER},
+      </if>
+      <if test="rbdYm != null" >
+        rbd_ym = #{rbdYm,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlid != null" >
+        rbd_slid = #{rbdSlid,jdbcType=INTEGER},
+      </if>
+      <if test="rbdSlcode != null" >
+        rbd_slcode = #{rbdSlcode,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSlkind != null" >
+        rbd_slkind = #{rbdSlkind,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdSldate != null" >
+        rbd_sldate = #{rbdSldate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdAmount != null" >
+        rbd_amount = #{rbdAmount,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdNowbalance != null" >
+        rbd_nowbalance = #{rbdNowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="rbdRemark != null" >
+        rbd_remark = #{rbdRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        companyId = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="updaterid != null" >
+        updaterId = #{updaterid,jdbcType=INTEGER},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rbdText1 != null" >
+        rbd_text1 = #{rbdText1,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText2 != null" >
+        rbd_text2 = #{rbdText2,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText3 != null" >
+        rbd_text3 = #{rbdText3,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText4 != null" >
+        rbd_text4 = #{rbdText4,jdbcType=VARCHAR},
+      </if>
+      <if test="rbdText5 != null" >
+        rbd_text5 = #{rbdText5,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Recbalancedetail" >
+    update recbalancedetail
+    set rbd_rbid = #{rbdRbid,jdbcType=INTEGER},
+      rbd_detno = #{rbdDetno,jdbcType=INTEGER},
+      rbd_ym = #{rbdYm,jdbcType=INTEGER},
+      rbd_slid = #{rbdSlid,jdbcType=INTEGER},
+      rbd_slcode = #{rbdSlcode,jdbcType=VARCHAR},
+      rbd_slkind = #{rbdSlkind,jdbcType=VARCHAR},
+      rbd_sldate = #{rbdSldate,jdbcType=TIMESTAMP},
+      rbd_amount = #{rbdAmount,jdbcType=DOUBLE},
+      rbd_nowbalance = #{rbdNowbalance,jdbcType=DOUBLE},
+      rbd_remark = #{rbdRemark,jdbcType=VARCHAR},
+      companyId = #{companyId,jdbcType=INTEGER},
+      updaterId = #{updaterid,jdbcType=INTEGER},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      rbd_text1 = #{rbdText1,jdbcType=VARCHAR},
+      rbd_text2 = #{rbdText2,jdbcType=VARCHAR},
+      rbd_text3 = #{rbdText3,jdbcType=VARCHAR},
+      rbd_text4 = #{rbdText4,jdbcType=VARCHAR},
+      rbd_text5 = #{rbdText5,jdbcType=VARCHAR}
+    where rbd_id = #{rbdId,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 35 - 1
applications/money/money-server/src/main/resources/mapper/VerificationListMapper.xml

@@ -1,9 +1,43 @@
 <!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.VerificationListMapper" >
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Verification" >
+        <id column="vc_id" property="vc_id" jdbcType="INTEGER" />
+        <result column="vc_code" property="vc_code" jdbcType="VARCHAR" />
+        <result column="vc_kind" property="vc_kind" jdbcType="VARCHAR" />
+        <result column="vc_date" property="vc_date" jdbcType="TIMESTAMP" />
+        <result column="vc_vendid" property="vc_vendid" jdbcType="INTEGER" />
+        <result column="vc_vendcode" property="vc_vendcode" jdbcType="VARCHAR" />
+        <result column="vc_vendname" property="vc_vendname" jdbcType="VARCHAR" />
+        <result column="vc_custid" property="vc_custid" jdbcType="INTEGER" />
+        <result column="vc_custcode" property="vc_custcode" jdbcType="VARCHAR" />
+        <result column="vc_custname" property="vc_custname" jdbcType="VARCHAR" />
+        <result column="vc_turnvendid" property="vc_turnvendid" jdbcType="INTEGER" />
+        <result column="vc_turnvendcode" property="vc_turnvendcode" jdbcType="VARCHAR" />
+        <result column="vc_turnvendname" property="vc_turnvendname" jdbcType="VARCHAR" />
+        <result column="vc_turncustid" property="vc_turncustid" jdbcType="INTEGER" />
+        <result column="vc_turncustcode" property="vc_turncustcode" jdbcType="VARCHAR" />
+        <result column="vc_turncustname" property="vc_turncustname" jdbcType="VARCHAR" />
+        <result column="vc_amount1" property="vc_amount1" jdbcType="DOUBLE" />
+        <result column="vc_amount2" property="vc_amount2" jdbcType="DOUBLE" />
+        <result column="vc_recorderid" property="vc_recorderid" jdbcType="INTEGER" />
+        <result column="vc_recorder" property="vc_recorder" jdbcType="VARCHAR" />
+        <result column="vc_recorddate" property="vc_recorddate" jdbcType="TIMESTAMP" />
+        <result column="vc_status" property="vc_status" jdbcType="INTEGER" />
+        <result column="vc_statuscode" property="vc_statuscode" jdbcType="DECIMAL" />
+        <result column="vc_remark" property="vc_remark" jdbcType="VARCHAR" />
+        <result column="companyid" property="companyid" jdbcType="INTEGER" />
+        <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+        <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+        <result column="vc_text1" property="vc_text1" jdbcType="VARCHAR" />
+        <result column="vc_text2" property="vc_text2" jdbcType="VARCHAR" />
+        <result column="vc_text3" property="vc_text3" jdbcType="VARCHAR" />
+        <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
+        <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
+    </resultMap>
     <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.money.dto.VerificationReqDTO" resultMap="BaseResultMap">
         select  *  from verification left join verificationdet on vc_id=vd_vcid left join verificationdetail on vc_id=vcd_vcid
         <where>
             order by pu_id,pd_detno
         </where>
     </select>
-</mapper
+</mapper>

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

@@ -7,23 +7,8 @@ spring:
     user:
       name: admin
       password: select111***
-  rabbitmq:
-    host: 192.168.0.176
-    port: 5672
-    virtual-host: dev
-    username: saas
-    password: select123***
-  zipkin:
-    sender:
-      type: rabbit
-    locator:
-      discovery:
-        enabled: true
-  sleuth:
-    sampler:
-      probability: 1.0
   datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://192.168.253.12:3306/saas_account?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
@@ -46,7 +31,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
 server:
   port: 8580
   tomcat: