Commit 582443e1 authored by zhangwanglin's avatar zhangwanglin

结算记录操作人

parent fc5a6b1b
...@@ -41,7 +41,7 @@ public class AccountController { ...@@ -41,7 +41,7 @@ public class AccountController {
* @return 返回状态 * @return 返回状态
*/ */
@PostMapping("/addOrUpdateAccount") @PostMapping("/addOrUpdateAccount")
public Result addOrUpdateAccount(AccountOperVo accountOperVo) { public Result addOrUpdateAccount(@RequestHeader("Authorization") String token,AccountOperVo accountOperVo) {
/* if (null == accountOperVo.getSrvOrganId() || null == accountOperVo.getAccountsTime() || StringUtils.isBlank(accountOperVo.getTotalExpensesPayable()) || null == accountOperVo.getAccountsStatus()) { /* if (null == accountOperVo.getSrvOrganId() || null == accountOperVo.getAccountsTime() || StringUtils.isBlank(accountOperVo.getTotalExpensesPayable()) || null == accountOperVo.getAccountsStatus()) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}*/ }*/
...@@ -54,6 +54,8 @@ public class AccountController { ...@@ -54,6 +54,8 @@ public class AccountController {
return Result.failed("当前机构当月已存在结算数据"); return Result.failed("当前机构当月已存在结算数据");
} }
} }
Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
accountOperVo.setUserId(userId);
accountService.addOrUpdateAccount(accountOperVo); accountService.addOrUpdateAccount(accountOperVo);
return Result.success(); return Result.success();
} }
......
...@@ -95,6 +95,8 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis ...@@ -95,6 +95,8 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
chDisabAccountDTO.setChooseSettle((short) 1); // 是否结算(0未结算,1已结算) chDisabAccountDTO.setChooseSettle((short) 1); // 是否结算(0未结算,1已结算)
disabAccountsMapper.updateById(chDisabAccountDTO); disabAccountsMapper.updateById(chDisabAccountDTO);
} }
chDisabAccounts.setLcd(new Date());
chDisabAccounts.setLcu(accountOperVo.getUserId());
this.saveOrUpdate(chDisabAccounts); this.saveOrUpdate(chDisabAccounts);
} }
...@@ -550,6 +552,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis ...@@ -550,6 +552,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public int overallCostSubmit(OverallCostSubmitReqVO req){ public int overallCostSubmit(OverallCostSubmitReqVO req){
ChDisabDetailAccounts chDisabDetailAccounts = new ChDisabDetailAccounts(); ChDisabDetailAccounts chDisabDetailAccounts = new ChDisabDetailAccounts();
int dealType = req.getDealType(); int dealType = req.getDealType();
......
...@@ -123,6 +123,12 @@ public class ChDisabAccounts implements Serializable { ...@@ -123,6 +123,12 @@ public class ChDisabAccounts implements Serializable {
private Short isDelay; private Short isDelay;
private Date lcd;
private Integer lcu;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
...@@ -19,6 +19,8 @@ public class AccountOperVo extends ChDisabAccounts { ...@@ -19,6 +19,8 @@ public class AccountOperVo extends ChDisabAccounts {
**/ **/
private String modeName; private String modeName;
private Integer userId;
/** /**
* 文件列表数据对象 * 文件列表数据对象
*/ */
......
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