Commit 47027e37 authored by hongguangwu's avatar hongguangwu

MVP1.7.2 工行5次提交_加日志

parent 9a3c5840
...@@ -496,7 +496,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -496,7 +496,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
return R.ok(vo); return R.ok(vo);
} }
} }
return R.failed("下载失败!"); return R.failed("未找到待发放的明细数据,下载失败!");
} }
/** /**
...@@ -524,7 +524,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -524,7 +524,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
return R.ok(vo); return R.ok(vo);
} }
} }
return R.failed("下载失败!"); return R.failed("未找到待发放的明细数据,下载失败!!");
} }
private EkpBankAtta getNewFileCore(String fdId, String type, EkpBankAttaReturnVo vo, List<EkpBankExcelVo> list) { private EkpBankAtta getNewFileCore(String fdId, String type, EkpBankAttaReturnVo vo, List<EkpBankExcelVo> list) {
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
from ekp_bank_grant_detail a from ekp_bank_grant_detail a
left join ekp_bank_pay_task m on a.fd_parent_id=m.fd_id left join ekp_bank_pay_task m on a.fd_parent_id=m.fd_id
left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account
where a.fd_handle_status = '待发放' where
</sql> </sql>
<!-- 查询待发放条数 --> <!-- 查询待发放条数 -->
...@@ -89,13 +89,13 @@ ...@@ -89,13 +89,13 @@
<!-- 查询主表下的所有待发放数据 --> <!-- 查询主表下的所有待发放数据 -->
<select id="getEkpBankExcelVoByIdAndMain" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo"> <select id="getEkpBankExcelVoByIdAndMain" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo">
<include refid="Base_Excel_Sql"/> <include refid="Base_Excel_Sql"/>
and a.fd_parent_id = #{fdParentId} (a.fd_handle_status is null or a.fd_handle_status = '待发放') and a.fd_parent_id = #{fdParentId}
</select> </select>
<!-- 查询主表下的所有待发放数据 --> <!-- 查询主表下的所有待发放数据 -->
<select id="getEkpBankExcelVoByIdAndDetail" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo"> <select id="getEkpBankExcelVoByIdAndDetail" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo">
<include refid="Base_Excel_Sql"/> <include refid="Base_Excel_Sql"/>
and a.fd_id = #{fdId} a.fd_handle_status = '待发放' and a.fd_id = #{fdId}
</select> </select>
<!-- 查询编号是否重复 --> <!-- 查询编号是否重复 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment