Commit 324dda67 authored by fangxinjiang's avatar fangxinjiang

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

parents e438b66f 0a5f7a78
...@@ -89,8 +89,8 @@ public class TEmpContractAlertController { ...@@ -89,8 +89,8 @@ public class TEmpContractAlertController {
return R.ok(tEmpContractAlertService.getAutoPage(page, searchVo)); return R.ok(tEmpContractAlertService.getAutoPage(page, searchVo));
} }
@Operation(description = "合同待续签数量查询") @Operation(description = "合同待续签数量查询")
@PostMapping("/getAutoContractCount") @GetMapping("/getAutoContractCount")
public R<Long> getAutoContractCount(@RequestBody ContractAlertSearchVo searchVo) { public R<Long> getAutoContractCount(ContractAlertSearchVo searchVo) {
setAuth(searchVo); setAuth(searchVo);
return R.ok(tEmpContractAlertService.getAutoContractCount(searchVo)); return R.ok(tEmpContractAlertService.getAutoContractCount(searchVo));
} }
......
...@@ -73,8 +73,8 @@ public class EmployeeRegistrationLeaveController { ...@@ -73,8 +73,8 @@ public class EmployeeRegistrationLeaveController {
} }
@Operation(description = "离职待办数量查询") @Operation(description = "离职待办数量查询")
@PostMapping("/getRegistrationLeaveCount") @GetMapping("/getRegistrationLeaveCount")
public R<Long> getRegistrationLeaveCount(@RequestBody EmployeeRegistrationLeaveSearchVo searchVo) { public R<Long> getRegistrationLeaveCount(EmployeeRegistrationLeaveSearchVo searchVo) {
this.setLeaveBaseAuth(searchVo); this.setLeaveBaseAuth(searchVo);
return R.ok(employeeRegistrationLeaveService.getRegistrationLeaveCount(searchVo)); return R.ok(employeeRegistrationLeaveService.getRegistrationLeaveCount(searchVo));
} }
......
...@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh ...@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
</if> </if>
</where> </where>
ORDER BY b.create_time desc,b.id asc ORDER BY b.create_time desc,b.id asc
limit 5 limit 2000
</select> </select>
<!--离职确认列表--> <!--离职确认列表-->
<select id="getEmployeeRegistrationLeaveConfirmTablePage" resultMap="tableAndExportMap"> <select id="getEmployeeRegistrationLeaveConfirmTablePage" resultMap="tableAndExportMap">
......
...@@ -625,13 +625,15 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -625,13 +625,15 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
bizContent.setLanguage("zh_CN"); bizContent.setLanguage("zh_CN");
//指令包序列号:系统产生,一个集团永远不能重复 //指令包序列号:系统产生,一个集团永远不能重复
bizContent.setfSeqNo(seqNo); bizContent.setfSeqNo(seqNo);
//报文压缩标识:1:压缩rd区;空/0:不压缩 不压缩的话单次最多200笔;压缩的话单词最多5000笔
bizContent.setZipFlag("0"); bizContent.setZipFlag("0");
//入账方式:0:逐笔记账;2:并笔记账 //入账方式:0:逐笔记账;2:并笔记账
bizContent.setSettleMode("2"); bizContent.setSettleMode("0");
//总笔数 //总笔数
bizContent.setInstrCount(1); bizContent.setInstrCount(1);
//总金额:以分为单位 //总金额:以分为单位
bizContent.setTotalAmount(1L); bizContent.setTotalAmount(1L);
//报文压缩内容:zip算法压缩rd区后再BASE64编码,约定取第一个文件
bizContent.setZip(""); bizContent.setZip("");
List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>(); List<MybankEnterprisePayPayentRequestV2.MybankEnterprisePayPayentRequestRdV2> rd = new ArrayList<>();
......
...@@ -74,8 +74,8 @@ public class TInsurancesWarnController { ...@@ -74,8 +74,8 @@ public class TInsurancesWarnController {
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R
**/ **/
@Operation(description = "商险待续签保数量查询") @Operation(description = "商险待续签保数量查询")
@PostMapping("/getInsuranceAlertCount") @GetMapping("/getInsuranceAlertCount")
public R<Long> getInsuranceAlertCount(@RequestBody TInsuranceAlertSearchVo tInsuranceAlert) { public R<Long> getInsuranceAlertCount(TInsuranceAlertSearchVo tInsuranceAlert) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tInsuranceAlert); menuUtil.setAuthSql(user, tInsuranceAlert);
return R.ok(insuranceWarnService.getInsuranceAlertCount(tInsuranceAlert)); return R.ok(insuranceWarnService.getInsuranceAlertCount(tInsuranceAlert));
......
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