1.资金模块计算期间

2.添加更新时间

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

@@ -13,6 +13,8 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
 
     private Integer ftd_ym;
 
+    private Date ft_date;
+
     private Integer ftd_bankid;
 
     private String ftd_bankcode;
@@ -45,6 +47,14 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
 
     private String ftd_text5;
 
+    public Date getFt_date() {
+        return ft_date;
+    }
+
+    public void setFt_date(Date ft_date) {
+        this.ft_date = ft_date;
+    }
+
     public Integer getFtd_ftid() {
         return ftd_ftid;
     }

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

@@ -12,6 +12,7 @@ public class Othreceiptsdetail extends CommonBaseEntity implements Serializable
     private Integer ord_detno;
 
     private Integer ord_ym;
+    private Date or_date;
 
     private String ord_type;
 
@@ -31,6 +32,14 @@ public class Othreceiptsdetail extends CommonBaseEntity implements Serializable
 
     private String ord_text5;
 
+    public Date getOr_date() {
+        return or_date;
+    }
+
+    public void setOr_date(Date or_date) {
+        this.or_date = or_date;
+    }
+
     public Integer getOrd_orid() {
         return ord_orid;
     }

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

@@ -13,6 +13,8 @@ public class Othspendingsdetail extends CommonBaseEntity implements Serializable
 
     private Integer osd_ym;
 
+    private Date os_date;
+
     private String osd_type;
 
     private Double osd_nowbalance;
@@ -31,6 +33,14 @@ public class Othspendingsdetail extends CommonBaseEntity implements Serializable
 
     private String osd_text5;
 
+    public Date getOs_date() {
+        return os_date;
+    }
+
+    public void setOs_date(Date os_date) {
+        this.os_date = os_date;
+    }
+
     public Integer getOsd_orid() {
         return osd_orid;
     }

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

@@ -92,9 +92,15 @@ public class FundtransferServiceImpl implements FundtransferService {
             this.insert(fundtran);
         }else {
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
+            List<Fundtransferdetail> fundtransferdetailList = fundtran.getItems();
+            Iterator isList = fundtransferdetailList.iterator();
+            while (isList.hasNext()){
+                Fundtransferdetail fundtransferdetail = (Fundtransferdetail) isList.next();
+                fundtransferdetail.setFt_date(fundtransfer.getFt_date());
+                fundtransferdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
+            }
         }
 
-
         //取从表金额
         List<Fundtransferdetail> fundtransferdetailList = fundtran.getItems();
         Iterator isList = fundtransferdetailList.iterator();

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

@@ -14,7 +14,10 @@ import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsdetailMapper;
-import com.usoftchina.saas.money.po.*;
+import com.usoftchina.saas.money.po.Banksubledger;
+import com.usoftchina.saas.money.po.Othreceipts;
+import com.usoftchina.saas.money.po.Othreceiptsdetail;
+import com.usoftchina.saas.money.po.Othte;
 import com.usoftchina.saas.money.service.OthreceiptsService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,6 +96,13 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             this.insert(othte);
         }else {
             othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+            List<Othreceiptsdetail> othreceiptsdetailList = othte.getItems();
+            Iterator isList = othreceiptsdetailList.iterator();
+            while (isList.hasNext()){
+                Othreceiptsdetail fundtransferdetail = (Othreceiptsdetail) isList.next();
+                fundtransferdetail.setOr_date(othreceipts.getOr_date());
+                othreceiptsdetailMapper.updateByPrimaryKeySelective(fundtransferdetail);
+            }
         }
 
         Double amount = banksubledgerMapper.selectThisamount(othreceipts.getOr_bankcode());

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

@@ -11,8 +11,13 @@ import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.money.mapper.*;
-import com.usoftchina.saas.money.po.*;
+import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
+import com.usoftchina.saas.money.mapper.OthspendingsMapper;
+import com.usoftchina.saas.money.mapper.OthspendingsdetailMapper;
+import com.usoftchina.saas.money.po.Banksubledger;
+import com.usoftchina.saas.money.po.Othsp;
+import com.usoftchina.saas.money.po.Othspendings;
+import com.usoftchina.saas.money.po.Othspendingsdetail;
 import com.usoftchina.saas.money.service.OthspendingsService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,6 +126,13 @@ public class OthspendingsServiceImpl implements OthspendingsService {
             this.insert(othsp);
         }else {
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
+            List<Othspendingsdetail> othspendingsdetailList = othsp.getItems();
+            Iterator isList = othspendingsdetailList.iterator();
+            while (isList.hasNext()){
+                Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isList.next();
+                othspendingsdetail.setOs_date(othspendings.getOs_date());
+                othspendingsdetailMapper.updateByPrimaryKeySelective(othspendingsdetail);
+            }
         }
 
         Double amount = banksubledgerMapper.selectThisamount(othspendings.getOs_bankcode());

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

@@ -88,7 +88,6 @@
       <if test="updaterId != null" >
         updaterId,
       </if>
-        updatedate,
       <if test="ft_text1 != null" >
         ft_text1,
       </if>
@@ -136,7 +135,6 @@
       <if test="updaterId != null" >
         #{updaterId,jdbcType=INTEGER},
       </if>
-        #{now(),jdbcType=TIMESTAMP},
       <if test="ft_text1 != null" >
         #{ft_text1,jdbcType=VARCHAR},
       </if>
@@ -190,9 +188,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="ft_text1 != null" >
         ft_text1 = #{ft_text1,jdbcType=VARCHAR},
       </if>

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

@@ -6,6 +6,7 @@
     <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="ft_date" property="ft_date" jdbcType="TIMESTAMP" />
     <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" />
@@ -207,8 +208,8 @@
       <if test="ftd_detno != null" >
         ftd_detno = #{ftd_detno,jdbcType=INTEGER},
       </if>
-      <if test="ftd_ym != null" >
-        ftd_ym = to_char(#{ftd_ym,jdbcType=INTEGER},'yyyymm'),
+      <if test="ft_date != null" >
+        ftd_ym = CONVERT(date_format(#{ft_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="ftd_bankid != null" >
         ftd_bankid = #{ftd_bankid,jdbcType=INTEGER},
@@ -246,9 +247,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+        updatedate = now(),
       <if test="ftd_text1 != null" >
         ftd_text1 = #{ftd_text1,jdbcType=VARCHAR},
       </if>

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

@@ -272,9 +272,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="or_text1 != null" >
         or_text1 = #{or_text1,jdbcType=VARCHAR},
       </if>

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

@@ -6,6 +6,7 @@
     <result column="ord_orid" property="ord_orid" jdbcType="INTEGER" />
     <result column="ord_detno" property="ord_detno" jdbcType="INTEGER" />
     <result column="ord_ym" property="ord_ym" jdbcType="INTEGER" />
+    <result column="or_date" property="or_date" jdbcType="TIMESTAMP" />
     <result column="ord_type" property="ord_type" jdbcType="VARCHAR" />
     <result column="ord_nowbalance" property="ord_nowbalance" jdbcType="DOUBLE" />
     <result column="ord_remark" property="ord_remark" jdbcType="VARCHAR" />
@@ -149,8 +150,8 @@
       <if test="ord_detno != null" >
         ord_detno = #{ord_detno,jdbcType=INTEGER},
       </if>
-      <if test="ord_ym != null" >
-        ord_ym = to_char(#{ord_ym,jdbcType=INTEGER},'yyyymm'),
+      <if test="or_date != null" >
+        ord_ym = CONVERT(date_format(#{or_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="ord_type != null" >
         ord_type = #{ord_type,jdbcType=VARCHAR},

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

@@ -266,9 +266,7 @@
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatedate != null" >
-        updatedate = #{updatedate,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="os_text1 != null" >
         os_text1 = #{os_text1,jdbcType=VARCHAR},
       </if>

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

@@ -6,6 +6,7 @@
     <result column="osd_orid" property="osd_orid" jdbcType="INTEGER" />
     <result column="osd_detno" property="osd_detno" jdbcType="INTEGER" />
     <result column="osd_ym" property="osd_ym" jdbcType="INTEGER" />
+    <result column="os_date" property="os_date" jdbcType="TIMESTAMP" />
     <result column="osd_type" property="osd_type" jdbcType="VARCHAR" />
     <result column="osd_nowbalance" property="osd_nowbalance" jdbcType="DOUBLE" />
     <result column="osd_remark" property="osd_remark" jdbcType="VARCHAR" />
@@ -155,8 +156,8 @@
       <if test="osd_detno != null" >
         osd_detno = #{osd_detno,jdbcType=INTEGER},
       </if>
-      <if test="osd_ym != null" >
-        osd_ym = to_char(#{osd_ym,jdbcType=INTEGER}, 'yyyymm'),
+      <if test="os_date != null" >
+        osd_ym = CONVERT(date_format(#{os_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="osd_type != null" >
         osd_type = #{osd_type,jdbcType=VARCHAR},

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

@@ -374,9 +374,7 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        updatedate = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="pb_text1 != null">
         pb_text1 = #{pb_text1,jdbcType=VARCHAR},
       </if>

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

@@ -536,9 +536,7 @@
       <if test="updaterId != null">
         updaterId = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updateTime != null">
-        updatedate = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
+      updatedate = now(),
       <if test="rb_text1 != null">
         rb_text1 = #{rb_text1,jdbcType=VARCHAR},
       </if>