Merge branch 'master' of http://175.27.189.80:3000/souguang/sg_zjjg_sjqy

src/main/java/com/cool/bang/modules/mysql/domain/FcTrade.java

@@ -1,6 +1,7 @@
 package com.cool.bang.modules.mysql.domain;
 
 import com.cool.bang.common.util.DateUtil;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -115,6 +116,8 @@ public class FcTrade {
 
     private Date createTime;
 
+    private Date updateTime;
+
     public FcTrade(TradeInfo item, ProjectAccount projectAccount, Account account, BuildingAccount buildingAccount) {
         this.serialNumber = item.getSerialNumber();
         this.flushSerialNumber = item.getFlushSerialNumber();
@@ -139,7 +142,7 @@ public class FcTrade {
                 this.type = 1;
             } else if (code.startsWith("2")) {//退款记账
                 this.type = 2;
-            }else{//划拨记账 等
+            } else {//划拨记账 等
                 this.type = 2;
             }
         }
@@ -158,8 +161,9 @@ public class FcTrade {
         this.delFlag = 1;
         this.isFlush = null != item.getUndoeDate() ? 1 : 0;
         this.checkDate = null != item.getCheckDate() ? DateUtil.dateToStr(item.getCheckDate(), "yyyy-MM-dd") : null;
-        this.remark = item.getRemark();
+        this.remark = StringUtils.isEmpty(item.getRemark()) ? item.getTellErno() : item.getRemark();
         this.createTime = item.getCreateTime();
+        this.updateTime = item.getCreateTime();
     }
 
 
@@ -346,4 +350,12 @@ public class FcTrade {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 }

src/main/java/com/cool/bang/modules/mysql/domain/TradeInfo.java

@@ -39,6 +39,10 @@ public class TradeInfo {
 
     private Date createTime;
 
+    private Long aregId;
+
+    private String tellErno;
+
 
     public Long getId() {
         return id;
@@ -175,4 +179,20 @@ public class TradeInfo {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public Long getAregId() {
+        return aregId;
+    }
+
+    public void setAregId(Long aregId) {
+        this.aregId = aregId;
+    }
+
+    public String getTellErno() {
+        return tellErno;
+    }
+
+    public void setTellErno(String tellErno) {
+        this.tellErno = tellErno;
+    }
 }

src/main/java/com/cool/bang/modules/mysql/mapper/MySqlMapper.java

@@ -126,4 +126,10 @@ public interface MySqlMapper {
      */
     BigDecimal getAmountByBusinessNumber(@Param("businessNumber") String businessNumber);
 
+    /**
+     * 获取projectAccountId
+     * @param aregId
+     * @return
+     */
+    Long getProjectAccountIdByAregId(@Param("aregId") Long aregId);
 }

src/main/java/com/cool/bang/modules/mysql/service/MySQLSecondService.java

@@ -198,7 +198,10 @@ public class MySQLSecondService {
             }
 
             FcTrade fcTrade = new FcTrade(item, projectAccount, account, buildingAccount);
-
+            if (2 == fcTrade.getType()) {//支出的 projectAccountId
+                Long pAId = mySqlMapper.getProjectAccountIdByAregId(item.getAregId());
+                fcTrade.setProjectAccountId(pAId);
+            }
             fcTrades.add(fcTrade);
         }
         mySqlMapper.insertFcTrade(fcTrades);

src/main/resources/mapper/mysql/MySQLMapper.xml

@@ -325,7 +325,7 @@
         insert into
         fc_trade (serial_number, flush_serial_number, business_number, channel_type, channel_code, account_type,
         account, account_id, project_account_id, building_account_id, amount, type, transaction_mode,
-        transaction_time, account_balance, reciprocal_account, check_status, check_date, is_flush, remark,del_flag,create_time)
+        transaction_time, account_balance, reciprocal_account, check_status, check_date, is_flush, remark,del_flag,create_time,update_time)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.serialNumber}, #{item.flushSerialNumber}, #{item.businessNumber}, #{item.channelType},
@@ -334,7 +334,7 @@
             #{item.buildingAccountId}, #{item.amount},
             #{item.type}, #{item.transactionMode}, #{item.transactionTime}, #{item.accountBalance},
             #{item.reciprocalAccount}, #{item.checkStatus},
-            #{item.checkDate}, #{item.isFlush}, #{item.remark},#{item.delFlag},#{item.createTime})
+            #{item.checkDate}, #{item.isFlush}, #{item.remark},#{item.delFlag},#{item.createTime},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -422,4 +422,7 @@
         select IFNULL(SUM(amount),0) from  fc_trade where business_number = #{businessNumber}
     </select>
 
+    <select id="getProjectAccountIdByAregId" resultType="long">
+        select id from  fc_project_account where aregid = #{aregId} LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/oracle/OracleMapper.xml

@@ -188,7 +188,7 @@
             ID AS id,ACCOUNTNO AS accountNo,BANKSER AS serialNumber,OLDBANKSER AS flushSerialNumber,
             TRADENUM AS businessNumber,BANKFLAG AS channelType,TRADEAMOUNT AS amount,TRADECODE  AS code, PAYTYPE AS payType,
             1 AS checkStatus,CHECKDATE AS checkDate, 1 AS transactionMode,TRADEDATE AS  transactionTime,LZBH AS lzbh,
-            UNDOEDATE AS undoeDate,REMARK AS remark,TRADEDATE AS createTime
+            UNDOEDATE AS undoeDate,REMARK AS remark,TRADEDATE AS createTime,AREGID AS aregId,TELLERNO AS tellErno
         FROM
             trade
         WHERE