Commit 545bcb2c authored by hongguangwu's avatar hongguangwu

MVP1.5.1-收入证明等

parent aef1f734
...@@ -183,7 +183,7 @@ public class SalaryProveController { ...@@ -183,7 +183,7 @@ public class SalaryProveController {
WageProofDto pd = new WageProofDto(); WageProofDto pd = new WageProofDto();
pd.setStartMouth(startDate); pd.setStartMouth(startDate);
pd.setEndMouth(endDate); pd.setEndMouth(endDate);
pd.setEmIdCard(em.getEmpIdcard()); pd.setEmIdCard(record.getEmployeeIdCard());
pd.setSumType(sumType); pd.setSumType(sumType);
R<WageProofDto> wpR = HttpDaprUtil.invokeMethodPost(daprSalaryProperties.getAppUrl(), daprSalaryProperties.getAppId() R<WageProofDto> wpR = HttpDaprUtil.invokeMethodPost(daprSalaryProperties.getAppUrl(), daprSalaryProperties.getAppId()
, "/tsalaryaccount/inner/findAverageSalaryForProve", pd, WageProofDto.class, SecurityConstants.FROM_IN); , "/tsalaryaccount/inner/findAverageSalaryForProve", pd, WageProofDto.class, SecurityConstants.FROM_IN);
...@@ -283,7 +283,7 @@ public class SalaryProveController { ...@@ -283,7 +283,7 @@ public class SalaryProveController {
record.setCreatUserName(user.getNickname()); record.setCreatUserName(user.getNickname());
record.setIsInvalid(CommonConstants.ZERO_STRING); record.setIsInvalid(CommonConstants.ZERO_STRING);
tProveRecordService.saveNo(record);//保存并自动生成编号 tProveRecordService.saveNo(record);//保存并自动生成编号
return new R(record.getNo()); return R.ok(record.getNo());
} }
/** /**
...@@ -330,7 +330,6 @@ public class SalaryProveController { ...@@ -330,7 +330,6 @@ public class SalaryProveController {
} else { } else {
return R.failed("id不能为空!"); return R.failed("id不能为空!");
} }
} }
/** /**
......
...@@ -329,7 +329,7 @@ public class TSalaryAccountController { ...@@ -329,7 +329,7 @@ public class TSalaryAccountController {
**/ **/
@Inner @Inner
@PostMapping("/inner/findAverageSalaryForProve") @PostMapping("/inner/findAverageSalaryForProve")
public WageProofDto findAverageSalaryForProve(WageProofDto pd) { public WageProofDto findAverageSalaryForProve(@RequestBody WageProofDto pd) {
return getWageProofDtoR(pd.getStartMouth(), pd.getEndMouth(), pd.getEmIdCard(), pd.getSumType(), null); return getWageProofDtoR(pd.getStartMouth(), pd.getEndMouth(), pd.getEmIdCard(), pd.getSumType(), null);
} }
......
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