|
|
@ -51,11 +51,11 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
//记工记账-新建账本 |
|
|
|
@Override |
|
|
|
public Result<?> addNoteBook(String token, EmployNotebook employNotebook) { |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
String message = "新建账本失败!"; |
|
|
|
try{ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
try{ |
|
|
|
//判断是否为修改 |
|
|
|
if(null != employNotebook.getId()){ |
|
|
|
boolean result = employNotebookService.updateById(employNotebook); |
|
|
@ -86,11 +86,11 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
//记工记账-修改账本 |
|
|
|
@Override |
|
|
|
public Result<?> updateNoteBook(String token, EmployNotebook employNotebook) { |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
String message = "修改账本失败!"; |
|
|
|
try{ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
try{ |
|
|
|
boolean result = employNotebookService.updateById(employNotebook); |
|
|
|
|
|
|
|
if(result){ |
|
|
@ -109,11 +109,10 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
//记工记账-全年收支 |
|
|
|
@Override |
|
|
|
public Result<?> queryBill(String token, String employNoteBookId, PageBean pageBean) { |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
try{ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
//获取账本id列表 |
|
|
|
Object[] notebooIds = null; |
|
|
|
if(null == employNoteBookId){ |
|
|
@ -167,15 +166,14 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
|
|
|
|
//记工记账-全年收支金额 |
|
|
|
public Result<?> queryBillAmount(String token, String employNoteBookId){ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
//返回信息 |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("incomeCount", 0); |
|
|
|
map.put("expenditureCount", 0); |
|
|
|
|
|
|
|
try{ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
//获取账本id列表 |
|
|
|
Object[] notebooIds = null; |
|
|
|
if(null == employNoteBookId){ |
|
|
@ -240,11 +238,11 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
//记工记账-技工问题 |
|
|
|
@Override |
|
|
|
public Result<?> addQuestion(String token, EmployFeedback employFeedback) { |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
String message = "技工问题添加失败!"; |
|
|
|
try{ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
try{ |
|
|
|
employFeedback.setUserId(hanHaiMember.getId()); |
|
|
|
boolean result = employFeedbackService.save(employFeedback); |
|
|
|
|
|
|
@ -295,11 +293,11 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
//记工记账-项目记账 |
|
|
|
@Override |
|
|
|
public Result<?> addBillInfo(String token, EmployBillInfo employBillInfo) { |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
String message = "项目记账添加失败!"; |
|
|
|
try{ |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|
try{ |
|
|
|
boolean result = employBillInfoService.save(employBillInfo); |
|
|
|
|
|
|
|
if(result){ |
|
|
@ -340,7 +338,6 @@ public class NotebookServiceImpl implements NotebookService { |
|
|
|
//记工记账-查询记工信息 |
|
|
|
@Override |
|
|
|
public Result<?> queryWork(String token, EmployWorkInfo workInfo, PageBean pageBean){ |
|
|
|
|
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
|
|
|
|