fit:buuuuuuugg

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/HomeController.java

@@ -0,0 +1,37 @@
+package com.hotent.enterpriseDeclare.controller;
+
+
+import com.hotent.base.annotation.ApiGroup;
+import com.hotent.base.constants.ApiGroupConsts;
+import com.hotent.base.model.CommonResult;
+import com.hotent.project.manager.CostProjectTaskManager;
+import com.hotent.project.model.CostProjectTask;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "首页")
+@RestController
+@RequestMapping("/api/enterprise/home")
+@ApiGroup(group = {ApiGroupConsts.GROUP_COST})
+public class HomeController {
+
+
+    @Autowired
+    private CostProjectTaskManager costProjectTaskManager;
+
+    /**
+     * 代办
+
+     */
+    @GetMapping(value = "/doList")
+    public CommonResult<List<CostProjectTask>> getDoList(@RequestParam(required = false) String projectId) {
+        return CommonResult.<List<CostProjectTask>>ok().value(costProjectTaskManager.getDoList(projectId));
+
+    }
+}

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/opinion/CostAuditTaskInfoController.java

@@ -20,10 +20,7 @@ import com.hotent.surveyinfo.manager.CostSurveyTemplateHeadersManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateUploadManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateVersionManager;
-import com.hotent.surveyinfo.model.CostSurveyTemplateHeaders;
-import com.hotent.surveyinfo.model.CostSurveyTemplateItems;
-import com.hotent.surveyinfo.model.CostSurveyTemplateUpload;
-import com.hotent.surveyinfo.model.CostSurveyTemplateVersion;
+import com.hotent.surveyinfo.model.*;
 import com.hotent.surveyinfo.model.dto.CostItemData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +29,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -69,6 +67,9 @@ public class CostAuditTaskInfoController {
 
     @Autowired
     private CostProjectTaskManager costProjectTaskManager;
+
+    @Autowired
+    CostSurveyTemplateManager constbaseService;
     /**
      * 企业报送-成本调查表-列表
      * @param taskId 任务ID
@@ -83,13 +84,16 @@ public class CostAuditTaskInfoController {
         List<CostSurveyTemplateUpload> uploadList = costSurveyTemplateUploadManager.listByTaskId(taskId);
         //创建记录
         if (uploadList.isEmpty()){
-            List<CostSurveyTemplateUpload> costSurveyTemplateUploads = costSurveyTemplateUploadManager.listByCatalogId(catalogId);
-            for (CostSurveyTemplateUpload costSurveyTemplateUpload : costSurveyTemplateUploads) {
+            List<CostSurveyTemplate> costSurveyTemplates = constbaseService.listByCatalogId(catalogId);
+            for (CostSurveyTemplate template : costSurveyTemplates) {
                 CostSurveyTemplateUpload upload = new CostSurveyTemplateUpload();
-                BeanUtils.copyProperties(costSurveyTemplateUpload, upload);
+                BeanUtils.copyProperties(template, upload);
                 upload.setId(null);
                 upload.setTaskId(taskId);
                 upload.setIsUpload("0");
+                upload.setAuditedStatus("0");
+                upload.setCreateTime(LocalDateTime.now());
+                upload.setUploadTime(LocalDateTime.now());
                 costSurveyTemplateUploadManager.save(upload);
             }
         }
@@ -204,14 +208,14 @@ public class CostAuditTaskInfoController {
         // 判断模板类型
         String templateType = null;
         if (StringUtil.isNotEmpty(surveyTemplateId)) {
-            com.hotent.surveyinfo.model.CostSurveyTemplate template = costSurveyTemplateManager.getDetail(surveyTemplateId);
+            CostSurveyTemplate template = costSurveyTemplateManager.getDetail(surveyTemplateId);
             if (template != null) {
                 templateType = template.getTemplateType();
             }
         } else if (StringUtil.isNotEmpty(uploadId)) {
             CostSurveyTemplateUpload upload = costSurveyTemplateUploadManager.get(uploadId);
             if (upload != null && StringUtil.isNotEmpty(upload.getSurveyTemplateId())) {
-                com.hotent.surveyinfo.model.CostSurveyTemplate template = costSurveyTemplateManager.getDetail(upload.getSurveyTemplateId());
+                CostSurveyTemplate template = costSurveyTemplateManager.getDetail(upload.getSurveyTemplateId());
                 if (template != null) {
                     templateType = template.getTemplateType();
                 }

assistMg/src/main/java/com/hotent/enterpriseDeclare/manager/impl/CostSurveyTemplateUploadDataManagerImpl.java

@@ -100,7 +100,6 @@ public class CostSurveyTemplateUploadDataManagerImpl extends BaseManagerImpl<Cos
 
             data.setUploadId(uploadId);
             data.setAuditedUnitId(auditedUnitId);
-            // 如果是动态表，设置periodRecordId
             if (StringUtil.isNotEmpty(periodRecordId)) {
                 data.setPeriodRecordId(periodRecordId);
             }
@@ -117,12 +116,14 @@ public class CostSurveyTemplateUploadDataManagerImpl extends BaseManagerImpl<Cos
         if (!saveList.isEmpty()) {
             this.saveBatch(saveList);
         }
-        CostSurveyTemplateUpload upload = costSurveyTemplateUploadManager.getById(uploadId);
-        upload.setIsUpload("1");
-        if ("2".equals( upload.getAuditedStatus())){
-            upload.setAuditedStatus("0");
+        if (uploadId != null && !uploadId.isEmpty()) {
+            CostSurveyTemplateUpload upload = costSurveyTemplateUploadManager.getById(uploadId);
+            upload.setIsUpload("1");
+            if ("2".equals( upload.getAuditedStatus())){
+                upload.setAuditedStatus("0");
+            }
+            costSurveyTemplateUploadManager.updateById(upload);
         }
-        costSurveyTemplateUploadManager.updateById(upload);
     }
 
 

assistMg/src/main/java/com/hotent/project/controller/CostProjectDocumentController.java

@@ -138,24 +138,6 @@ public class CostProjectDocumentController extends BaseController<CostProjectDoc
 
 	}
 
-	/**
-	 * 根据模板ID和项目ID查询模板子项对应的数据值
-	 */
-	@GetMapping(value="/getTemplateData")
-	@ApiOperation(value="根据模板ID和项目ID查询模板子项数据", httpMethod = "GET")
-	public CommonResult<List<CostDocumentTemplateFile>> getTemplateData(
-			@ApiParam(name="templateId", value="模板ID", required = true)
-			@RequestParam(required = true) String documentId,
-			@ApiParam(name="templateId", value="模板类型", required = false)
-			@RequestParam(required = false) String type,
-			@ApiParam(name="projectId", value="项目ID", required = true)
-			@RequestParam(required = true) String projectId,
-			@ApiParam(name="projectId", value="监审单位ID", required = true)
-			@RequestParam(required = true) String unitID
-			) {
-
-		List<CostDocumentTemplateFile> result = costProjectDocumentManager.getTemplateDataByIds(documentId ,type, projectId,unitID);
-		return CommonResult.<List<CostDocumentTemplateFile>>ok().value(result);
-	}
+
 
 }

assistMg/src/main/java/com/hotent/project/controller/CostProjectTaskMaterialController.java

@@ -54,9 +54,6 @@ public class CostProjectTaskMaterialController extends BaseController<CostProjec
 		if(StringUtils.isNotBlank(costProjectTaskMaterial.getFileUrl())) {
 			costProjectTaskMaterial.setIsUpload("1");
 		}
-		if ("2".equals(costProjectTaskMaterial.getAuditedStatus())){
-			costProjectTaskMaterial.setAuditedStatus("0");
-		}
 		baseService.createOrUpdate(costProjectTaskMaterial);
 		return CommonResult.<String>ok().message(msg);
 	}

assistMg/src/main/java/com/hotent/project/manager/CostProjectDocumentManager.java

@@ -59,6 +59,5 @@ public interface CostProjectDocumentManager extends BaseManager<CostProjectDocum
 
 	String createDocument(String id);
 
-	List<CostDocumentTemplateFile> getTemplateDataByIds(String templateId, String type ,String projectId,String unitId);
 
 }

assistMg/src/main/java/com/hotent/project/manager/CostProjectTaskManager.java

@@ -36,4 +36,5 @@ public interface CostProjectTaskManager extends BaseManager<CostProjectTask> {
 
 	Integer countForReviewTask(CostTaskReviewPageReq req);
 
+    List<CostProjectTask> getDoList(String projectId);
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -406,7 +406,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             // 子任务 所有“是否必填”为“是”的资料“初审结果”均为“通过”.
             List<CostProjectTaskMaterial> costProjectTaskMaterials = costProjectTaskMaterialManager.listByTaskId(nTask.getId());
             boolean c = costProjectTaskMaterials.stream()
-                    .filter(item -> "1".equals(item.getIsRequired()))
+                    .filter(item -> "1".equals(item.getIsRequired()) && "1".equals(item.getIsUpload()))
                     .allMatch(
                     item -> "1".equals(item.getAuditedStatus())
             );
@@ -415,7 +415,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             }
             List<CostSurveyTemplateUpload> costSurveyTemplateUploads = costSurveyTemplateUploadManager.listByTaskId(nTask.getId());
             boolean d = costSurveyTemplateUploads.stream()
-                    .filter(item -> "1".equals(item.getIsRequired()))
+                    .filter(item -> "1".equals(item.getIsRequired()) && "1".equals(item.getIsUpload()) )
                     .allMatch(
                             item -> "1".equals(item.getAuditedStatus())
             );
@@ -454,6 +454,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         switch (req.getProcessNodeKey()) {
             case "sdsh":
                 throw new RuntimeException("当前节点无法退回");
+            case "clcs":
+
+
             default:
                 // 通知内容组装
                 String title = NodeConstant.getNodeValueByKey(task.getCurrentNode()) + "退回";
@@ -692,4 +695,61 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         return costProjectTaskManager.count(queryWrapper);
     }
 
+    @Override
+    public List<CostProjectTask> getDoList(String projectId) {
+        // 获取当前用户
+        IUser currentUser = ContextUtil.getCurrentUser();
+        String currentUserId = currentUser.getUserId();
+
+        // 1. 先查询当前用户有权限的立项（负责人或项目组成员）
+        LambdaQueryWrapper<CostProjectApproval> approvalQueryWrapper = new LambdaQueryWrapper<>();
+        approvalQueryWrapper.eq(CostProjectApproval::getIsDeleted, "0");
+        approvalQueryWrapper.and(wrapper -> wrapper
+                .eq(CostProjectApproval::getLeaderId, currentUserId)
+                .or(projectMembersWrapper -> {
+                    projectMembersWrapper.like(CostProjectApproval::getProjectMembers, currentUserId);
+                })
+        );
+
+        List<CostProjectApproval> accessibleApprovals = costProjectApprovalManager.list(approvalQueryWrapper);
+
+        // 如果没有权限的立项，返回空结果
+        if (accessibleApprovals.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        // 提取有权限的立项ID列表
+        List<String> accessibleProjectIds = accessibleApprovals.stream()
+                .map(CostProjectApproval::getProjectId)
+                .distinct()
+                .collect(java.util.stream.Collectors.toList());
+
+        // 2. 构建任务查询条件
+        LambdaQueryWrapper<CostProjectTask> queryWrapper = new LambdaQueryWrapper<>();
+
+        // 查询未删除的记录
+        queryWrapper.eq(CostProjectTask::getIsDeleted, "0");
+
+        // 查询子任务
+        queryWrapper.ne(CostProjectTask::getPid, "0");
+
+        // 只查询当前用户有权限的立项对应的任务
+        queryWrapper.in(CostProjectTask::getProjectId, accessibleProjectIds);
+
+        // 根据请求参数添加查询条件
+        queryWrapper.eq(projectId!=null,CostProjectTask::getProjectId, projectId);
+
+        // 按创建时间倒序排列
+        queryWrapper.orderByDesc(CostProjectTask::getCreateTime);
+
+        List<CostProjectTask> list = costProjectTaskManager.list(queryWrapper);
+
+        for (CostProjectTask rootTask : list) {
+            rootTask.setStatusName(TaskStatusConstant.getStatusNameByCode(rootTask.getStatus()));
+            rootTask.setCurrentNodeName(NodeConstant.getNodeValueByKey(rootTask.getCurrentNode()));
+        }
+        return list;
+
+    }
+
 }

assistMg/src/main/java/com/hotent/project/model/CostProjectTaskMaterial.java

@@ -103,7 +103,7 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     @JsonProperty("updateBy")
     private String updateBy;
 
-    @ApiModelProperty(value = "格式要求 1文档文件、2excel、3预置模板")
+    @ApiModelProperty(value = "格式要求` 1文档文件、2excel、3预置模板`")
     @TableField("format_required")
     @JsonProperty("formatRequired")
     private String formatRequired;