Commit c1fbe378 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.4' into MVP1.7.4

parents a6d6490b c47480cb
...@@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank; ...@@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
* 银企付款查询卡号所属行号记录表 * 银企付款查询卡号所属行号记录表——有可能重复
* *
* @author hgw * @author hgw
* @date 2024-11-18 17:04:20 * @date 2024-11-18 17:04:20
......
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<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"/>
(a.fd_handle_status is null or a.fd_handle_status = '待发放') and a.fd_parent_id = #{fdParentId} (a.fd_handle_status is null or a.fd_handle_status = '待发放') and a.fd_parent_id = #{fdParentId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc ORDER BY (a.fd_serial_number-0) asc
</select> </select>
...@@ -97,6 +98,7 @@ ...@@ -97,6 +98,7 @@
<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"/>
a.fd_handle_status = '待发放' and a.fd_id = #{fdId} a.fd_handle_status = '待发放' and a.fd_id = #{fdId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc ORDER BY (a.fd_serial_number-0) asc
</select> </select>
......
...@@ -65,7 +65,7 @@ public class TSalaryAccountPhoneController { ...@@ -65,7 +65,7 @@ public class TSalaryAccountPhoneController {
**/ **/
@Operation(description = "获取工资报账信息") @Operation(description = "获取工资报账信息")
@GetMapping("/getSalaryAccount") @GetMapping("/getSalaryAccount")
public R<AccountForWxVo> getSalaryAccount(@RequestParam String idNumber, String year,String openId) { public R<AccountForWxVo> getSalaryAccount(@RequestParam(required = false) String idNumber, String year,String openId) {
if (Common.isEmpty(idNumber) || Common.isEmpty(openId)){ if (Common.isEmpty(idNumber) || Common.isEmpty(openId)){
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
} }
......
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