lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-11-修改

Browse Source
This commit is contained in:
青云
2025-11-11 17:10:33 +08:00
parent e8e15f4a98
commit 9221cb50a3
9 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java
View File

@ -19,6 +19,7 @@ import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.system.domain.vo.SysRoleVo;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -105,6 +106,14 @@ public class SysRoleWorkController extends BaseController {
return toAjax(sysRoleWorkService.deleteWithValidByIds(List.of(ids), true));
}
/**
* 获取当前用户角色列表
*/
@GetMapping("/getRoleList/{projectId}")
public R<List<SysRoleVo>> getRoleList(@PathVariable("projectId") Long projectId) {
return R.ok(sysRoleWorkService.getRoleList(projectId));
}
/**
* 获取角色对应流程
*/

22
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java
View File

@ -166,6 +166,28 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
}
}
public List<SysRoleVo> getRoleList(Long projectId){
Long userId = LoginHelper.getUserId();
List<SysUserRole> list = baseMapper.getRoleList(userId,projectId);
List<SysRoleVo> roleList = new ArrayList<>();
for (SysUserRole sysUserRole : list) {
LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId());
lqw.eq(SysRoleWork::getProjectId,projectId);
SysRoleWork one = getOne(lqw);
if (one != null){
SysRoleVo sysRoleVo = roleService.selectRoleById(sysUserRole.getRoleId());
if (sysRoleVo != null){
roleList.add(sysRoleVo);
}
}
}
return roleList;
}
/**
* 根据当前登录人获取角色流程对应
*/

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
View File

@ -173,10 +173,10 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
XzdContractDetails byId = xzdContractDetailsService.getById(bo.getContractCodeId());
if (byId != null){
if (byId.getHtzt().equals("已终止")){
if (byId.getHtzt().equals("终止")){
throw new RuntimeException("该合同已被终止");
}else {
byId.setHtzt("已变更");
byId.setHtzt("变更");
xzdContractDetailsService.updateById(byId);
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java
View File

@ -251,7 +251,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
XzdContractDetailsVo old = queryById(update.getId());
if (bo.getHtzt().equals("已终止")){
if (bo.getHtzt().equals("终止")){
throw new RuntimeException("该合同已被终止!");
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractTerminationServiceImpl.java
View File

@ -135,7 +135,7 @@ public class XzdContractTerminationServiceImpl extends ServiceImpl<XzdContractTe
}
XzdContractDetails detailsVo = xzdContractDetailsService.getById(bo.getContractNumber());
if (detailsVo != null){
detailsVo.setHtzt("已终止");
detailsVo.setHtzt("终止");
xzdContractDetailsService.updateById(detailsVo);
}
return flag;

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/controller/XzdSkyfkFbhtfkController.java
View File

@ -103,4 +103,9 @@ public class XzdSkyfkFbhtfkController extends BaseController {
@PathVariable Long[] ids) {
return toAjax(xzdSkyfkFbhtfkService.deleteWithValidByIds(List.of(ids), true));
}
/**
* 根据合同id获取分包付款累计开票金额
*/
}

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/XzdSkyfkFbhtfk.java
View File

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
@ -271,5 +272,14 @@ public class XzdSkyfkFbhtfk extends BaseEntity {
*/
private String fileId;
/**
* 本次开票金额
*/
private BigDecimal bckpje;
/**
* 累计开票金额
*/
private BigDecimal ljkpje;
}

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/domain/vo/XzdSkyfkFbhtfkVo.java
View File

@ -13,6 +13,7 @@ import org.dromara.xzd.skyfk.fbhtfk.domain.XzdSkyfkFbhtfk;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
@ -343,4 +344,14 @@ public class XzdSkyfkFbhtfkVo implements Serializable {
*/
List<XzdSfkFukuanVo> fkxx;
/**
* 本次开票金额
*/
private BigDecimal bckpje;
/**
* 累计开票金额
*/
private BigDecimal ljkpje;
}

24
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/fbhtfk/service/impl/XzdSkyfkFbhtfkServiceImpl.java
View File

@ -42,6 +42,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@ -376,18 +377,6 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
vo.setSkdwYh(xzdSupplierOpenBankVo.getOpenBank());
}
}
//项目类型
// if (vo.getXmlxId() != null){
// XzdProjectType projectTypeVo = xzdProjectTypeService.getBaseMapper().selectById(vo.getXmlxId());
// if (projectTypeVo != null){
// vo.setXmlx(projectTypeVo.getTypeName());
// }
// //项目大类
// XzdProjectTypeVo bigType = xzdProjectTypeService.getBigType(projectTypeVo.getId());
// if (bigType != null){
// vo.setXmdl(bigType.getTypeName());
// }
// }
//付款信息
XzdSfkFukuanBo bo = new XzdSfkFukuanBo();
bo.setMainDocumentId(vo.getId());
@ -405,6 +394,17 @@ public class XzdSkyfkFbhtfkServiceImpl extends ServiceImpl<XzdSkyfkFbhtfkMapper,
}
}
/**
* 格局分包合同id获取分包合同付款累计开票金额
*/
public BigDecimal getLJKPJE(Long contractId) {
XzdSubcontract info = xzdSubcontract.getBaseMapper().selectById(contractId);
if (info == null){
return new BigDecimal("0");
}
return null;
}
/**
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
* 正常使用只需#processEvent.flowCode=='leave1'