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

src/main/java/com/cool/bang/api/DataMatch.java

@@ -142,6 +142,7 @@ public class DataMatch {
         mySQLService.djTo();
     }
 
+
     /**
      * 退款（合同）
      */

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

@@ -3,6 +3,7 @@ package com.cool.bang.modules.mysql.domain;
 import com.cool.bang.common.util.DateUtil;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 public class FcTrade {
@@ -112,6 +113,7 @@ public class FcTrade {
 
     private String remark;
 
+    private Date createTime;
 
     public FcTrade(TradeInfo item, ProjectAccount projectAccount, Account account, BuildingAccount buildingAccount) {
         this.serialNumber = item.getSerialNumber();
@@ -133,9 +135,11 @@ public class FcTrade {
         this.amount = item.getAmount();
         if (null != item.getCode()) {
             String code = String.valueOf(item.getCode());
-            if (code.startsWith("1")) {
+            if (code.startsWith("1")) {//交款记账
                 this.type = 1;
-            } else if (code.startsWith("2")) {
+            } else if (code.startsWith("2")) {//退款记账
+                this.type = 2;
+            }else{//划拨记账 等
                 this.type = 2;
             }
         }
@@ -149,10 +153,13 @@ public class FcTrade {
         } else {
             this.transactionMode = 1;
         }
-
         this.transactionTime = null != item.getTransactionTime() ? DateUtil.dateToStr(item.getTransactionTime(), "yyyy-MM-dd") : null;
-        this.checkStatus = 1;
+        this.checkStatus = item.getCheckStatus();
         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.createTime = item.getCreateTime();
     }
 
 
@@ -331,4 +338,12 @@ public class FcTrade {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -3,10 +3,12 @@ package com.cool.bang.modules.mysql.domain;
 import com.cool.bang.modules.oracle.domain.po.TkInfo;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class Refund {
 
 
+    private Long id;
     /**
      * 业务编号
      */
@@ -130,6 +132,11 @@ public class Refund {
      */
     private Integer delFlag;
 
+    private String houseAddress;
+
+    private Date createTime;
+
+
 
     public Refund(TkInfo item, Org org, ProjectAccount projectAccount, Account account,ContractInfo contract,BuildingAccount buildingAccount) {
         this.businessNumber = item.getBusinessNumber();
@@ -155,6 +162,7 @@ public class Refund {
         }
         this.collectionName = item.getCollectionName();
         this.collectionAccount = item.getCollectionAccount();
+        this.collectionBank = item.getCollectionBank();
         this.signer = null;
         this.signerPhone = null;
         this.contractNumber = item.getHtBh();
@@ -165,6 +173,7 @@ public class Refund {
         //this.contractPrice = item.getHtZj();
         this.delFlag = 1;
         this.refundAmount = item.getMoney();
+        this.createTime = item.getSqsj();
     }
 
 
@@ -419,4 +428,28 @@ public class Refund {
     public void setAppropriationStatus(String appropriationStatus) {
         this.appropriationStatus = appropriationStatus;
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getHouseAddress() {
+        return houseAddress;
+    }
+
+    public void setHouseAddress(String houseAddress) {
+        this.houseAddress = houseAddress;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -33,6 +33,12 @@ public class TradeInfo {
 
     private String payType;
 
+    private Date undoeDate;
+
+    private String remark;
+
+    private Date createTime;
+
 
     public Long getId() {
         return id;
@@ -145,4 +151,28 @@ public class TradeInfo {
     public void setPayType(String payType) {
         this.payType = payType;
     }
+
+    public Date getUndoeDate() {
+        return undoeDate;
+    }
+
+    public void setUndoeDate(Date undoeDate) {
+        this.undoeDate = undoeDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -11,5 +11,5 @@ import java.util.List;
 public interface FWMapper {
 
 
-    P_lpb_fw getFwByMissid(@Param("fwbh") String fwbh);
+    P_lpb_fw getFwByMissid(@Param("fwbh") String fwbh,@Param("state")Integer state);
 }

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

@@ -58,7 +58,7 @@ public interface MySqlMapper {
 
     int insertEarnest(@Param("list") List<Earnest> earnests);
 
-    int insertRefund(@Param("list") List<Refund> refunds);
+    int insertRefund(Refund refund);
 
     ContractInfo getInfoByNumber(@Param("htBh") String htBh);
 

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

@@ -6,10 +6,7 @@ import com.cool.bang.modules.mysql.domain.flowPo.ApprovalFlow;
 import com.cool.bang.modules.mysql.domain.flowPo.ApprovalNode;
 import com.cool.bang.modules.mysql.domain.flowPo.ApprovalRecord;
 import com.cool.bang.modules.mysql.mapper.*;
-import com.cool.bang.modules.oracle.domain.Areg;
-import com.cool.bang.modules.oracle.domain.AregItem;
-import com.cool.bang.modules.oracle.domain.Bxmxy;
-import com.cool.bang.modules.oracle.domain.Trade;
+import com.cool.bang.modules.oracle.domain.*;
 import com.cool.bang.modules.oracle.domain.po.*;
 import com.cool.bang.modules.oracle.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +34,12 @@ public class MySQLSecondService {
     private OrgMapper qyxxMapper;
     @Autowired
     private AccountMapper accountMapper;
-    ;
+    @Autowired
+    private FlowMapper flowMapper;
+    @Autowired
+    private ApplyMapper applyMapper;
+    @Autowired
+    private FWMapper fwMapper;
     @Autowired
     private ProjectAccountMapper projectAccountMapper;
     @Autowired
@@ -50,8 +52,16 @@ public class MySQLSecondService {
     @Transactional
     public void refundTo() {
         System.out.println("===============fc_refund 导入数据开始=================");
+        // 获取结束节点
+        ApprovalFlow approvalFlow = flowMapper.selectFlowByType(6); //合同退款
+        ApprovalNode endNode = new ApprovalNode();
+        List<ApprovalNode> approvalNodeList = flowMapper.selectNodeByFlowNumber(approvalFlow.getFlowNumber());
+        for (ApprovalNode node : approvalNodeList) {
+            if (node.getNumber() == 4) {
+                endNode = node;
+            }
+        }
         List<TkInfo> htTkList = oracleMapper.selectHtTk();
-        List<Refund> refunds = new ArrayList<>();
         for (TkInfo item : htTkList) {
             Integer qybh = StringUtils.isEmpty(item.getQybh()) ? null : Integer.valueOf(item.getQybh());
             Org org = qyxxMapper.selectOrgByMisid(qybh);
@@ -84,9 +94,51 @@ public class MySQLSecondService {
             } else {
                 refund.setAppropriationStatus("1");
             }
-            refunds.add(refund);
+            // 如果是流程结束
+            if (item.getFLOWSTATE().equals("0")) {
+                refund.setBusinessState(3);
+            }
+            if (item.getFLOWSTATE().equals("1") ) {
+                refund.setBusinessState(2);
+            }
+            refund.setFlowNumber(approvalFlow.getFlowNumber());
+            refund.setFlowNodeId(endNode.getId());
+            refund.setFlowNodeName(endNode.getNodeName());
+            if(!StringUtils.isEmpty(item.getFWBH())){
+                P_lpb_fw fw = fwMapper.getFwByMissid(item.getFWBH(),null);
+                if(null != fw){
+                    refund.setHouseAddress(fw.getXxdz());
+                }
+            }
+            mySqlMapper.insertRefund(refund);
+
+            // 插入审批记录
+            List<ApprovalRecord> records = new ArrayList<>();
+            List<OracleApprovalRecord> oracleApprovalRecords =
+                    applyMapper.selectApprovalRecords_8(item.getAPPID());
+            if (oracleApprovalRecords != null && oracleApprovalRecords.size() > 0
+                    && oracleApprovalRecords.get(0) != null
+                    && !StringUtils.isEmpty(oracleApprovalRecords.get(0).getNodeName())) {
+                for (OracleApprovalRecord oracleApprovalRecord : oracleApprovalRecords) {
+                    ApprovalRecord record = new ApprovalRecord();
+                    record.setBusinessNumber(item.getBusinessNumber());
+                    record.setFlowNumber(approvalFlow.getFlowNumber());
+                    record.setNodeId(endNode.getId());
+                    if (!StringUtils.isEmpty(oracleApprovalRecord.getNodeName())) {
+                        record.setNodeName(oracleApprovalRecord.getNodeName());
+                    }
+                    record.setApprover(oracleApprovalRecord.getApprover());
+                    record.setApprovalTime(oracleApprovalRecord.getApprovalTime());
+                    record.setTableId(refund.getId());
+                    if (oracleApprovalRecord.getApprovalStatus() != null) {
+                        record.setApprovalStatus(1);
+                    }
+                    record.setApprovalRemark(oracleApprovalRecord.getRemark());
+                    records.add(record);
+                }
+                flowMapper.insertRecordBatch(records);
+            }
         }
-        mySqlMapper.insertRefund(refunds);
         System.out.println("===============fc_refund数据匹配结束=================");
     }
 

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

@@ -1199,7 +1199,7 @@ public class MySQLService {
             contract.setProjectName(project.getProjectName());
 
             // 查询房屋信息
-            P_lpb_fw fw = fwMapper.getFwByMissid(item.getFWBH());
+            P_lpb_fw fw = fwMapper.getFwByMissid(item.getFWBH(),1);
 
             // 查询交易表
             List<BhtTrade> bhtTrades = oracleMapper.getBhtPayTradeByBHTID(item.getHTID());

src/main/java/com/cool/bang/modules/oracle/domain/po/TkInfo.java

@@ -1,6 +1,7 @@
 package com.cool.bang.modules.oracle.domain.po;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class TkInfo {
 
@@ -28,6 +29,82 @@ public class TkInfo {
 
     private BigDecimal htZj;
 
+    private Long FLOWID;
+
+    private Long FLOWNODEID;
+
+    private String FLOWNODENAME;
+
+    private String FLOWSTATE;
+
+    private Integer APPID;
+
+    private String PAYEEBANKNAME;
+
+    private String PAYEE;
+
+    private String FWBH;
+
+    private String collectionBank;
+
+    private Date sqsj;
+
+
+    public String getPAYEEBANKNAME() {
+        return PAYEEBANKNAME;
+    }
+
+    public void setPAYEEBANKNAME(String PAYEEBANKNAME) {
+        this.PAYEEBANKNAME = PAYEEBANKNAME;
+    }
+
+    public String getPAYEE() {
+        return PAYEE;
+    }
+
+    public void setPAYEE(String PAYEE) {
+        this.PAYEE = PAYEE;
+    }
+
+    public String getFWBH() {
+        return FWBH;
+    }
+
+    public void setFWBH(String FWBH) {
+        this.FWBH = FWBH;
+    }
+
+    public Long getFLOWID() {
+        return FLOWID;
+    }
+
+    public void setFLOWID(Long FLOWID) {
+        this.FLOWID = FLOWID;
+    }
+
+    public Long getFLOWNODEID() {
+        return FLOWNODEID;
+    }
+
+    public void setFLOWNODEID(Long FLOWNODEID) {
+        this.FLOWNODEID = FLOWNODEID;
+    }
+
+    public String getFLOWNODENAME() {
+        return FLOWNODENAME;
+    }
+
+    public void setFLOWNODENAME(String FLOWNODENAME) {
+        this.FLOWNODENAME = FLOWNODENAME;
+    }
+
+    public String getFLOWSTATE() {
+        return FLOWSTATE;
+    }
+
+    public void setFLOWSTATE(String FLOWSTATE) {
+        this.FLOWSTATE = FLOWSTATE;
+    }
 
     public String getQybh() {
         return qybh;
@@ -125,4 +202,28 @@ public class TkInfo {
     public void setHtZj(BigDecimal htZj) {
         this.htZj = htZj;
     }
+
+    public Integer getAPPID() {
+        return APPID;
+    }
+
+    public void setAPPID(Integer APPID) {
+        this.APPID = APPID;
+    }
+
+    public String getCollectionBank() {
+        return collectionBank;
+    }
+
+    public void setCollectionBank(String collectionBank) {
+        this.collectionBank = collectionBank;
+    }
+
+    public Date getSqsj() {
+        return sqsj;
+    }
+
+    public void setSqsj(Date sqsj) {
+        this.sqsj = sqsj;
+    }
 }

src/main/java/com/cool/bang/modules/oracle/mapper/ApplyMapper.java

@@ -72,4 +72,6 @@ public interface ApplyMapper {
     List<OracleApprovalRecord> selectApprovalRecords_18_19(Integer appId);
 
     List<OracleApprovalRecord> selectApprovalRecords_6_7(Integer appId);
-}
+
+    List<OracleApprovalRecord> selectApprovalRecords_8(Integer appid);
+}

src/main/resources/application.yml

@@ -14,7 +14,8 @@ spring:
       zjjg-mysql:
         driver-class-name: com.mysql.cj.jdbc.Driver
 #       url: jdbc:mysql://192.168.0.199:3306/sg_zjjg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-        url: jdbc:mysql://localhost:3306/sg_zjjg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowMultiQueries=true
+#       url: jdbc:mysql://192.168.0.104/sg_zjjg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowMultiQueries=true
+        url: jdbc:mysql://localhost/sg_zjjg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowMultiQueries=true
         username: root
         password: 123456
         initial-size: 10
@@ -34,7 +35,7 @@ spring:
         stat-view-servlet.enabled: true
       yszj-oracle:
         driver-class-name: oracle.jdbc.driver.OracleDriver
-        url: jdbc:oracle:thin:@192.168.0.102:1521:orcl
+        url: jdbc:oracle:thin:@192.168.0.105:1521:orcl
         username: yszjjg
         password: zjjg
         initial-size: 1

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

@@ -5,7 +5,12 @@
     <select id="getFwByMissid" resultType="com.cool.bang.modules.mysql.domain.P_lpb_fw">
         select id,misid,xxdz,yt,yjzmj as jzmj
         from p_lpb_fw
-        where misid = #{fwbh} and state = 1
+        <where>
+            misid = #{fwbh}
+            <if test="state != null">
+                and state = #{state}
+            </if>
+        </where>
     </select>
 
 </mapper>

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

@@ -301,22 +301,21 @@
         </foreach>
     </insert>
 
-    <insert id="insertRefund">
+    <insert id="insertRefund" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into
         fc_refund
         (business_number,bank_code,contract_number,contract_id,contract_price,org_id,org_name,project_account_id,project_name,project_number,
         buyer,id_card,account_id,account_type,appropriation_bank,appropriation_account,collection_bank,collection_name,collection_account,
         refund_amount,signer,signer_phone,flow_number,flow_node_id,flow_node_name,business_state,appropriation_status,del_flag,
-        building_account_id,building_name)
+        building_account_id,building_name,house_address,create_time)
         values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.businessNumber},#{item.bankCode},#{item.contractNumber},#{item.contractId},#{item.contractPrice},#{item.orgId},
-            #{item.orgName},#{item.projectAccountId},#{item.projectName},#{item.projectNumber},#{item.buyer},#{item.idCard},
-            #{item.accountId},#{item.accountType},#{item.appropriationBank},#{item.appropriationAccount},#{item.collectionBank},
-            #{item.collectionName},#{item.collectionAccount},#{item.refundAmount},
-            #{item.signer},#{item.signerPhone},#{item.flowNumber},#{item.flowNodeId},#{item.flowNodeName},#{item.businessState},
-            #{item.appropriationStatus},#{item.delFlag},#{item.buildingAccountId},#{item.buildingName})
-        </foreach>
+            (#{businessNumber},#{bankCode},#{contractNumber},#{contractId},#{contractPrice},#{orgId},
+            #{orgName},#{projectAccountId},#{projectName},#{projectNumber},#{buyer},#{idCard},
+            #{accountId},#{accountType},#{appropriationBank},#{appropriationAccount},#{collectionBank},
+            #{collectionName},#{collectionAccount},#{refundAmount},
+            #{signer},#{signerPhone},#{flowNumber},#{flowNodeId},#{flowNodeName},#{businessState},
+            #{appropriationStatus},#{delFlag},#{buildingAccountId},#{buildingName},#{houseAddress},
+            #{createTime})
     </insert>
 
     <select id="getInfoByNumber" resultType="com.cool.bang.modules.mysql.domain.ContractInfo">
@@ -329,7 +328,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)
+        transaction_time, account_balance, reciprocal_account, check_status, check_date, is_flush, remark,del_flag,create_time)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.serialNumber}, #{item.flushSerialNumber}, #{item.businessNumber}, #{item.channelType},
@@ -338,7 +337,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.checkDate}, #{item.isFlush}, #{item.remark},#{item.delFlag},#{item.createTime})
         </foreach>
     </insert>
 

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

@@ -328,6 +328,20 @@
             t.apptype in (18, 19) and t.state = 1 and t2.state = 1 and t.appid = #{appId}
     </select>
 
+
+    <select id="selectApprovalRecords_8" resultType="com.cool.bang.modules.oracle.domain.OracleApprovalRecord">
+            select
+                t5.flownodename as nodeName,
+                t5.operatedate as approvalTime,
+                t5.operator as approver,
+                t5.remark as remark,
+                t5.state as approvalStatus
+            from apply t
+                     left join sflowlog t5 on t5.infoid = t.appid and t5.flowid = 6
+            where
+                t.apptype in (8) and t.state = 1  and t.appid = #{appId}
+    </select>
+
     <select id="selectApplyDetails_6_7" resultType="com.cool.bang.modules.oracle.domain.OracleAppropriationDetail">
         select
         t2.payaccountname as collectionName,

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

@@ -134,21 +134,51 @@
 
     <select id="selectHtTk" resultType="com.cool.bang.modules.oracle.domain.po.TkInfo">
         SELECT
-            a.APPBH,tr.TRADEAMOUNT AS money,it.PAYCODE AS businessNumber,ht.LZBH AS lzbh,ht.QYBH AS qybh,ht.HTBH AS htBh,a.APPID,tr.ACCOUNTNO AS accountNo,
-            it.PAYACCOUNTNAME AS collectionName,it.PAYACCOUNTNO AS collectionAccount,ht.BUYERNAME AS buyer,
-            ht.BUYERCODE AS idCard,ht.HTBH AS htBh,it.PAYUSE AS remark
-        FROM PAYITEM it
-                 LEFT JOIN APPLY a  ON it.APPID = a.APPID  AND a.STATE =1  AND a.APPTYPE = 8
-                 LEFT JOIN BHT ht ON ht.HTID = a.HTID
-                 LEFT JOIN TRADE tr ON tr.TRADENUM = it.PAYCODE AND tr.TRADESTATE = 1
-        WHERE it.STATE =1 AND it.PAYTYPE = 8   AND a.APPBH IS NOT NULL
+            a.APPBH,
+            it.PAYCODE,
+            tr.TRADEAMOUNT AS money,
+            it.PAYCODE AS businessNumber,
+            ht.LZBH AS lzbh,
+            ht.QYBH AS qybh,
+            ht.HTBH AS htBh,
+            a.APPID,
+            tr.ACCOUNTNO AS accountNo,
+            <!--收款账户  collection_name  收款户名-->
+            it.PAYACCOUNTNAME AS collectionName,
+            <!--收款银行名称   collection_bank 收款银行 -->
+            it.PAYEEBANKNAME AS collectionBank,
+            it.PAYEE,
+            <!-- 收款账号 -->
+            it.PAYACCOUNTNO AS collectionAccount,
+            ht.BUYERNAME AS buyer,
+            ht.BUYERCODE AS idCard,
+            ht.HTBH AS htBh,
+            it.PAYUSE AS remark,
+            t3.FWBH,
+            a.SQSJ AS sqsj,
+            a.FLOWID,
+            a.FLOWNODEID,
+            a.FLOWNODENAME,
+            a.FLOWSTATE
+        FROM
+            PAYITEM it
+                LEFT JOIN APPLY a ON it.APPID = a.APPID AND a.STATE = 1 AND a.APPTYPE = 8
+                LEFT JOIN BHT ht ON ht.HTID = a.HTID
+                left join BHTFW t2 ON  ht.HTID = t2.HTID and t2.STATE = 1
+                left join BFW t3 ON t3.FWID = t2.FWID and t3.STATE = 1
+                LEFT JOIN TRADE tr ON tr.TRADENUM = it.PAYCODE 	AND tr.TRADESTATE = 1
+        WHERE
+            it.STATE = 1
+          AND it.PAYTYPE = 8
+          AND a.APPBH IS NOT NULL
     </select>
 
     <select id="selectDDZ" resultType="com.cool.bang.modules.mysql.domain.TradeInfo">
         SELECT
             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,
-            CHECKFLAG AS checkStatus,CHECKDATE AS checkDate, 1 AS transactionMode,TRADEDATE AS  transactionTime,LZBH AS lzbh
+            0 AS checkStatus,CHECKDATE AS checkDate, 1 AS transactionMode,TRADEDATE AS  transactionTime,LZBH AS lzbh,
+            UNDOEDATE AS undoeDate,REMARK AS remark,TRADEDATE AS createTime
         from TRADE
         WHERE CHECKFLAG =1
     </select>
@@ -157,7 +187,8 @@
         SELECT
             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,
-            CHECKFLAG AS checkStatus,CHECKDATE AS checkDate, 1 AS transactionMode,TRADEDATE AS  transactionTime,LZBH AS lzbh
+            1 AS checkStatus,CHECKDATE AS checkDate, 1 AS transactionMode,TRADEDATE AS  transactionTime,LZBH AS lzbh,
+            UNDOEDATE AS undoeDate,REMARK AS remark,TRADEDATE AS createTime
         FROM
             trade
         WHERE