修改

jinlin

2025-04-05 92705ac08a97ddc4904795f024723aab69e1abd8

 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");
        }*/
@@ -408,7 +409,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 +480,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);
@@ -531,4 +532,8 @@
    public void retract(Long id) {
        baseDao.retract(id);
    }

    public List<ReportRecordDto> getReportRecord(Long level1NetworkId, int column, Long teamgroupId) {
        return baseDao.getReportRecord(level1NetworkId, column, teamgroupId);
    }
}