From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
index 2d8cbc5..391d936 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
@@ -4,6 +4,7 @@
import com.example.client.service.BaseService;
import com.example.server.ExportExcel.dto.ExprotExcelDto;
import com.example.server.ExportExcel.method.ExcelExport;
+import com.example.server.progressTrack.Dto.ReportRecordDto;
import com.example.server.progressTrack.Dto.StatistReportsDto;
import com.example.server.progressTrack.dao.DjJdgzTrackRecordDao;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
@@ -57,7 +58,7 @@
private SysTeamGroupClassService sysTeamGroupClassService;
- public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status, String name) {
+ public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status,Integer isealCabin, String name) {
Long userId = null;
/* Map adminRole = sysUserService.adminRole();
Object isTyRole = adminRole.get("isTyRole");
@@ -65,7 +66,7 @@
if (isTyRole.equals(true) || isYwzRole.equals(true)) {
userId = UserContext.getUser().getId();
}*/
- List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId,deptId,teamId,cabinId,type, status, name);
+ List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, isealCabin,name);
/*if (list != null && list.size() > 0) {
sysOssService.setListOsses(list, "ProjectProgressFileUpload");
}*/
@@ -101,7 +102,7 @@
super.deleteLogic(ids);
}
- public Long save(DjJdgzTrackRecord djJdgzTrackRecord) {
+ public Long save(DjJdgzTrackRecord djJdgzTrackRecord,String type) {
Long id = null;
int weekNo = this.getWeekNo(djJdgzTrackRecord.getLevel1NetworkId());
LocalDate currentDate = LocalDate.now();
@@ -110,7 +111,7 @@
// 灏嗗綋鍓嶆棩鏈熸牸寮忓寲涓哄瓧绗︿覆
String formattedDate = currentDate.format(formatter);
djJdgzTrackRecord.setUpdateDate(formattedDate);
- if (djJdgzTrackRecord.getCurrentStatus() == 1) {
+ if (djJdgzTrackRecord.getCurrentStatus() == 1 && type.equals("save")) {
//鏃堕棿姣旇緝
djJdgzTrackRecord.setEstimatedCompletionTime(formattedDate);
}
@@ -128,7 +129,8 @@
if (djJdgzTrackRecord.getCurrentStatus() == 1) {
DjJdgzNetworkLevel3List nextNode = djJdgzNetworkLevel3ListService.getNextNode(djJdgzTrackRecord.getLevel3NodeId(), djJdgzTrackRecord.getLevel3NetworkId());
- if (nextNode != null) {
+ Long oldId = baseDao.getIsExit(nextNode.getNetworkId(),nextNode.getProcessName());
+ if (nextNode != null && oldId == null) {
DjJdgzTrackRecord data = new DjJdgzTrackRecord();
data.setLevel3NodeId(nextNode.getId());
data.setProcessName(nextNode.getProcessName());
@@ -197,7 +199,7 @@
return baseDao.getReport(level1NetworkId);
}
- public List<DjJdgzTrackRecord> prompt(Long level1NetworkId) {
+ public List<DjJdgzTrackRecord> prompt(Long level1NetworkId, Long deptId, Long teamId, String name) {
Long userId = null;
/* Map adminRole = sysUserService.adminRole();
Object isTyRole = adminRole.get("isTyRole");
@@ -206,7 +208,7 @@
userId = UserContext.getUser().getId();
}*/
int weekNo = this.getWeekNo(level1NetworkId);
- List<DjJdgzTrackRecord> data = baseDao.prompt(level1NetworkId, weekNo, userId);
+ List<DjJdgzTrackRecord> data = baseDao.prompt(level1NetworkId, weekNo, userId,deptId,teamId,name);
for (DjJdgzTrackRecord record : data) {
int i = weekNo - record.getWeekNo();
record.setStatus(i + "鍛ㄦ湭瀹屾垚");
@@ -408,7 +410,7 @@
} else {
List<DjJdgzNetworkLevel3List> list = djJdgzNetworkLevel3ListService.getList(level3.getId());
for (DjJdgzNetworkLevel3List item : list) {
- if(item.getProcessName().equals(progressName)){
+ if (item.getProcessName().equals(progressName)) {
data.setLevel3NodeId(item.getId());
data.setEstimatedCompletionTime(item.getRequiredCompletionTime());
break;
@@ -479,15 +481,15 @@
}
if (StringUtils.isNotBlank(trackedPerson)) {
- data.setTrackPerson(trackPersonStr);
+ data.setTrackedPerson(trackedPerson);
}
if (StringUtils.isNotBlank(trackedPersonContact)) {
- data.setTrackPersonContact(trackPersonContact);
+ data.setTrackedPersonContact(trackedPersonContact);
}
if (StringUtils.isNotBlank(trackedPersonUnit)) {
- data.setTrackPersonUnit(trackPersonUnit);
+ data.setTrackedPersonUnit(trackedPersonUnit);
}
if (StringUtils.isNotBlank(generalRepairUnit)) {
data.setGeneralRepairUnit(generalRepairUnit);
@@ -510,8 +512,15 @@
}
if (!isErr) {
- data.setIsUpdate(false);
- this.save(data);
+ Long oldId = baseDao.getIsExit(data.getLevel3NetworkId(),data.getProcessName());
+ if (oldId!=null) {
+ data.setId(oldId);
+ data.setIsUpdate(true);
+ }else{
+ data.setIsUpdate(false);
+ }
+
+ this.save(data,"import");
}
if (isErr) {
err++;
@@ -531,4 +540,12 @@
public void retract(Long id) {
baseDao.retract(id);
}
+
+ public List<ReportRecordDto> getReportRecord(Long level1NetworkId, int column, Long teamgroupId) {
+ return baseDao.getReportRecord(level1NetworkId, column, teamgroupId);
+ }
+
+ public List<DjJdgzTrackRecord> getName(Long level3NetworkId) {
+ return baseDao.getName(level3NetworkId);
+ }
}
--
Gitblit v1.9.1