bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2026-01-27 17:06:15 +08:00
parent e588949e7c b4d0d2d08d
commit 2191de238c
3 changed files with 146 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmReportServiceImpl.java
View File

@ -44,9 +44,7 @@ public class BmReportServiceImpl implements BmReportService {
@Override
public List<PurChaseReportInfo> getPurChaseReportList(PurChaseReportInfo bean) {
bean.setUserId(SecurityUtils.getLoginUser().getUserid());
/**
* jsk
*/
// jsk
Long companyId=iTypeService.getUserDeptId();
bean.setCompanyId(companyId);
BigDecimal totalPurchaseNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
@ -169,6 +167,7 @@ public class BmReportServiceImpl implements BmReportService {
}
return list;
}
private boolean containsKeyword(LeaseOutInfo item, String keyWord) {
return (item.getTypeName() != null && item.getTypeName().contains(keyWord)) ||
(item.getTypeModelName() != null && item.getTypeModelName().contains(keyWord)) ||

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java
View File

@ -2037,11 +2037,7 @@ public class SltAgreementInfoController extends BaseController {
@ApiOperation(value = "进行结算审批")
@PostMapping("/costExamine")
public AjaxResult costExamine(@RequestBody SltAgreementApply apply) {
try {
return sltAgreementInfoService.costExamine(apply);
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**

20
bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -1180,12 +1180,16 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
return AjaxResult.error("结算信息为空，请刷新后重试！");
}
Long deptId = typeService.getUserDeptId();
Long deptId = null;
try {
deptId = typeService.getUserDeptId();
sltAgreementApply.setCompanyId(deptId);
} catch (Exception e) {
throw new ServiceException("结算权限校验不通过！");
}
Integer settlementType = sltAgreementApply.getSettlementType();
String sltTask = sltAgreementApply.getSltTask();
try {
String userId = String.valueOf(SecurityUtils.getLoginUser().getUserid());
sltAgreementApply.setAuditor(userId);
@ -1197,13 +1201,17 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
sltAgreementApply.setSettlementType(sltType);
SltAgreementApply checkSltPer = sltAgreementInfoMapper.getSltPermission(sltAgreementApply);
Integer checkSettlementType = checkSltPer.getSettlementType();
Integer checkSettlementType = null;
try {
checkSettlementType = checkSltPer.getSettlementType();
} catch (Exception e) {
throw new ServiceException("结算权限校验不通过！");
}
if(GlobalConstants.LONG_JJ.equals(deptId)){
if(checkSettlementType == 1 && "73".equals(userId)){
sltSwitch = true;
}
if(checkSettlementType == 2 && "1549".equals(userId)){
sltSwitch = true;
}
@ -1335,10 +1343,6 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
return AjaxResult.error("审批错误，账号没有审批权限");
}
} catch (Exception e) {
throw new ServiceException(e.getMessage());
}
}
/**