toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、数据查询导出

Browse Source 
2、修改报工接口
This commit is contained in:
lidongyang
2026-01-09 13:02:24 +08:00
parent bbec0b672f
commit 2b68984a2b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/bo/ExportOperate.java
View File

@@ -30,7 +30,7 @@ public class ExportOperate {
log.error("保存分析项库文件失败");
} else {
String shellPath = scriptPath + File.separator + "exportExcel.py";
exportFileName = System.currentTimeMillis() + "task.xlsx";
exportFileName = TEMP_EXPORT_PATH + System.currentTimeMillis() + "task.xlsx";
String cmd = "python " + shellPath + " " + taskJsonFileName + " " + exportFileName + " " + columnFileName;
try {
String resultString = SystemOperate.exeShellCmd(cmd);

10
project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java
View File

@@ -81,13 +81,15 @@ public class SimulationWorkServiceImpl extends ServiceImpl<SimulationWorkMapper,
if (actualWorkHour > maxWorkHour) {
return SdmResponse.failed("您填写的工时：" + actualWorkHour + "已超出最大可填写的工时：" + maxWorkHour);
}
simulationWorkWrapper.set(SimulationWork::getActualProgress, req.getActualProgress())
.set(SimulationWork::getWorkName, req.getWorkName()).update();
simulationWorkWrapper.set(SimulationWork::getActualWorkHour, actualWorkHour);
}
updateFlag = simulationWorkWrapper
.set(ObjectUtils.isNotEmpty(req.getActualWorkHour()), SimulationWork::getActualWorkHour, req.getActualWorkHour())
.set(SimulationWork::getPlanWorkHour, req.getPlanWorkHour())
.set(SimulationWork::getDescription, req.getDescription())
.set(ObjectUtils.isNotEmpty(req.getPlanWorkHour()), SimulationWork::getPlanWorkHour, req.getPlanWorkHour())
.set(ObjectUtils.isNotEmpty(req.getDescription()), SimulationWork::getDescription, req.getDescription())
.set(ObjectUtils.isNotEmpty(req.getWorkName()), SimulationWork::getWorkName, req.getWorkName())
.set(ObjectUtils.isNotEmpty(req.getActualProgress()), SimulationWork::getActualProgress, req.getActualProgress())
.set(ObjectUtils.isNotEmpty(req.getShouldProgress()), SimulationWork::getShouldProgress, req.getShouldProgress())
.eq(SimulationWork::getId, req.getId())
.update();
}