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

结算权限修改

This commit is contained in:
bonus 2026-02-06 15:03:31 +08:00
parent d8c999665b
commit 6c0ee86a22
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1596,8 +1596,8 @@ public class SltAgreementInfoController extends BaseController {
@ApiOperation(value = "结算审批列表")
@GetMapping("/getSltList")
public TableDataInfo getSltList(SltAgreementInfo bean) {
// Long deptId = typeService.getUserDeptId();
// bean.setCompanyId(deptId);
Long deptId = typeService.getUserDeptId();
bean.setCompanyId(deptId);
startPage();
List<SltAgreementInfo> list = sltAgreementInfoService.getSltList(bean);
return getDataTable(list);

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

@ -731,17 +731,17 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
UUID uuid = UUID.randomUUID();
String sltTask = uuid.toString();
String sltAuditor = null;
if(GlobalConstants.LONG_JJ == deptId){
if(101 == deptId){
if (sltInfoVo.getSettlementType() == null) {
sltAuditor = "待张志峰，刘春杰审核";
} else if (sltInfoVo.getSettlementType() == 1) {
sltAuditor = "待张志峰审核";
sltAuditor = "待张志峰或李靖涛审核";
}else if (sltInfoVo.getSettlementType() == 2) {
sltAuditor = "待刘春杰审核";
}else{
sltAuditor = "待审核";
}
}else if(GlobalConstants.LONG_HY == deptId){
}else if(309 == deptId){
sltAuditor = "顾国强或王文斌审核";
}else{
sltAuditor = "待审核";
@ -878,33 +878,25 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
sltInfoVo.setUpdateTime(DateUtils.getNowDate());
}
if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredLeaseList = getLeaseList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList());
List<SltAgreementInfo> filteredLeaseList = new ArrayList<>(getLeaseList(info));
if (!filteredLeaseList.isEmpty()) {
sltAgreementInfoMapper.insertSltAgreementDetailLease(filteredLeaseList, id);
}
}
if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredRepairList = getRepairList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList());
List<SltAgreementInfo> filteredRepairList = new ArrayList<>(getRepairList(info));
if (!filteredRepairList.isEmpty()) {
sltAgreementInfoMapper.insertSltAgreementDetailRepair(filteredRepairList, id);
}
}
if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredScrapList = getScrapList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList());
List<SltAgreementInfo> filteredScrapList = new ArrayList<>(getScrapList(info));
if (!filteredScrapList.isEmpty()) {
sltAgreementInfoMapper.insertSltAgreementDetailScrap(filteredScrapList, id);
}
}
if (sltInfoVo !=null) {
List<SltAgreementInfo> filteredLoseList = getLoseList(info).stream()
.filter(lease -> lease.getAgreementId().equals(sltInfoVo.getAgreementId()))
.collect(Collectors.toList());
List<SltAgreementInfo> filteredLoseList = new ArrayList<>(getLoseList(info));
if (!filteredLoseList.isEmpty()) {
sltAgreementInfoMapper.insertSltAgreementDetailLose(filteredLoseList, id);
}
@ -1212,6 +1204,9 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
if(checkSettlementType == 1 && "73".equals(userId)){
sltSwitch = true;
}
if(checkSettlementType == 1 && "422".equals(userId)){
sltSwitch = true;
}
if(checkSettlementType == 2 && "1549".equals(userId)){
sltSwitch = true;
}

2
bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
View File

@ -584,6 +584,7 @@
<if test="createTime != null">create_time,</if>
status,
<if test="totalCostAll != null">cost,</if>
<if test="companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="agreementId != null">#{agreementId},</if>
@ -594,6 +595,7 @@
<if test="createTime != null">#{createTime},</if>
1,
<if test="totalCostAll != null">#{totalCostAll},</if>
<if test="companyId != null">#{companyId},</if>
</trim>
</insert>