2 Incheckningar 289db170a2 ... 1ac81042f7

Upphovsman SHA1 Meddelande Datum
  171250443 1ac81042f7 Merge branch 'master' of http://175.27.189.80:3000/souguang/sg_zjjg_sjqy 1 år sedan
  171250443 30a2b2c82a no message 1 år sedan

+ 4 - 4
src/main/java/com/cool/bang/api/DataMatch.java

@@ -155,10 +155,10 @@ public class DataMatch {
     /**
      * 交易 待对账
      */
-    @GetMapping("tradeDDZTo")
-    public void tradeDDZTo(){
-        mySQLSecondService.tradeDDZTo();
-    }
+//    @GetMapping("tradeDDZTo")
+//    public void tradeDDZTo(){
+//        mySQLSecondService.tradeDDZTo();
+//    }
 
     /**
      * 交易 托管

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

@@ -18,7 +18,7 @@ public interface MySqlMapper {
      */
     int insertSuperviseBusiness(@Param("list") List<SuperviseBusiness> superviseBusinessList);
 
-    int insertSuperviseRelieve(@Param("list") String bankAccount);
+    int insertSuperviseRelieve(SuperviseRelieve superviseRelieve);
 
     int insertSuperviseTo(SuperviseTo superviseTo);
 

+ 3 - 2
src/main/java/com/cool/bang/modules/mysql/service/MySQLService.java

@@ -502,10 +502,10 @@ public class MySQLService {
             List<OracleAccount> oracleAccounts = applyMapper.selectRelieveSuperviseAccount(oracleRelieve.getAppId());
 
             for (OracleAccount oracleAccount : oracleAccounts) {
-                if (oracleAccount != null && StringUtils.isEmpty(oracleAccount.getAccount())) {
+                if (oracleAccount != null && !StringUtils.isEmpty(oracleAccount.getAccount())) {
                     Account account = accountMapper.selectByAccountNO(oracleAccount.getAccount());
                     SuperviseRelieve superviseRelieve = new SuperviseRelieve(account, org, project, oracleRelieve);
-                    mySqlMapper.insertSuperviseRelieve(oracleAccount.getAccount());
+                    mySqlMapper.insertSuperviseRelieve(superviseRelieve);
                     // 更新账户解除日期
                     accountMapper.updateCancelDate(account.getId(), superviseRelieve.getUpdateTime());
                 }
@@ -1004,6 +1004,7 @@ public class MySQLService {
             Appropriation appropriation = new Appropriation();
 
             // 拨付明细
+            System.out.println("======" + oracleAppropriation.getAppId());
             List<OracleAppropriationDetail> oracleAppropriationDetails =
                     applyMapper.selectApplyDetails_6_7(oracleAppropriation.getAppId());
 

+ 5 - 8
src/main/resources/mapper/mysql/MySQLMapper.xml

@@ -20,18 +20,15 @@
     </insert>
 
     <!--  插入监管解除申请业务表数据  -->
-    <insert id="insertSuperviseRelieve">
+    <insert id="insertSuperviseRelieve" parameterType="com.cool.bang.modules.mysql.domain.SuperviseRelieve">
         insert into
         fc_supervise_relieve (id, business_number, account_id, name, account, org_id, org_name, bank_code, bank_name,
         account_open_address, project_account_id, project_number, project_name, project_address, pdf_url,
         business_state, create_time, update_time, del_flag)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.businessNumber}, #{item.accountId}, #{item.name}, #{item.account}, #{item.orgId},
-            #{item.orgName}, #{item.bankCode}, #{item.bankName}, #{item.accountOpenAddress}, #{item.projectAccountId},
-            #{item.projectNumber}, #{item.projectName}, #{item.projectAddress}, #{item.pdfUrl}, #{item.businessState},
-            #{item.createTime}, #{item.updateTime}, #{item.delFlag})
-        </foreach>
+        values(#{id}, #{businessNumber}, #{accountId}, #{name}, #{account}, #{orgId},
+            #{orgName}, #{bankCode}, #{bankName}, #{accountOpenAddress}, #{projectAccountId},
+            #{projectNumber}, #{projectName}, #{projectAddress}, #{pdfUrl}, #{businessState},
+            #{createTime}, #{updateTime}, #{delFlag})
     </insert>
 
     <!--  插入监管资金转托管业务数据  -->