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

设计产值

Browse Source
This commit is contained in:
zt
2025-08-23 06:39:13 +08:00
parent fe32eb945c
commit 7095a58083
6 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/DesDesignChange.java
View File

@ -104,6 +104,11 @@ public class DesDesignChange extends BaseEntity {
*/
private String status;
/**
* 变更单审核状态
*/
private String auditStatus;
/**
* 备注
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/designchange/DesDesignChangeVo.java
View File

@ -152,4 +152,10 @@ public class DesDesignChangeVo implements Serializable {
* 文件列表
*/
List<SysOssVo> ossVoList;
/**
* 变更单审核状态
*/
private String auditStatus;
}

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java
View File

@ -602,9 +602,9 @@ public class DesDesignChangeServiceImpl extends ServiceImpl<DesDesignChangeMappe
public void processHandler(ProcessEvent processEvent) {
log.info("设计变更文件审核任务执行了{}", processEvent.toString());
DesDesignChange designChange = this.getById(Convert.toLong(processEvent.getBusinessId()));
designChange.setStatus(processEvent.getStatus());
designChange.setAuditStatus(processEvent.getStatus());
if (processEvent.getSubmit()) {
designChange.setStatus(BusinessStatusEnum.WAITING.getStatus());
designChange.setAuditStatus(BusinessStatusEnum.WAITING.getStatus());
}
if(BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())){
DesDesignExtendDetailDto bean = JSONUtil.toBean(designChange.getDetail(), DesDesignExtendDetailDto.class);
@ -707,4 +707,28 @@ public class DesDesignChangeServiceImpl extends ServiceImpl<DesDesignChangeMappe
}
this.deleteByIds(Collections.singleton(designChange.getId()));
}
/**
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
* 正常使用只需#processEvent.flowCode=='leave1'
* 示例为了方便则使用startsWith匹配了全部示例key
*
* @param processEvent 参数
*/
@EventListener(condition = "#processEvent.flowCode.endsWith('designchangeddoc')")
public void docProcessHandler(ProcessEvent processEvent) {
log.info("设计变更文件审核任务执行了{}", processEvent.toString());
String str = Convert.toStr(processEvent.getBusinessId());
if (StringUtils.isNotBlank(str) && str.endsWith("_audit")) {
str = StringUtils.removeEnd(str, "_audit");
}
DesDesignChange designChange = this.getById(Long.valueOf(str));
designChange.setStatus(processEvent.getStatus());
if (processEvent.getSubmit()) {
designChange.setStatus(BusinessStatusEnum.WAITING.getStatus());
}
this.updateById(designChange);
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutTableController.java
View File

@ -540,8 +540,6 @@ public class OutTableController extends BaseController {
}
vo.setOwnerActualTotal( designValue.add(constructionValue).add(purchaseValue).divide(parseUnit));
//设计完工产值
BigDecimal subDesignValue = monthPlanService.getDesignValueByProjectId(projectVo.getId(),bo.getMonth(),"2");
//施工完工产值

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java
View File

@ -158,4 +158,8 @@ public class OutConstructionValueVo implements Serializable {
@Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
private String createByName;
/**
* 对甲产值
*/
private BigDecimal ownerValue;
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutMonthPlanServiceImpl.java
View File

@ -257,9 +257,9 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
}
//保存
boolean b = busProcurementService.saveOrUpdateBatch(busProcurements);
if (!b) {
throw new ServiceException("保存失败");
}
// if (!b) {
// throw new ServiceException("保存失败");
// }
return busProcurementService.list(Wrappers.<BusProcurement>lambdaQuery()
.eq(BusProcurement::getProjectId, req.getProjectId())
);
@ -268,7 +268,7 @@ public class OutMonthPlanServiceImpl extends ServiceImpl<OutMonthPlanMapper, Out
else if ("2".equals(req.getType())){
return baseMapper.purchaseValueBB(req.getProjectId(), req.getPlanMonth());
}
return null;
return Collections.emptyList();
}
@Override