修改工资结算
This commit is contained in:
@ -336,6 +336,16 @@ public class WgzAppController {
|
||||
return AjaxResult.success(iBgtProjectRecruitApplyService.userApplyForRegistration(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 【首页】【项目详情】 项目详情·确认|拒绝报名
|
||||
*/
|
||||
@ApiOperation("【首页】【项目详情】 项目详情·确认|拒绝报名)")
|
||||
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userConfirmRegistration')")
|
||||
@GetMapping("/WgzAppUserConfirmRegistration/{id}")
|
||||
public AjaxResult<Boolean> userConfirmRegistration(@Validated WgzAppConfirmRegistrationReq req) {
|
||||
return AjaxResult.success(iBgtProjectRecruitApplyService.userConfirmRegistration(req));
|
||||
}
|
||||
|
||||
/**
|
||||
* 【首页】【已报名项目】 已报名项目
|
||||
*/
|
||||
@ -407,16 +417,19 @@ public class WgzAppController {
|
||||
res.setEntryTime(by.getEntryTime()).
|
||||
setLeaveTime(by.getLeaveTime()).
|
||||
setAmount(recruitAmount);
|
||||
//3、查询当前进行中的项目是否有工资结算
|
||||
WgzPayCalculation gz = iWgzPayCalculationService.findByUserIdRecruitIdNewestData(appUserId, appById.getId());
|
||||
if (gz != null){
|
||||
//3、查询当前进行中的项目是否有工资结算(多次追加)
|
||||
List<WgzPayCalculation> gzs = iWgzPayCalculationService.findByUserIdRecruitIdNewestData(appUserId, appById.getId());
|
||||
BigDecimal addSum = new BigDecimal(0);
|
||||
for (WgzPayCalculation gz : gzs) {
|
||||
//金额*天数=实际工资
|
||||
res.setAppliedAmount(gz.getRecruitAmount().multiply(BigDecimal.valueOf(gz.getNum())));
|
||||
res.setNameOfApplicant(gz.getUserName());
|
||||
BigDecimal multiply = gz.getRecruitAmount().multiply(BigDecimal.valueOf(gz.getNum()));
|
||||
addSum = addSum.add(multiply);
|
||||
}
|
||||
res.setAppliedAmount(addSum);
|
||||
res.setNameOfApplicant(gzs.get(0).getUserName());
|
||||
if(i!=0){
|
||||
//总的金额/结算的金额=百分比
|
||||
BigDecimal divide = res.getTotalAmount().divide(res.getAmount(), 2, BigDecimal.ROUND_HALF_UP);
|
||||
BigDecimal divide = res.getAppliedAmount().divide(res.getTotalAmount(), 2, BigDecimal.ROUND_HALF_UP);
|
||||
res.setPercentage(divide.doubleValue());
|
||||
}
|
||||
return AjaxResult.success(res);
|
||||
|
Reference in New Issue
Block a user