1.其他支出收入单前端对接

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

@@ -40,9 +40,9 @@ public enum  BillCodeSeq {
 
     VERIFICATION("核价单", "Verification"),
 
-    OTHRECEIPTS("其他收入单", "Otherceipts"),
+    OTHRECEIPTS("其他收入单", "OthReceipts"),
 
-    OTHSPENDINGS("其他收入单", "Otherceipts");
+    OTHSPENDINGS("其他收入单", "OthSpendings");
 
     BillCodeSeq(String name, String caller) {
         this.name = name;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/FundtransferController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/25 19:21
  **/
 @RestController
-@RequestMapping("/money/fundtransfer")
+@RequestMapping("/fundtransfer")
 public class FundtransferController {
     @Autowired
     private FundtransferService fundtransferService;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthreceiptsController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/24 17:26
  **/
 @RestController
-@RequestMapping("/money/othreceipts")
+@RequestMapping("/othreceipts")
 public class OthreceiptsController {
     @Autowired
     private OthreceiptsService othreceiptsService;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthspengdingsController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/24 22:15
  **/
 @RestController
-@RequestMapping("/money/othspengdings")
+@RequestMapping("/othspengdings")
 public class OthspengdingsController {
     @Autowired
     private OthspendingsService othspendingsService;

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/22 15:03
  **/
 @RestController
-@RequestMapping("/money/paybalance")
+@RequestMapping("/paybalance")
 public class PaybalanceController {
     @Autowired
     private PaybalanceService paybalanceService;

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * @date 2018/10/23 15:40
  **/
 @RestController
-@RequestMapping("/money/recbalance")
+@RequestMapping("/recbalance")
 public class RecbalanceContorller {
     @Autowired
     private RecbalanceService recbalanceService;

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

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.Fundtransfer;
+import com.usoftchina.saas.money.po.Othreceipts;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,4 +20,12 @@ public interface FundtransferMapper {
     int updateByPrimaryKeySelective(Fundtransfer record);
 
     int updateByPrimaryKey(Fundtransfer record);
+
+    Integer validateCodeWhenInsert(@Param("code") String code, @Param("companyId") Long companyId);
+
+    Integer validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id,
+                                   @Param("companyId") Long companyId);
+
+    List<Fundtransfer> selectFundtransferBycondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<Fundtransfer> selectFundtransferListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 }

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

@@ -2,6 +2,8 @@ package com.usoftchina.saas.money.mapper;
 
 import com.usoftchina.saas.money.po.Fundtransferdetail;
 
+import java.util.List;
+
 public interface FundtransferdetailMapper {
     int deleteByPrimaryKey(Integer ftdId);
     int deleteItem(int id);
@@ -10,7 +12,7 @@ public interface FundtransferdetailMapper {
 
     int insertSelective(Fundtransferdetail record);
 
-    Fundtransferdetail selectByPrimaryKey(Integer ftdId);
+    List<Fundtransferdetail> selectByPrimaryKey(Integer ftdId);
 
     int updateByPrimaryKeySelective(Fundtransferdetail record);
 

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

@@ -1,128 +1,102 @@
 package com.usoftchina.saas.money.po;
 
-import java.util.Date;
-
-public class Fundtransfer {
-    private Integer ftId;
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
-    private String ftCode;
+import java.io.Serializable;
+import java.util.Date;
 
-    private Date ftDate;
+public class Fundtransfer extends CommonBaseEntity implements Serializable {
 
-    private Integer ftRecorderid;
+    private String ft_code;
 
-    private String ftRecorder;
+    private Date ft_date;
 
-    private Date ftRecorddate;
+    private Integer ft_recorderid;
 
-    private String ftStatus;
+    private String ft_recorder;
 
-    private String ftStatuscode;
+    private Date ft_recorddate;
 
-    private String ftRemark;
+    private String ft_status;
 
-    private Integer companyid;
+    private String ft_statuscode;
 
-    private Integer updaterid;
+    private String ft_remark;
 
     private Date updatedate;
 
-    private String ftText1;
-
-    private String ftText2;
+    private String ft_text1;
 
-    private String ftText3;
+    private String ft_text2;
 
-    private String ftText4;
+    private String ft_text3;
 
-    private String ftText5;
-
-    public Integer getFtId() {
-        return ftId;
-    }
-
-    public void setFtId(Integer ftId) {
-        this.ftId = ftId;
-    }
+    private String ft_text4;
 
-    public String getFtCode() {
-        return ftCode;
-    }
-
-    public void setFtCode(String ftCode) {
-        this.ftCode = ftCode == null ? null : ftCode.trim();
-    }
-
-    public Date getFtDate() {
-        return ftDate;
-    }
-
-    public void setFtDate(Date ftDate) {
-        this.ftDate = ftDate;
-    }
+    private String ft_text5;
 
-    public Integer getFtRecorderid() {
-        return ftRecorderid;
+    public String getFt_code() {
+        return ft_code;
     }
 
-    public void setFtRecorderid(Integer ftRecorderid) {
-        this.ftRecorderid = ftRecorderid;
+    public void setFt_code(String ft_code) {
+        this.ft_code = ft_code;
     }
 
-    public String getFtRecorder() {
-        return ftRecorder;
+    public Date getFt_date() {
+        return ft_date;
     }
 
-    public void setFtRecorder(String ftRecorder) {
-        this.ftRecorder = ftRecorder == null ? null : ftRecorder.trim();
+    public void setFt_date(Date ft_date) {
+        this.ft_date = ft_date;
     }
 
-    public Date getFtRecorddate() {
-        return ftRecorddate;
+    public Integer getFt_recorderid() {
+        return ft_recorderid;
     }
 
-    public void setFtRecorddate(Date ftRecorddate) {
-        this.ftRecorddate = ftRecorddate;
+    public void setFt_recorderid(Integer ft_recorderid) {
+        this.ft_recorderid = ft_recorderid;
     }
 
-    public String getFtStatus() {
-        return ftStatus;
+    public String getFt_recorder() {
+        return ft_recorder;
     }
 
-    public void setFtStatus(String ftStatus) {
-        this.ftStatus = ftStatus == null ? null : ftStatus.trim();
+    public void setFt_recorder(String ft_recorder) {
+        this.ft_recorder = ft_recorder;
     }
 
-    public String getFtStatuscode() {
-        return ftStatuscode;
+    public Date getFt_recorddate() {
+        return ft_recorddate;
     }
 
-    public void setFtStatuscode(String ftStatuscode) {
-        this.ftStatuscode = ftStatuscode == null ? null : ftStatuscode.trim();
+    public void setFt_recorddate(Date ft_recorddate) {
+        this.ft_recorddate = ft_recorddate;
     }
 
-    public String getFtRemark() {
-        return ftRemark;
+    public String getFt_status() {
+        return ft_status;
     }
 
-    public void setFtRemark(String ftRemark) {
-        this.ftRemark = ftRemark == null ? null : ftRemark.trim();
+    public void setFt_status(String ft_status) {
+        this.ft_status = ft_status;
     }
 
-    public Integer getCompanyid() {
-        return companyid;
+    public String getFt_statuscode() {
+        return ft_statuscode;
     }
 
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
+    public void setFt_statuscode(String ft_statuscode) {
+        this.ft_statuscode = ft_statuscode;
     }
 
-    public Integer getUpdaterid() {
-        return updaterid;
+    public String getFt_remark() {
+        return ft_remark;
     }
 
-    public void setUpdaterid(Integer updaterid) {
-        this.updaterid = updaterid;
+    public void setFt_remark(String ft_remark) {
+        this.ft_remark = ft_remark;
     }
 
     public Date getUpdatedate() {
@@ -133,43 +107,43 @@ public class Fundtransfer {
         this.updatedate = updatedate;
     }
 
-    public String getFtText1() {
-        return ftText1;
+    public String getFt_text1() {
+        return ft_text1;
     }
 
-    public void setFtText1(String ftText1) {
-        this.ftText1 = ftText1 == null ? null : ftText1.trim();
+    public void setFt_text1(String ft_text1) {
+        this.ft_text1 = ft_text1;
     }
 
-    public String getFtText2() {
-        return ftText2;
+    public String getFt_text2() {
+        return ft_text2;
     }
 
-    public void setFtText2(String ftText2) {
-        this.ftText2 = ftText2 == null ? null : ftText2.trim();
+    public void setFt_text2(String ft_text2) {
+        this.ft_text2 = ft_text2;
     }
 
-    public String getFtText3() {
-        return ftText3;
+    public String getFt_text3() {
+        return ft_text3;
     }
 
-    public void setFtText3(String ftText3) {
-        this.ftText3 = ftText3 == null ? null : ftText3.trim();
+    public void setFt_text3(String ft_text3) {
+        this.ft_text3 = ft_text3;
     }
 
-    public String getFtText4() {
-        return ftText4;
+    public String getFt_text4() {
+        return ft_text4;
     }
 
-    public void setFtText4(String ftText4) {
-        this.ftText4 = ftText4 == null ? null : ftText4.trim();
+    public void setFt_text4(String ft_text4) {
+        this.ft_text4 = ft_text4;
     }
 
-    public String getFtText5() {
-        return ftText5;
+    public String getFt_text5() {
+        return ft_text5;
     }
 
-    public void setFtText5(String ftText5) {
-        this.ftText5 = ftText5 == null ? null : ftText5.trim();
+    public void setFt_text5(String ft_text5) {
+        this.ft_text5 = ft_text5;
     }
 }

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

@@ -1,178 +1,152 @@
 package com.usoftchina.saas.money.po;
 
-import java.util.Date;
-
-public class Fundtransferdetail {
-    private Integer ftdId;
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
-    private Integer ftdFtid;
+import java.io.Serializable;
+import java.util.Date;
 
-    private Integer ftdDetno;
+public class Fundtransferdetail extends CommonBaseEntity implements Serializable {
 
-    private Integer ftdYm;
+    private Integer ftd_ftid;
 
-    private Integer ftdBankid;
+    private Integer ftd_detno;
 
-    private String ftdBankcode;
+    private Integer ftd_ym;
 
-    private String ftdBankname;
+    private Integer ftd_bankid;
 
-    private Integer ftdInbankid;
+    private String ftd_bankcode;
 
-    private String ftdInbankcode;
+    private String ftd_bankname;
 
-    private String ftdInbankname;
+    private Integer ftd_inbankid;
 
-    private Double ftdNowbalance;
+    private String ftd_inbankcode;
 
-    private String ftdPaymethod;
+    private String ftd_inbankname;
 
-    private String ftdPaycode;
+    private Double ftd_nowbalance;
 
-    private String ftdRemark;
+    private String ftd_paymethod;
 
-    private Integer companyid;
+    private String ftd_paycode;
 
-    private Integer updaterid;
+    private String ftd_remark;
 
     private Date updatedate;
 
-    private String ftdText1;
-
-    private String ftdText2;
+    private String ftd_text1;
 
-    private String ftdText3;
+    private String ftd_text2;
 
-    private String ftdText4;
+    private String ftd_text3;
 
-    private String ftdText5;
-
-    public Integer getFtdId() {
-        return ftdId;
-    }
-
-    public void setFtdId(Integer ftdId) {
-        this.ftdId = ftdId;
-    }
+    private String ftd_text4;
 
-    public Integer getFtdFtid() {
-        return ftdFtid;
-    }
-
-    public void setFtdFtid(Integer ftdFtid) {
-        this.ftdFtid = ftdFtid;
-    }
-
-    public Integer getFtdDetno() {
-        return ftdDetno;
-    }
-
-    public void setFtdDetno(Integer ftdDetno) {
-        this.ftdDetno = ftdDetno;
-    }
+    private String ftd_text5;
 
-    public Integer getFtdYm() {
-        return ftdYm;
+    public Integer getFtd_ftid() {
+        return ftd_ftid;
     }
 
-    public void setFtdYm(Integer ftdYm) {
-        this.ftdYm = ftdYm;
+    public void setFtd_ftid(Integer ftd_ftid) {
+        this.ftd_ftid = ftd_ftid;
     }
 
-    public Integer getFtdBankid() {
-        return ftdBankid;
+    public Integer getFtd_detno() {
+        return ftd_detno;
     }
 
-    public void setFtdBankid(Integer ftdBankid) {
-        this.ftdBankid = ftdBankid;
+    public void setFtd_detno(Integer ftd_detno) {
+        this.ftd_detno = ftd_detno;
     }
 
-    public String getFtdBankcode() {
-        return ftdBankcode;
+    public Integer getFtd_ym() {
+        return ftd_ym;
     }
 
-    public void setFtdBankcode(String ftdBankcode) {
-        this.ftdBankcode = ftdBankcode == null ? null : ftdBankcode.trim();
+    public void setFtd_ym(Integer ftd_ym) {
+        this.ftd_ym = ftd_ym;
     }
 
-    public String getFtdBankname() {
-        return ftdBankname;
+    public Integer getFtd_bankid() {
+        return ftd_bankid;
     }
 
-    public void setFtdBankname(String ftdBankname) {
-        this.ftdBankname = ftdBankname == null ? null : ftdBankname.trim();
+    public void setFtd_bankid(Integer ftd_bankid) {
+        this.ftd_bankid = ftd_bankid;
     }
 
-    public Integer getFtdInbankid() {
-        return ftdInbankid;
+    public String getFtd_bankcode() {
+        return ftd_bankcode;
     }
 
-    public void setFtdInbankid(Integer ftdInbankid) {
-        this.ftdInbankid = ftdInbankid;
+    public void setFtd_bankcode(String ftd_bankcode) {
+        this.ftd_bankcode = ftd_bankcode;
     }
 
-    public String getFtdInbankcode() {
-        return ftdInbankcode;
+    public String getFtd_bankname() {
+        return ftd_bankname;
     }
 
-    public void setFtdInbankcode(String ftdInbankcode) {
-        this.ftdInbankcode = ftdInbankcode == null ? null : ftdInbankcode.trim();
+    public void setFtd_bankname(String ftd_bankname) {
+        this.ftd_bankname = ftd_bankname;
     }
 
-    public String getFtdInbankname() {
-        return ftdInbankname;
+    public Integer getFtd_inbankid() {
+        return ftd_inbankid;
     }
 
-    public void setFtdInbankname(String ftdInbankname) {
-        this.ftdInbankname = ftdInbankname == null ? null : ftdInbankname.trim();
+    public void setFtd_inbankid(Integer ftd_inbankid) {
+        this.ftd_inbankid = ftd_inbankid;
     }
 
-    public Double getFtdNowbalance() {
-        return ftdNowbalance;
+    public String getFtd_inbankcode() {
+        return ftd_inbankcode;
     }
 
-    public void setFtdNowbalance(Double ftdNowbalance) {
-        this.ftdNowbalance = ftdNowbalance;
+    public void setFtd_inbankcode(String ftd_inbankcode) {
+        this.ftd_inbankcode = ftd_inbankcode;
     }
 
-    public String getFtdPaymethod() {
-        return ftdPaymethod;
+    public String getFtd_inbankname() {
+        return ftd_inbankname;
     }
 
-    public void setFtdPaymethod(String ftdPaymethod) {
-        this.ftdPaymethod = ftdPaymethod == null ? null : ftdPaymethod.trim();
+    public void setFtd_inbankname(String ftd_inbankname) {
+        this.ftd_inbankname = ftd_inbankname;
     }
 
-    public String getFtdPaycode() {
-        return ftdPaycode;
+    public Double getFtd_nowbalance() {
+        return ftd_nowbalance;
     }
 
-    public void setFtdPaycode(String ftdPaycode) {
-        this.ftdPaycode = ftdPaycode == null ? null : ftdPaycode.trim();
+    public void setFtd_nowbalance(Double ftd_nowbalance) {
+        this.ftd_nowbalance = ftd_nowbalance;
     }
 
-    public String getFtdRemark() {
-        return ftdRemark;
+    public String getFtd_paymethod() {
+        return ftd_paymethod;
     }
 
-    public void setFtdRemark(String ftdRemark) {
-        this.ftdRemark = ftdRemark == null ? null : ftdRemark.trim();
+    public void setFtd_paymethod(String ftd_paymethod) {
+        this.ftd_paymethod = ftd_paymethod;
     }
 
-    public Integer getCompanyid() {
-        return companyid;
+    public String getFtd_paycode() {
+        return ftd_paycode;
     }
 
-    public void setCompanyid(Integer companyid) {
-        this.companyid = companyid;
+    public void setFtd_paycode(String ftd_paycode) {
+        this.ftd_paycode = ftd_paycode;
     }
 
-    public Integer getUpdaterid() {
-        return updaterid;
+    public String getFtd_remark() {
+        return ftd_remark;
     }
 
-    public void setUpdaterid(Integer updaterid) {
-        this.updaterid = updaterid;
+    public void setFtd_remark(String ftd_remark) {
+        this.ftd_remark = ftd_remark;
     }
 
     public Date getUpdatedate() {
@@ -183,43 +157,43 @@ public class Fundtransferdetail {
         this.updatedate = updatedate;
     }
 
-    public String getFtdText1() {
-        return ftdText1;
+    public String getFtd_text1() {
+        return ftd_text1;
     }
 
-    public void setFtdText1(String ftdText1) {
-        this.ftdText1 = ftdText1 == null ? null : ftdText1.trim();
+    public void setFtd_text1(String ftd_text1) {
+        this.ftd_text1 = ftd_text1;
     }
 
-    public String getFtdText2() {
-        return ftdText2;
+    public String getFtd_text2() {
+        return ftd_text2;
     }
 
-    public void setFtdText2(String ftdText2) {
-        this.ftdText2 = ftdText2 == null ? null : ftdText2.trim();
+    public void setFtd_text2(String ftd_text2) {
+        this.ftd_text2 = ftd_text2;
     }
 
-    public String getFtdText3() {
-        return ftdText3;
+    public String getFtd_text3() {
+        return ftd_text3;
     }
 
-    public void setFtdText3(String ftdText3) {
-        this.ftdText3 = ftdText3 == null ? null : ftdText3.trim();
+    public void setFtd_text3(String ftd_text3) {
+        this.ftd_text3 = ftd_text3;
     }
 
-    public String getFtdText4() {
-        return ftdText4;
+    public String getFtd_text4() {
+        return ftd_text4;
     }
 
-    public void setFtdText4(String ftdText4) {
-        this.ftdText4 = ftdText4 == null ? null : ftdText4.trim();
+    public void setFtd_text4(String ftd_text4) {
+        this.ftd_text4 = ftd_text4;
     }
 
-    public String getFtdText5() {
-        return ftdText5;
+    public String getFtd_text5() {
+        return ftd_text5;
     }
 
-    public void setFtdText5(String ftdText5) {
-        this.ftdText5 = ftdText5 == null ? null : ftdText5.trim();
+    public void setFtd_text5(String ftd_text5) {
+        this.ftd_text5 = ftd_text5;
     }
 }

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

@@ -216,4 +216,31 @@ public class Othreceipts extends CommonBaseEntity implements Serializable {
     public void setOr_text5(String or_text5) {
         this.or_text5 = or_text5;
     }
+
+    @Override
+    public String toString() {
+        return "Othreceipts{" +
+                "or_code='" + or_code + '\'' +
+                ", or_date=" + or_date +
+                ", or_custid=" + or_custid +
+                ", or_custcode='" + or_custcode + '\'' +
+                ", or_custname='" + or_custname + '\'' +
+                ", or_bankcode='" + or_bankcode + '\'' +
+                ", or_bankid=" + or_bankid +
+                ", or_bankname='" + or_bankname + '\'' +
+                ", or_amount=" + or_amount +
+                ", or_recorderid=" + or_recorderid +
+                ", or_recorder='" + or_recorder + '\'' +
+                ", or_recorddate=" + or_recorddate +
+                ", or_status='" + or_status + '\'' +
+                ", or_statuscode='" + or_statuscode + '\'' +
+                ", or_remark='" + or_remark + '\'' +
+                ", updatedate=" + updatedate +
+                ", or_text1='" + or_text1 + '\'' +
+                ", or_text2='" + or_text2 + '\'' +
+                ", or_text3='" + or_text3 + '\'' +
+                ", or_text4='" + or_text4 + '\'' +
+                ", or_text5='" + or_text5 + '\'' +
+                '}';
+    }
 }

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

@@ -32,7 +32,7 @@ public class FundtransferServiceImpl implements FundtransferService {
         Fundtransfer fundtransfer = fundtran.getMain();
         List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
 
-        if (fundtransfer.getFtId() > 0){
+        if (fundtransfer.getId() > 0){
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }else {
             fundtransferMapper.insert(fundtransfer);
@@ -52,7 +52,7 @@ public class FundtransferServiceImpl implements FundtransferService {
 
     @Override
     public void audit(Fundtran fundtran) {
-        int id = fundtran.getMain().getFtId();
+        int id = Math.toIntExact(fundtran.getMain().getId());
         Fundtransfer fundtransfer = fundtransferMapper.selectByPrimaryKey(id);
         if ( fundtransfer == null || "".equals(fundtransfer)){
             this.insert(fundtran);
@@ -64,9 +64,9 @@ public class FundtransferServiceImpl implements FundtransferService {
     @Override
     public void unAudit(int id) {
         Fundtransfer fundtransfer = new Fundtransfer();
-        fundtransfer.setFtId(id);
-        fundtransfer.setFtStatus(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
-        fundtransfer.setFtStatuscode(Status.UNAUDITED.name());
+        fundtransfer.setId(Long.valueOf(id));
+        fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
+        fundtransfer.setFt_statuscode(Status.UNAUDITED.name());
         fundtransferMapper.updateByPrimaryKey(fundtransfer);
     }
 

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

@@ -41,10 +41,14 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         Othreceipts othreceipts = othte.getMain();
         List<Othreceiptsdetail> othreceiptsdetail = othte.getItems();
 
+        System.out.println("oth:" + othreceipts);
+
         String or_code = othreceipts.getOr_code();
 
         //编号校验
         or_code = pushMaxnubmer(or_code, othreceipts.getId());
+
+        System.out.println("or_code" + or_code);
         //单号赋值
         othreceipts.setOr_code(or_code);
 
@@ -69,7 +73,7 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
                 othreceiptsdetailMapper.insertSelective(othreceiptsdetail1);
             }
         }
-        return new DocBaseDTO(id, or_code, BillCodeSeq.OTHERIN.getCaller());
+        return new DocBaseDTO(id, or_code, BillCodeSeq.OTHRECEIPTS.getCaller());
     }
 
 //    @Override

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

@@ -2,34 +2,34 @@
 <!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.FundtransferMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Fundtransfer" >
-    <id column="ft_id" property="ftId" jdbcType="INTEGER" />
-    <result column="ft_code" property="ftCode" jdbcType="VARCHAR" />
-    <result column="ft_date" property="ftDate" jdbcType="TIMESTAMP" />
-    <result column="ft_recorderid" property="ftRecorderid" jdbcType="INTEGER" />
-    <result column="ft_recorder" property="ftRecorder" jdbcType="VARCHAR" />
-    <result column="ft_recorddate" property="ftRecorddate" jdbcType="TIMESTAMP" />
-    <result column="ft_status" property="ftStatus" jdbcType="VARCHAR" />
-    <result column="ft_statuscode" property="ftStatuscode" jdbcType="VARCHAR" />
-    <result column="ft_remark" property="ftRemark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
-    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <id column="ft_id" property="id" jdbcType="INTEGER" />
+    <result column="ft_code" property="ft_code" jdbcType="VARCHAR" />
+    <result column="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
+    <result column="ft_recorderid" property="ft_recorderid" jdbcType="INTEGER" />
+    <result column="ft_recorder" property="ft_recorder" jdbcType="VARCHAR" />
+    <result column="ft_recorddate" property="ft_recorddate" jdbcType="TIMESTAMP" />
+    <result column="ft_status" property="ft_status" jdbcType="VARCHAR" />
+    <result column="ft_statuscode" property="ft_statuscode" jdbcType="VARCHAR" />
+    <result column="ft_remark" property="ft_remark" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
     <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
-    <result column="ft_text1" property="ftText1" jdbcType="VARCHAR" />
-    <result column="ft_text2" property="ftText2" jdbcType="VARCHAR" />
-    <result column="ft_text3" property="ftText3" jdbcType="VARCHAR" />
-    <result column="ft_text4" property="ftText4" jdbcType="VARCHAR" />
-    <result column="ft_text5" property="ftText5" jdbcType="VARCHAR" />
+    <result column="ft_text1" property="ft_text1" jdbcType="VARCHAR" />
+    <result column="ft_text2" property="ft_text2" jdbcType="VARCHAR" />
+    <result column="ft_text3" property="ft_text3" jdbcType="VARCHAR" />
+    <result column="ft_text4" property="ft_text4" jdbcType="VARCHAR" />
+    <result column="ft_text5" property="ft_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     ft_id, ft_code, ft_date, ft_recorderid, ft_recorder, ft_recorddate, ft_status, ft_statuscode, 
-    ft_remark, companyid, updaterId, updatedate, ft_text1, ft_text2, ft_text3, ft_text4, 
+    ft_remark, companyId, updaterId, updatedate, ft_text1, ft_text2, ft_text3, ft_text4, 
     ft_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from fundtransfer
-    where ft_id = #{ftId,jdbcType=INTEGER}
+    where ft_id = #{id,jdbcType=INTEGER}
   </select>
 
   <select id="selectList" resultMap="BaseResultMap" >
@@ -39,184 +39,181 @@
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from fundtransfer
-    where ft_id = #{ftId,jdbcType=INTEGER}
+    where ft_id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     insert into fundtransfer (ft_id, ft_code, ft_date, 
       ft_recorderid, ft_recorder, ft_recorddate, 
       ft_status, ft_statuscode, ft_remark, 
-      companyid, updaterId, updatedate, 
+      companyId, updaterId, updatedate, 
       ft_text1, ft_text2, ft_text3, 
       ft_text4, ft_text5)
     values (#{ftId,jdbcType=INTEGER}, #{ftCode,jdbcType=VARCHAR}, #{ftDate,jdbcType=TIMESTAMP}, 
       #{ftRecorderid,jdbcType=INTEGER}, #{ftRecorder,jdbcType=VARCHAR}, #{ftRecorddate,jdbcType=TIMESTAMP}, 
       #{ftStatus,jdbcType=VARCHAR}, #{ftStatuscode,jdbcType=VARCHAR}, #{ftRemark,jdbcType=VARCHAR}, 
-      #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{companyId,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, 
       #{ftText1,jdbcType=VARCHAR}, #{ftText2,jdbcType=VARCHAR}, #{ftText3,jdbcType=VARCHAR}, 
       #{ftText4,jdbcType=VARCHAR}, #{ftText5,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     insert into fundtransfer
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="ftId != null" >
-        ft_id,
-      </if>
-      <if test="ftCode != null" >
+      <if test="ft_code != null" >
         ft_code,
       </if>
-      <if test="ftDate != null" >
+      <if test="ft_date != null" >
         ft_date,
       </if>
-      <if test="ftRecorderid != null" >
+      <if test="ft_recorderid != null" >
         ft_recorderid,
       </if>
-      <if test="ftRecorder != null" >
+      <if test="ft_recorder != null" >
         ft_recorder,
       </if>
-      <if test="ftRecorddate != null" >
+      <if test="ft_recorddate != null" >
         ft_recorddate,
       </if>
-      <if test="ftStatus != null" >
+      <if test="ft_status != null" >
         ft_status,
       </if>
-      <if test="ftStatuscode != null" >
+      <if test="ft_statuscode != null" >
         ft_statuscode,
       </if>
-      <if test="ftRemark != null" >
+      <if test="ft_remark != null" >
         ft_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
-      <if test="updaterid != null" >
+      <if test="updaterId != null" >
         updaterId,
       </if>
       <if test="updatedate != null" >
         updatedate,
       </if>
-      <if test="ftText1 != null" >
+      <if test="ft_text1 != null" >
         ft_text1,
       </if>
-      <if test="ftText2 != null" >
+      <if test="ft_text2 != null" >
         ft_text2,
       </if>
-      <if test="ftText3 != null" >
+      <if test="ft_text3 != null" >
         ft_text3,
       </if>
-      <if test="ftText4 != null" >
+      <if test="ft_text4 != null" >
         ft_text4,
       </if>
-      <if test="ftText5 != null" >
+      <if test="ft_text5 != null" >
         ft_text5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="ftId != null" >
-        #{ftId,jdbcType=INTEGER},
+      <if test="ft_code != null" >
+        #{ft_code,jdbcType=VARCHAR},
       </if>
-      <if test="ftCode != null" >
-        #{ftCode,jdbcType=VARCHAR},
+      <if test="ft_date != null" >
+        #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftDate != null" >
-        #{ftDate,jdbcType=TIMESTAMP},
+      <if test="ft_recorderid != null" >
+        #{ft_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="ftRecorderid != null" >
-        #{ftRecorderid,jdbcType=INTEGER},
+      <if test="ft_recorder != null" >
+        #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ftRecorder != null" >
-        #{ftRecorder,jdbcType=VARCHAR},
+      <if test="ft_recorddate != null" >
+        #{ft_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftRecorddate != null" >
-        #{ftRecorddate,jdbcType=TIMESTAMP},
+      <if test="ft_status != null" >
+        #{ft_status,jdbcType=VARCHAR},
       </if>
-      <if test="ftStatus != null" >
-        #{ftStatus,jdbcType=VARCHAR},
+      <if test="ft_statuscode != null" >
+        #{ft_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="ftStatuscode != null" >
-        #{ftStatuscode,jdbcType=VARCHAR},
+      <if test="ft_remark != null" >
+        #{ft_remark,jdbcType=VARCHAR},
       </if>
-      <if test="ftRemark != null" >
-        #{ftRemark,jdbcType=VARCHAR},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="companyid != null" >
-        #{companyid,jdbcType=INTEGER},
-      </if>
-      <if test="updaterid != null" >
-        #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftText1 != null" >
-        #{ftText1,jdbcType=VARCHAR},
+      <if test="ft_text1 != null" >
+        #{ft_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftText2 != null" >
-        #{ftText2,jdbcType=VARCHAR},
+      <if test="ft_text2 != null" >
+        #{ft_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftText3 != null" >
-        #{ftText3,jdbcType=VARCHAR},
+      <if test="ft_text3 != null" >
+        #{ft_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftText4 != null" >
-        #{ftText4,jdbcType=VARCHAR},
+      <if test="ft_text4 != null" >
+        #{ft_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftText5 != null" >
-        #{ftText5,jdbcType=VARCHAR},
+      <if test="ft_text5 != null" >
+        #{ft_text5,jdbcType=VARCHAR},
       </if>
     </trim>
+    <selectKey resultType="Long" keyProperty="id" order="AFTER">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     update fundtransfer
     <set >
-      <if test="ftCode != null" >
-        ft_code = #{ftCode,jdbcType=VARCHAR},
+      <if test="ft_code != null" >
+        ft_code = #{ft_code,jdbcType=VARCHAR},
       </if>
-      <if test="ftDate != null" >
-        ft_date = #{ftDate,jdbcType=TIMESTAMP},
+      <if test="ft_date != null" >
+        ft_date = #{ft_date,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftRecorderid != null" >
-        ft_recorderid = #{ftRecorderid,jdbcType=INTEGER},
+      <if test="ft_recorderid != null" >
+        ft_recorderid = #{ft_recorderid,jdbcType=INTEGER},
       </if>
-      <if test="ftRecorder != null" >
-        ft_recorder = #{ftRecorder,jdbcType=VARCHAR},
+      <if test="ft_recorder != null" >
+        ft_recorder = #{ft_recorder,jdbcType=VARCHAR},
       </if>
-      <if test="ftRecorddate != null" >
-        ft_recorddate = #{ftRecorddate,jdbcType=TIMESTAMP},
+      <if test="ft_recorddate != null" >
+        ft_recorddate = #{ft_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftStatus != null" >
-        ft_status = #{ftStatus,jdbcType=VARCHAR},
+      <if test="ft_status != null" >
+        ft_status = #{ft_status,jdbcType=VARCHAR},
       </if>
-      <if test="ftStatuscode != null" >
-        ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
+      <if test="ft_statuscode != null" >
+        ft_statuscode = #{ft_statuscode,jdbcType=VARCHAR},
       </if>
-      <if test="ftRemark != null" >
-        ft_remark = #{ftRemark,jdbcType=VARCHAR},
+      <if test="ft_remark != null" >
+        ft_remark = #{ft_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 test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         updatedate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftText1 != null" >
-        ft_text1 = #{ftText1,jdbcType=VARCHAR},
+      <if test="ft_text1 != null" >
+        ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftText2 != null" >
-        ft_text2 = #{ftText2,jdbcType=VARCHAR},
+      <if test="ft_text2 != null" >
+        ft_text2 = #{ft_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftText3 != null" >
-        ft_text3 = #{ftText3,jdbcType=VARCHAR},
+      <if test="ft_text3 != null" >
+        ft_text3 = #{ft_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftText4 != null" >
-        ft_text4 = #{ftText4,jdbcType=VARCHAR},
+      <if test="ft_text4 != null" >
+        ft_text4 = #{ft_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftText5 != null" >
-        ft_text5 = #{ftText5,jdbcType=VARCHAR},
+      <if test="ft_text5 != null" >
+        ft_text5 = #{ft_text5,jdbcType=VARCHAR},
       </if>
     </set>
-    where ft_id = #{ftId,jdbcType=INTEGER}
+    where ft_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Fundtransfer" >
     update fundtransfer
@@ -228,7 +225,7 @@
       ft_status = #{ftStatus,jdbcType=VARCHAR},
       ft_statuscode = #{ftStatuscode,jdbcType=VARCHAR},
       ft_remark = #{ftRemark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterid,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       ft_text1 = #{ftText1,jdbcType=VARCHAR},
@@ -238,4 +235,40 @@
       ft_text5 = #{ftText5,jdbcType=VARCHAR}
     where ft_id = #{ftId,jdbcType=INTEGER}
   </update>
+
+  <select id="validateCodeWhenInsert" resultType="int">
+    select count(1) from fundtransfer where ft_code = #{code} and companyId =#{companyId}
+  </select>
+  <select id="validateCodeWhenUpdate" resultType="int" >
+    select count(1) from fundtransfer where ft_code = #{code} and ft_id != #{id} and companyId =#{companyId}
+  </select>
+
+  <select id="selectFundtransferBycondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from Fundtransfer
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and   Fundtransfer.companyId = #{companyId}
+      </if>
+    </where>  order by ft_id
+  </select>
+
+  <select id="selectFundtransferListByCondition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from fundtransfer
+    left join fundtransferdetail on ft_id=ftd_ftid
+    <where>
+      <if test="con != null">
+        ${con}
+      </if>
+      <if test="companyId != null">
+        and   fundtransfer.companyId = #{companyId}
+      </if>
+    </where>  order by ft_id
+  </select>
 </mapper>

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

@@ -2,48 +2,49 @@
 <!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.FundtransferdetailMapper" >
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.money.po.Fundtransferdetail" >
-    <id column="ftd_id" property="ftdId" jdbcType="INTEGER" />
-    <result column="ftd_ftid" property="ftdFtid" jdbcType="INTEGER" />
-    <result column="ftd_detno" property="ftdDetno" jdbcType="INTEGER" />
-    <result column="ftd_ym" property="ftdYm" jdbcType="INTEGER" />
-    <result column="ftd_bankid" property="ftdBankid" jdbcType="INTEGER" />
-    <result column="ftd_bankcode" property="ftdBankcode" jdbcType="VARCHAR" />
-    <result column="ftd_bankname" property="ftdBankname" jdbcType="VARCHAR" />
-    <result column="ftd_inbankid" property="ftdInbankid" jdbcType="INTEGER" />
-    <result column="ftd_inbankcode" property="ftdInbankcode" jdbcType="VARCHAR" />
-    <result column="ftd_inbankname" property="ftdInbankname" jdbcType="VARCHAR" />
-    <result column="ftd_nowbalance" property="ftdNowbalance" jdbcType="DOUBLE" />
-    <result column="ftd_paymethod" property="ftdPaymethod" jdbcType="VARCHAR" />
-    <result column="ftd_paycode" property="ftdPaycode" jdbcType="VARCHAR" />
-    <result column="ftd_remark" property="ftdRemark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
-    <result column="updaterId" property="updaterid" jdbcType="INTEGER" />
+    <id column="ftd_id" property="id" jdbcType="INTEGER" />
+    <result column="ftd_ftid" property="ftd_ftid" jdbcType="INTEGER" />
+    <result column="ftd_detno" property="ftd_detno" jdbcType="INTEGER" />
+    <result column="ftd_ym" property="ftd_ym" jdbcType="INTEGER" />
+    <result column="ftd_bankid" property="ftd_bankid" jdbcType="INTEGER" />
+    <result column="ftd_bankcode" property="ftd_bankcode" jdbcType="VARCHAR" />
+    <result column="ftd_bankname" property="ftd_bankname" jdbcType="VARCHAR" />
+    <result column="ftd_inbankid" property="ftd_inbankid" jdbcType="INTEGER" />
+    <result column="ftd_inbankcode" property="ftd_inbankcode" jdbcType="VARCHAR" />
+    <result column="ftd_inbankname" property="ftd_inbankname" jdbcType="VARCHAR" />
+    <result column="ftd_nowbalance" property="ftd_nowbalance" jdbcType="DOUBLE" />
+    <result column="ftd_paymethod" property="ftd_paymethod" jdbcType="VARCHAR" />
+    <result column="ftd_paycode" property="ftd_paycode" jdbcType="VARCHAR" />
+    <result column="ftd_remark" property="ftd_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="ftd_text1" property="ftdText1" jdbcType="VARCHAR" />
-    <result column="ftd_text2" property="ftdText2" jdbcType="VARCHAR" />
-    <result column="ftd_text3" property="ftdText3" jdbcType="VARCHAR" />
-    <result column="ftd_text4" property="ftdText4" jdbcType="VARCHAR" />
-    <result column="ftd_text5" property="ftdText5" jdbcType="VARCHAR" />
+    <result column="ftd_text1" property="ftd_text1" jdbcType="VARCHAR" />
+    <result column="ftd_text2" property="ftd_text2" jdbcType="VARCHAR" />
+    <result column="ftd_text3" property="ftd_text3" jdbcType="VARCHAR" />
+    <result column="ftd_text4" property="ftd_text4" jdbcType="VARCHAR" />
+    <result column="ftd_text5" property="ftd_text5" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     ftd_id, ftd_ftid, ftd_detno, ftd_ym, ftd_bankid, ftd_bankcode, ftd_bankname, ftd_inbankid, 
     ftd_inbankcode, ftd_inbankname, ftd_nowbalance, ftd_paymethod, ftd_paycode, ftd_remark, 
-    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
+    companyId, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from fundtransferdetail
-    where ftd_id = #{ftdId,jdbcType=INTEGER}
+    where ftd_id = #{id,jdbcType=INTEGER}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from fundtransferdetail
-    where ftd_id = #{ftdId,jdbcType=INTEGER}
+    where ftd_ftid = #{id,jdbcType=INTEGER}
   </delete>
 
   <delete id="deleteItem" parameterType="java.lang.Integer" >
     delete from fundtransferdetail
-    where ftd_ftid = #{ftdFtid,jdbcType=INTEGER}
+    where ftd_id = #{id,jdbcType=INTEGER}
   </delete>
 
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
@@ -51,7 +52,7 @@
       ftd_ym, ftd_bankid, ftd_bankcode, 
       ftd_bankname, ftd_inbankid, ftd_inbankcode, 
       ftd_inbankname, ftd_nowbalance, ftd_paymethod, 
-      ftd_paycode, ftd_remark, companyid, 
+      ftd_paycode, ftd_remark, companyId, 
       updaterId, updatedate, ftd_text1, 
       ftd_text2, ftd_text3, ftd_text4, 
       ftd_text5)
@@ -59,7 +60,7 @@
       #{ftdYm,jdbcType=INTEGER}, #{ftdBankid,jdbcType=INTEGER}, #{ftdBankcode,jdbcType=VARCHAR}, 
       #{ftdBankname,jdbcType=VARCHAR}, #{ftdInbankid,jdbcType=INTEGER}, #{ftdInbankcode,jdbcType=VARCHAR}, 
       #{ftdInbankname,jdbcType=VARCHAR}, #{ftdNowbalance,jdbcType=DOUBLE}, #{ftdPaymethod,jdbcType=VARCHAR}, 
-      #{ftdPaycode,jdbcType=VARCHAR}, #{ftdRemark,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, 
+      #{ftdPaycode,jdbcType=VARCHAR}, #{ftdRemark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}, 
       #{updaterid,jdbcType=INTEGER}, #{updatedate,jdbcType=TIMESTAMP}, #{ftdText1,jdbcType=VARCHAR}, 
       #{ftdText2,jdbcType=VARCHAR}, #{ftdText3,jdbcType=VARCHAR}, #{ftdText4,jdbcType=VARCHAR}, 
       #{ftdText5,jdbcType=VARCHAR})
@@ -67,210 +68,204 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
     insert into fundtransferdetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="ftdId != null" >
-        ftd_id,
-      </if>
-      <if test="ftdFtid != null" >
+      <if test="ftd_ftid != null" >
         ftd_ftid,
       </if>
-      <if test="ftdDetno != null" >
+      <if test="ftd_detno != null" >
         ftd_detno,
       </if>
-      <if test="ftdYm != null" >
+      <if test="ftd_ym != null" >
         ftd_ym,
       </if>
-      <if test="ftdBankid != null" >
+      <if test="ftd_bankid != null" >
         ftd_bankid,
       </if>
-      <if test="ftdBankcode != null" >
+      <if test="ftd_bankcode != null" >
         ftd_bankcode,
       </if>
-      <if test="ftdBankname != null" >
+      <if test="ftd_bankname != null" >
         ftd_bankname,
       </if>
-      <if test="ftdInbankid != null" >
+      <if test="ftd_inbankid != null" >
         ftd_inbankid,
       </if>
-      <if test="ftdInbankcode != null" >
+      <if test="ftd_inbankcode != null" >
         ftd_inbankcode,
       </if>
-      <if test="ftdInbankname != null" >
+      <if test="ftd_inbankname != null" >
         ftd_inbankname,
       </if>
-      <if test="ftdNowbalance != null" >
+      <if test="ftd_nowbalance != null" >
         ftd_nowbalance,
       </if>
-      <if test="ftdPaymethod != null" >
+      <if test="ftd_paymethod != null" >
         ftd_paymethod,
       </if>
-      <if test="ftdPaycode != null" >
+      <if test="ftd_paycode != null" >
         ftd_paycode,
       </if>
-      <if test="ftdRemark != null" >
+      <if test="ftd_remark != null" >
         ftd_remark,
       </if>
-      <if test="companyid != null" >
-        companyid,
+      <if test="companyId != null" >
+        companyId,
       </if>
-      <if test="updaterid != null" >
+      <if test="updaterId != null" >
         updaterId,
       </if>
       <if test="updatedate != null" >
         updatedate,
       </if>
-      <if test="ftdText1 != null" >
+      <if test="ftd_text1 != null" >
         ftd_text1,
       </if>
-      <if test="ftdText2 != null" >
+      <if test="ftd_text2 != null" >
         ftd_text2,
       </if>
-      <if test="ftdText3 != null" >
+      <if test="ftd_text3 != null" >
         ftd_text3,
       </if>
-      <if test="ftdText4 != null" >
+      <if test="ftd_text4 != null" >
         ftd_text4,
       </if>
-      <if test="ftdText5 != null" >
+      <if test="ftd_text5 != null" >
         ftd_text5,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="ftdId != null" >
-        #{ftdId,jdbcType=INTEGER},
-      </if>
-      <if test="ftdFtid != null" >
-        #{ftdFtid,jdbcType=INTEGER},
+      <if test="ftd_ftid != null" >
+        #{ftd_ftid,jdbcType=INTEGER},
       </if>
-      <if test="ftdDetno != null" >
-        #{ftdDetno,jdbcType=INTEGER},
+      <if test="ftd_detno != null" >
+        #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftdYm != null" >
-        #{ftdYm,jdbcType=INTEGER},
+      <if test="ftd_ym != null" >
+        #{ftd_ym,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankid != null" >
-        #{ftdBankid,jdbcType=INTEGER},
+      <if test="ftd_bankid != null" >
+        #{ftd_bankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankcode != null" >
-        #{ftdBankcode,jdbcType=VARCHAR},
+      <if test="ftd_bankcode != null" >
+        #{ftd_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdBankname != null" >
-        #{ftdBankname,jdbcType=VARCHAR},
+      <if test="ftd_bankname != null" >
+        #{ftd_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankid != null" >
-        #{ftdInbankid,jdbcType=INTEGER},
+      <if test="ftd_inbankid != null" >
+        #{ftd_inbankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdInbankcode != null" >
-        #{ftdInbankcode,jdbcType=VARCHAR},
+      <if test="ftd_inbankcode != null" >
+        #{ftd_inbankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankname != null" >
-        #{ftdInbankname,jdbcType=VARCHAR},
+      <if test="ftd_inbankname != null" >
+        #{ftd_inbankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdNowbalance != null" >
-        #{ftdNowbalance,jdbcType=DOUBLE},
+      <if test="ftd_nowbalance != null" >
+        #{ftd_nowbalance,jdbcType=DOUBLE},
       </if>
-      <if test="ftdPaymethod != null" >
-        #{ftdPaymethod,jdbcType=VARCHAR},
+      <if test="ftd_paymethod != null" >
+        #{ftd_paymethod,jdbcType=VARCHAR},
       </if>
-      <if test="ftdPaycode != null" >
-        #{ftdPaycode,jdbcType=VARCHAR},
+      <if test="ftd_paycode != null" >
+        #{ftd_paycode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdRemark != null" >
-        #{ftdRemark,jdbcType=VARCHAR},
+      <if test="ftd_remark != null" >
+        #{ftd_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},
+      <if test="updaterId != null" >
+        #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftdText1 != null" >
-        #{ftdText1,jdbcType=VARCHAR},
+      <if test="ftd_text1 != null" >
+        #{ftd_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText2 != null" >
-        #{ftdText2,jdbcType=VARCHAR},
+      <if test="ftd_text2 != null" >
+        #{ftd_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText3 != null" >
-        #{ftdText3,jdbcType=VARCHAR},
+      <if test="ftd_text3 != null" >
+        #{ftd_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText4 != null" >
-        #{ftdText4,jdbcType=VARCHAR},
+      <if test="ftd_text4 != null" >
+        #{ftd_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText5 != null" >
-        #{ftdText5,jdbcType=VARCHAR},
+      <if test="ftd_text5 != null" >
+        #{ftd_text5,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
     update fundtransferdetail
     <set >
-      <if test="ftdFtid != null" >
-        ftd_ftid = #{ftdFtid,jdbcType=INTEGER},
+      <if test="ftd_ftid != null" >
+        ftd_ftid = #{ftd_ftid,jdbcType=INTEGER},
       </if>
-      <if test="ftdDetno != null" >
-        ftd_detno = #{ftdDetno,jdbcType=INTEGER},
+      <if test="ftd_detno != null" >
+        ftd_detno = #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftdYm != null" >
-        ftd_ym = #{ftdYm,jdbcType=INTEGER},
+      <if test="ftd_ym != null" >
+        ftd_ym = #{ftd_ym,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankid != null" >
-        ftd_bankid = #{ftdBankid,jdbcType=INTEGER},
+      <if test="ftd_bankid != null" >
+        ftd_bankid = #{ftd_bankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdBankcode != null" >
-        ftd_bankcode = #{ftdBankcode,jdbcType=VARCHAR},
+      <if test="ftd_bankcode != null" >
+        ftd_bankcode = #{ftd_bankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdBankname != null" >
-        ftd_bankname = #{ftdBankname,jdbcType=VARCHAR},
+      <if test="ftd_bankname != null" >
+        ftd_bankname = #{ftd_bankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankid != null" >
-        ftd_inbankid = #{ftdInbankid,jdbcType=INTEGER},
+      <if test="ftd_inbankid != null" >
+        ftd_inbankid = #{ftd_inbankid,jdbcType=INTEGER},
       </if>
-      <if test="ftdInbankcode != null" >
-        ftd_inbankcode = #{ftdInbankcode,jdbcType=VARCHAR},
+      <if test="ftd_inbankcode != null" >
+        ftd_inbankcode = #{ftd_inbankcode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdInbankname != null" >
-        ftd_inbankname = #{ftdInbankname,jdbcType=VARCHAR},
+      <if test="ftd_inbankname != null" >
+        ftd_inbankname = #{ftd_inbankname,jdbcType=VARCHAR},
       </if>
-      <if test="ftdNowbalance != null" >
-        ftd_nowbalance = #{ftdNowbalance,jdbcType=DOUBLE},
+      <if test="ftd_nowbalance != null" >
+        ftd_nowbalance = #{ftd_nowbalance,jdbcType=DOUBLE},
       </if>
-      <if test="ftdPaymethod != null" >
-        ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
+      <if test="ftd_paymethod != null" >
+        ftd_paymethod = #{ftd_paymethod,jdbcType=VARCHAR},
       </if>
-      <if test="ftdPaycode != null" >
-        ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
+      <if test="ftd_paycode != null" >
+        ftd_paycode = #{ftd_paycode,jdbcType=VARCHAR},
       </if>
-      <if test="ftdRemark != null" >
-        ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
+      <if test="ftd_remark != null" >
+        ftd_remark = #{ftd_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 test="updaterId != null" >
+        updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
       <if test="updatedate != null" >
         updatedate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="ftdText1 != null" >
-        ftd_text1 = #{ftdText1,jdbcType=VARCHAR},
+      <if test="ftd_text1 != null" >
+        ftd_text1 = #{ftd_text1,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText2 != null" >
-        ftd_text2 = #{ftdText2,jdbcType=VARCHAR},
+      <if test="ftd_text2 != null" >
+        ftd_text2 = #{ftd_text2,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText3 != null" >
-        ftd_text3 = #{ftdText3,jdbcType=VARCHAR},
+      <if test="ftd_text3 != null" >
+        ftd_text3 = #{ftd_text3,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText4 != null" >
-        ftd_text4 = #{ftdText4,jdbcType=VARCHAR},
+      <if test="ftd_text4 != null" >
+        ftd_text4 = #{ftd_text4,jdbcType=VARCHAR},
       </if>
-      <if test="ftdText5 != null" >
-        ftd_text5 = #{ftdText5,jdbcType=VARCHAR},
+      <if test="ftd_text5 != null" >
+        ftd_text5 = #{ftd_text5,jdbcType=VARCHAR},
       </if>
     </set>
-    where ftd_id = #{ftdId,jdbcType=INTEGER}
+    where ftd_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
     update fundtransferdetail
@@ -287,7 +282,7 @@
       ftd_paymethod = #{ftdPaymethod,jdbcType=VARCHAR},
       ftd_paycode = #{ftdPaycode,jdbcType=VARCHAR},
       ftd_remark = #{ftdRemark,jdbcType=VARCHAR},
-      companyid = #{companyid,jdbcType=INTEGER},
+      companyId = #{companyId,jdbcType=INTEGER},
       updaterId = #{updaterid,jdbcType=INTEGER},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       ftd_text1 = #{ftdText1,jdbcType=VARCHAR},