1.综合查询优化

assistMg/src/main/java/com/hotent/baseInfo/manager/CostDictDataManager.java

@@ -3,6 +3,8 @@ package com.hotent.baseInfo.manager;
 import com.hotent.baseInfo.model.CostDictData;
 import com.hotent.base.manager.BaseManager;
 
+import java.util.List;
+
 /**
  * 字典数据表 服务类
  *
@@ -23,4 +25,6 @@ public interface CostDictDataManager extends BaseManager<CostDictData> {
 	 * @return
 	 */
 	void createOrUpdate(CostDictData costDictData);
+
+    List<CostDictData> getValueByDictType(List<String> list,String sort, String sysAuditType);
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDictDataManagerImpl.java

@@ -1,5 +1,7 @@
 package com.hotent.baseInfo.manager.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.model.CostDictData;
 import com.hotent.baseInfo.dao.CostDictDataDao;
 import com.hotent.baseInfo.manager.CostDictDataManager;
@@ -7,6 +9,9 @@ import com.hotent.base.manager.impl.BaseManagerImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
+import java.util.List;
+
 
 /**
  * 字典数据表 服务实现类
@@ -31,4 +36,22 @@ public class CostDictDataManagerImpl extends BaseManagerImpl<CostDictDataDao, Co
 		//新建或更新
 		this.saveOrUpdate(costDictData);
 	}
+
+	@Override
+	public List<CostDictData> getValueByDictType(List<String> list,String sort, String sysAuditType) {
+		QueryWrapper<CostDictData> wrapper = new QueryWrapper<>();
+		if (StringUtil.isNotEmpty(sysAuditType)) {
+			wrapper.eq("dict_type",sysAuditType);
+		}
+
+		if (StringUtil.isNotEmpty(sort)) {
+			wrapper.eq("dict_sort",sort);
+		}
+
+		if (list!=null && !list.isEmpty()) {
+			wrapper.in("dict_sort",list);
+		}
+
+		return this.list(wrapper);
+	}
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentWhManagerImpl.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -218,6 +219,34 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
         List<CostDocumentWh> records = respPage.getRecords();
         for (CostDocumentWh costDocumentWh : records) {
 
+
+            if("incremental".equals(costDocumentWh.getGenerateType())){
+                costDocumentWh.setCurrentValue(costDocumentWh.getCurrentValue()+1);
+                costDocumentWh.setLastGenerateDate(LocalDate.now());
+            } else if ("daily".equals(costDocumentWh.getGenerateType())) {
+                boolean b = LocalDate.now().isEqual(costDocumentWh.getLastGenerateDate());
+                if (!b) {
+                    costDocumentWh.setCurrentValue(costDocumentWh.getCurrentValue()+1);
+                    costDocumentWh.setLastGenerateDate(LocalDate.now());
+                }
+            }else if ("monthly".equals(costDocumentWh.getGenerateType())) {
+                LocalDate date = LocalDate.now(); // 获取当前日期
+                YearMonth currentYearMonth = YearMonth.from(date);
+                if (currentYearMonth.equals(YearMonth.from(costDocumentWh.getLastGenerateDate()))) {
+                    costDocumentWh.setCurrentValue(costDocumentWh.getCurrentValue()+1);
+                    costDocumentWh.setLastGenerateDate(LocalDate.now());
+                }
+            }else if ("yearly".equals(costDocumentWh.getGenerateType())) {
+                LocalDate date = LocalDate.now(); // 获取当前日期
+                // 获取当前年份
+                int currentYear = date.getYear();
+                if (costDocumentWh.getLastGenerateDate().getYear() == currentYear) {
+                    costDocumentWh.setCurrentValue(costDocumentWh.getCurrentValue()+1);
+                    costDocumentWh.setLastGenerateDate(LocalDate.now());
+                }
+            }
+
+
             //返回文号
             String replace = costDocumentWh.getRulePattern().replace("{prefixText}", costDocumentWh.getPrefixText())
                     .replace("{year}", "【" +costDocumentWh.getYear()+"】").replace("{currentValue}", costDocumentWh.getCurrentValue().toString());

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

@@ -52,7 +52,7 @@ public class CostAuditReviewController {
      */
     @PostMapping(value = "/pageList")
     @ApiOperation(value = "分页查询待审核任务列表", httpMethod = "POST", notes = "分页查询待审核任务列表")
-    public CommonResult<IPage<CostProjectTask>> pageList(@RequestBody CostTaskReviewPageReq req) {
+    public CommonResult<IPage<CostProjectTask>> pageList(@RequestBody CostTaskReviewPageReq req) throws Exception {
         IPage<CostProjectTask> pageResult = costProjectTaskManager.pageListForReviewTask(req);
         return CommonResult.<IPage<CostProjectTask>>ok().value(pageResult);
     }
@@ -79,7 +79,7 @@ public class CostAuditReviewController {
      */
     @PostMapping(value = "/completedPageList")
     @ApiOperation(value = "分页查询办结监审任务列表", httpMethod = "POST", notes = "分页查询办结监审任务列表")
-    public CommonResult<IPage<CostProjectTask>> completedPageList(@RequestBody CostTaskReviewPageReq req) {
+    public CommonResult<IPage<CostProjectTask>> completedPageList(@RequestBody CostTaskReviewPageReq req) throws Exception {
         req.setCurrentNode(NodeConstant.guidang.getNodeKey());
         IPage<CostProjectTask> pageResult = costProjectTaskManager.pageListForReviewTask(req);
         return CommonResult.<IPage<CostProjectTask>>ok().value(pageResult);
@@ -93,7 +93,7 @@ public class CostAuditReviewController {
      */
     @PostMapping(value = "/archivePageList")
     @ApiOperation(value = "分页查询档案管理任务列表", httpMethod = "POST", notes = "分页查询档案管理任务列表（只查询主任务，不查询子任务）")
-    public CommonResult<IPage<CostProjectTask>> archivePageList(@RequestBody CostTaskReviewPageReq req) {
+    public CommonResult<IPage<CostProjectTask>> archivePageList(@RequestBody CostTaskReviewPageReq req) throws Exception {
         IPage<CostProjectTask> pageResult = costProjectTaskManager.pageListForReviewTask(req);
         return CommonResult.<IPage<CostProjectTask>>ok().value(pageResult);
     }

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

@@ -24,7 +24,7 @@ public interface CostProjectTaskManager extends BaseManager<CostProjectTask> {
 
 	List<CostProjectTask> getTaskList(CostTaskSearchReq req) throws Exception;
 
-	IPage<CostProjectTask> pageListForReviewTask(CostTaskReviewPageReq req);
+	IPage<CostProjectTask> pageListForReviewTask(CostTaskReviewPageReq req) throws Exception;
 
 	void createOrUpdate(CostProjectTask costProjectTask);
 

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

@@ -24,6 +24,8 @@ import com.hotent.project.req.CostProjectApprovalPublishReq;
 import com.hotent.project.resp.CostProjectApprovalDetailResp;
 import com.hotent.surveyinfo.manager.*;
 import com.hotent.surveyinfo.model.*;
+import com.hotent.sys.persistence.manager.DataDictManager;
+import com.hotent.sys.persistence.model.DataDict;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.manager.OrgManager;
 import com.hotent.uc.manager.UserManager;
@@ -37,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -193,6 +196,9 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     @Autowired
     private UserManager userManager;
 
+    @Resource
+    DataDictManager dataDictManager;
+
     @Autowired
     UserManager userService;
 
@@ -200,8 +206,19 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     @Override
     public CostProjectApprovalDetailResp getDetail(String id) {
         CostProjectApproval costProjectApproval = this.get(id);
-
+        CostCatalog costCatalog = costCatalogManager.get(costProjectApproval.getCatalogId());
         CostProjectApprovalDetailResp detailResp = CopyUtil.copy(costProjectApproval, CostProjectApprovalDetailResp.class);
+        if (costCatalog!=null) {
+            detailResp.setCatalogName(costCatalog.getCatalogName());
+        }
+
+        QueryWrapper<DataDict> wrapper = new QueryWrapper<>();
+        wrapper.eq("TYPE_ID_","1977230176815185920");
+        wrapper.eq("KEY_",costProjectApproval.getSourceType());
+        DataDict  costDictDatas= dataDictManager.getOne(wrapper);
+        if (costDictDatas!=null) {
+            detailResp.setSourceName(costDictDatas.getName());
+        }
         //单位级别：0:省/自治区/直辖市 1:市级 2:县级
         if (ObjectUtil.isNotEmpty(costProjectApproval.getAreaCode()) && ObjectUtil.isNotEmpty(costProjectApproval.getAreaLevel())) {
             //如果是区县级

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

@@ -218,7 +218,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         if (costDocumentTemplate == null || BaseConstant.DELETE_FLAG.equals(costDocumentTemplate.getIsDeleted())) {
             throw new BaseException("文书模板不存在");
         }
-        if (costDocumentTemplate.getIsWh().equals("0")) {
+        if (costDocumentTemplate.getIsWh().equals("0") && StringUtil.isEmpty(req.getDocumentNumber())) {
             throw new BaseException("请填写通知文号");
         }
         if (ObjectUtil.isEmpty(req.getEnterpriseId())) {
@@ -465,20 +465,20 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         if (costDocumentTemplate == null || BaseConstant.DELETE_FLAG.equals(costDocumentTemplate.getIsDeleted())) {
             throw new BaseException("文书模板不存在");
         }
-        if (costDocumentTemplate.getIsWh().equals("1")) {
+        /*if (costDocumentTemplate.getIsWh().equals("1")) {
             throw new BaseException("请填写通知文号");
-        }
+        }*/
         req.setDocumentAlias(costDocumentTemplate.getAlias());
         AuditedUnit auditedUnit = auditedUnitManager.get(req.getEnterpriseId());
         if (auditedUnit == null || BaseConstant.DELETE_FLAG.equals(auditedUnit.getIsDeleted())) {
             throw new BaseException("被监审单位不存在");
         }
-        CostDocumentWh costDocumentWh = costDocumentWhManager.get(req.getDocumentWhId());
-        if(costDocumentTemplate.getIsWh().equals("1")){
+        /*CostDocumentWh costDocumentWh = costDocumentWhManager.get(req.getDocumentWhId());
+        if(costDocumentTemplate.getIsWh().equals("0")){
             if (costDocumentWh == null || BaseConstant.DELETE_FLAG.equals(costDocumentWh.getIsDeleted())) {
                 throw new BaseException("文书文号不存在");
             }
-        }
+        }*/
         LambdaQueryWrapper<CostProjectDocument> qw = new LambdaQueryWrapper<>();
         qw.eq(CostProjectDocument::getProjectId, req.getProjectId());
         qw.eq(CostProjectDocument::getDocumentId, req.getDocumentId());
@@ -486,6 +486,21 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         /*if (this.count(qw) > 0) {
             throw new BaseException("该项目监审单位已存在此文书");
         }*/
+        CostDocumentWh costDocumentWh;
+        //返回文号
+        String whNo=selectCostProjectDocument.getDocumentNumber();
+
+        /*if (costDocumentTemplate.getIsWh().equals("0")) {
+            costDocumentWh= costDocumentWhManager.get(req.getDocumentWhId());
+            if (costDocumentWh == null) {
+                throw new BaseException("文书文号不存在");
+            }
+            //返回文号
+            whNo = this.getWH(costDocumentWh);
+        } else {
+            costDocumentWh = null;
+            whNo = "";
+        }*/
 
         selectCostProjectDocument.setDocumentWhId(req.getDocumentWhId());
         selectCostProjectDocument.setDocumentId(req.getDocumentId());
@@ -493,6 +508,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         selectCostProjectDocument.setElectronicDocumentUrl("");
 //        类型转换
          BeanUtil.copyProperties(req,selectCostProjectDocument);
+        selectCostProjectDocument.setDocumentNumber(whNo);
         super.update(selectCostProjectDocument);
 
         req.getCostProjectDocumentFiles().forEach(f->{

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

@@ -16,6 +16,9 @@ import com.hotent.project.req.CostProjectBasePageReq;
 import com.hotent.req.PageReq;
 import com.hotent.surveyinfo.manager.CostSurveyFdTemplateManager;
 import com.hotent.surveyinfo.model.CostSurveyFdTemplate;
+
+import com.hotent.sys.persistence.manager.DataDictManager;
+import com.hotent.sys.persistence.model.DataDict;
 import com.hotent.uc.exception.BaseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +50,10 @@ public class CostProjectMaterialManagerImpl extends BaseManagerImpl<CostProjectM
     @Autowired
     private CostSurveyFdTemplateManager costSurveyFdTemplateManager;
 
+
+    @Resource
+    DataDictManager dataDictManager;
+
     @Autowired
     private CostProjectApprovalManager costProjectApprovalManager;
 
@@ -104,7 +111,31 @@ public class CostProjectMaterialManagerImpl extends BaseManagerImpl<CostProjectM
 
 
         List<CostProjectMaterial> records = pageList.getRecords();
+        List<String> list = records.stream().map(CostProjectMaterial::getInformationType).distinct().collect(Collectors.toList());
+        QueryWrapper<DataDict> wrapper = new QueryWrapper<>();
+        wrapper.eq("TYPE_ID_","1976557733440159744");
+        wrapper.in("KEY_",list);
+        List<DataDict> costDictDatas= dataDictManager.list(wrapper);
+
+        List<String> listRequire = records.stream().map(CostProjectMaterial::getInformationRequire).distinct().collect(Collectors.toList());
+        QueryWrapper<DataDict> wrapperRequire = new QueryWrapper<>();
+        wrapperRequire.eq("TYPE_ID_","1976558645202157568");
+        wrapperRequire.in("KEY_",listRequire);
+        List<DataDict> listRequireDatas= dataDictManager.list(wrapperRequire);
+
         records.forEach(costCatalogUnit -> {
+
+            costDictDatas.stream()
+                    .filter(c -> costCatalogUnit.getInformationType() != null &&
+                            costCatalogUnit.getInformationType().equals(String.valueOf(c.getKey())))
+                    .findAny().ifPresent(costDictData -> costCatalogUnit.setInformationTypeName(costDictData.getName()));
+
+
+            listRequireDatas.stream()
+                    .filter(c -> costCatalogUnit.getInformationRequire() != null &&
+                            costCatalogUnit.getInformationRequire().equals(String.valueOf(c.getKey())))
+                    .findAny().ifPresent(costDictData -> costCatalogUnit.setInformationRequireName(costDictData.getName()));
+
             if ("3".equals(costCatalogUnit.getFormatRequired())) {
                 if(fdTemplateMap!=null) {
                     CostSurveyFdTemplate costSurveyFdTemplate = fdTemplateMap.get(costCatalogUnit.getTemplateId());

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

@@ -2,8 +2,11 @@ package com.hotent.project.manager.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hotent.base.util.StringUtil;
 import com.hotent.constant.NodeConstant;
 import com.hotent.project.manager.*;
+import com.hotent.project.model.CostProjectMaterial;
 import com.hotent.project.model.CostProjectProccess;
 import com.hotent.project.dao.CostProjectProccessDao;
 import com.hotent.base.manager.impl.BaseManagerImpl;
@@ -13,6 +16,8 @@ import com.hotent.project.req.CostProjectProcessNodeReq;
 import com.hotent.project.req.CostProjectProcessReq;
 import com.hotent.project.resp.CostProjectProccessNodeResp;
 import com.hotent.project.resp.CostProjectProccessResp;
+import com.hotent.sys.persistence.manager.DataDictManager;
+import com.hotent.sys.persistence.model.DataDict;
 import com.hotent.uc.exception.BaseException;
 import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.model.User;
@@ -20,12 +25,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -46,6 +53,10 @@ public class CostProjectProccessManagerImpl extends BaseManagerImpl<CostProjectP
     @Autowired
     private CostProjectProccessNodeManager costProjectProccessNodeManager;
 
+
+    @Resource
+    DataDictManager dataDictManager;
+
     @Autowired
     private CostProjectProccessPersonnelManager costProjectProccessPersonnelManager;
 
@@ -96,6 +107,26 @@ public class CostProjectProccessManagerImpl extends BaseManagerImpl<CostProjectP
         List<User> users = userManager.listByIds(userIdList.stream().distinct().collect(Collectors.toList()));
         Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getId, Function.identity()));
 
+        //List<String> listRequire = records.stream().map(CostProjectMaterial::getInformationRequire).distinct().collect(Collectors.toList());
+        List<String> nodeTypes = nodeList.stream().map(CostProjectProccessNode::getNodeType).distinct().collect(Collectors.toList());
+        QueryWrapper<DataDict> wrapperRequire = new QueryWrapper<>();
+        wrapperRequire.eq("TYPE_ID_","1976857973275787264");
+        wrapperRequire.in("KEY_",nodeTypes);
+        List<DataDict> listnodeType= dataDictManager.list(wrapperRequire);
+
+        List<String> listStatus = nodeList.stream().map(CostProjectProccessNode::getStatus).collect(Collectors.toList());
+        List<String> result = listStatus.stream()
+                .flatMap(str -> Arrays.stream(str.split(",")))
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .distinct()
+                .collect(Collectors.toList());
+
+        QueryWrapper<DataDict> wrapperStatus = new QueryWrapper<>();
+        wrapperStatus.eq("TYPE_ID_","1976857973275787264");
+        wrapperStatus.in("KEY_",result);
+        List<DataDict> listnodeStatus= dataDictManager.list(wrapperStatus);
+
 
         //返回流程数据
         CostProjectProccessResp costProjectProccessResp = new CostProjectProccessResp();
@@ -106,17 +137,39 @@ public class CostProjectProccessManagerImpl extends BaseManagerImpl<CostProjectP
         costProjectProccessResp.setPlannedAuditEndDate(projectProccess.getPlannedAuditEndDate());
 
 
+
+
         costProjectProccessResp.setNodeList(nodeList.stream().map(node -> {
             CostProjectProccessNodeResp nodeResp = new CostProjectProccessNodeResp();
             nodeResp.setId(node.getId());
 
-
             nodeResp.setProcessId(node.getProcessId());
             nodeResp.setProcessNodeValue(node.getProcessNodeValue());
             nodeResp.setProcessNodeKey(node.getProcessNodeKey());
             nodeResp.setNodeType(node.getNodeType());
+
+            listnodeType.stream()
+                    .filter(c -> nodeResp.getNodeType() != null &&
+                            nodeResp.getNodeType().equals(String.valueOf(c.getKey())))
+                    .findAny().ifPresent(costDictData -> nodeResp.setNodeTypeName(costDictData.getName()));
+
+
             nodeResp.setOrderNum(node.getOrderNum());
             nodeResp.setStatus(node.getStatus());
+            if (StringUtil.isNotEmpty(nodeResp.getStatus())) {
+                String[] split = nodeResp.getStatus().split(",");
+                StringBuilder statusName= new StringBuilder();
+                for (int i = 0; i < split.length; i++) {
+                    String st=split[i];
+                    DataDict dataDict = listnodeStatus.stream().filter(s -> s.getKey().equals(st)).findAny().orElse(null);
+                    if (dataDict!=null) {
+                        statusName.append(",").append(dataDict.getName());
+
+                    }
+                }
+                nodeResp.setStatusName(statusName.toString());
+            }
+
             nodeResp.setUserId(node.getUserId());
             nodeResp.setMainUserId(node.getMainUserId());
             nodeResp.setStatusValue("node.getStatusValue() 后面填写");

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

@@ -6,13 +6,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.base.query.PageList;
+import com.hotent.base.query.QueryFilter;
 import com.hotent.base.util.AuthenticationUtil;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.manager.AuditedUnitManager;
 import com.hotent.baseInfo.manager.CostCatalogManager;
+import com.hotent.baseInfo.manager.CostDictDataManager;
 import com.hotent.baseInfo.manager.CostDistrictManager;
 import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.baseInfo.model.CostCatalog;
+import com.hotent.baseInfo.model.CostDictData;
 import com.hotent.baseInfo.model.CostDistrict;
 import com.hotent.baseInfo.req.CostTaskSearchReq;
 import com.hotent.constant.NodeConstant;
@@ -25,6 +29,8 @@ import com.hotent.project.model.*;
 import com.hotent.project.resp.CostProjectApprovalDetailResp;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateUploadManager;
 import com.hotent.surveyinfo.model.CostSurveyTemplateUpload;
+import com.hotent.sys.persistence.manager.DataDictManager;
+import com.hotent.sys.persistence.model.DataDict;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.manager.OrgManager;
 import com.hotent.uc.manager.UserManager;
@@ -36,6 +42,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -65,6 +72,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     @Autowired
     private CostNoticeManager costNoticeManager;
 
+    @Resource
+    DataDictManager dataDictManager;
+
     @Autowired
     private CostProjectApprovalManager costProjectApprovalManager;
 
@@ -197,7 +207,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     }
 
     @Override
-    public IPage<CostProjectTask> pageListForReviewTask(CostTaskReviewPageReq req) {
+    public IPage<CostProjectTask> pageListForReviewTask(CostTaskReviewPageReq req) throws Exception {
         // 获取当前用户
         IUser currentUser = ContextUtil.getCurrentUser();
         String currentUserId = currentUser.getUserId();
@@ -225,6 +235,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             return new Page<>(req.getPageNum(), req.getPageSize());
         }
 
+
         // 提取有权限的立项ID列表
         List<String> accessibleProjectIds = accessibleApprovals.stream()
                 .map(CostProjectApproval::getProjectId)
@@ -281,6 +292,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         if (rootList == null || rootList.isEmpty()) {
             return result;
         }
+
+
+
         List<String> rootIds = rootList.stream()
                 .map(CostProjectTask::getId)
                 .collect(Collectors.toList());
@@ -304,8 +318,20 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 approvalList.stream().collect(
                         Collectors.toMap(CostProjectApproval::getProjectId, v -> v)
                 );
-
+        List<String> list = rootList.stream().map(CostProjectTask::getAuditType).distinct().collect(Collectors.toList());
+        //List<CostDictData> costDictDatas= costDictDataManager.getValueByDictType(list,null,"sys_audit_type");
+
+        QueryWrapper<DataDict> wrapper = new QueryWrapper<>();
+        wrapper.eq("TYPE_ID_","1970328589832323072");
+        wrapper.in("KEY_",list);
+        List<DataDict>  costDictDatas= dataDictManager.list(wrapper);
+        List<String> collect = accessibleApprovals.stream().map(CostProjectApproval::getOrgId).distinct().collect(Collectors.toList());
+        List<Org> orgs = orgManager.getOrgByIds(collect);
         for (CostProjectTask rootTask : rootList) {
+            costDictDatas.stream()
+                    .filter(c -> rootTask.getAuditType() != null &&
+                            rootTask.getAuditType().equals(String.valueOf(c.getKey())))
+                    .findAny().ifPresent(costDictData -> rootTask.setAuditTypeName(costDictData.getName()));
             // 根任务状态
             rootTask.setStatusName(TaskStatusConstant.getStatusNameByCode(rootTask.getStatus()));
             rootTask.setCurrentNodeName(NodeConstant.getNodeValueByKey(rootTask.getCurrentNode()));
@@ -313,6 +339,13 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             // 设置目录
             CostProjectApproval rootDetail = approvalMap.get(rootTask.getProjectId());
             if (rootDetail != null) {
+
+                orgs.stream()
+                        .filter(c -> rootDetail.getOrgId() != null &&
+                                rootDetail.getOrgId().equals(c.getId()))
+                        .findAny().ifPresent(costDictData -> rootTask.setOrgName(costDictData.getName()));
+
+
                 rootTask.setCatalogId(rootDetail.getCatalogId());
                 if (StringUtil.isNotEmpty(rootDetail.getAreaCode())) {
                     CostDistrict district = costDistrictManager.getOne(

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

@@ -47,6 +47,12 @@ public class CostProjectMaterial extends BaseModel<CostProjectMaterial> {
     @TableField("information_type")
     @JsonProperty("informationType")
     private String informationType;
+
+
+    @ApiModelProperty(value = "资料类别")
+    @TableField(exist = false)
+    @JsonProperty("informationTypeName")
+    private String informationTypeName;
     
     @ApiModelProperty(value = "资料名称")
     @TableField("information_name")
@@ -57,7 +63,12 @@ public class CostProjectMaterial extends BaseModel<CostProjectMaterial> {
     @TableField("information_require")
     @JsonProperty("informationRequire")
     private String informationRequire;
-    
+
+    @ApiModelProperty(value = "资料类别名称")
+    @TableField(exist = false)
+    @JsonProperty("informationRequireName")
+    private String informationRequireName;
+
     @ApiModelProperty(value = "资料排序")
     @TableField("order_num")
     @JsonProperty("orderNum")
@@ -153,6 +164,12 @@ public class CostProjectMaterial extends BaseModel<CostProjectMaterial> {
         return informationType;
     }
 
+    public String getInformationTypeName() {
+        return informationTypeName;
+    }
+    public void setInformationTypeName(String informationTypeName) {
+        this.informationTypeName = informationTypeName;
+    }
     public void setInformationType(String informationType) {
         this.informationType = informationType;
     }
@@ -170,6 +187,14 @@ public class CostProjectMaterial extends BaseModel<CostProjectMaterial> {
     public void setInformationRequire(String informationRequire) {
         this.informationRequire = informationRequire;
     }
+
+    public String getInformationRequireName() {
+        return informationRequireName;
+    }
+
+    public void setInformationRequireName(String informationRequireName) {
+        this.informationRequireName = informationRequireName;
+    }
     public Integer getOrderNum() {
         return orderNum;
     }

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

@@ -139,6 +139,12 @@ public class CostProjectTask extends BaseModel<CostProjectTask> {
     @TableField(exist = false)
     private String areaName;
 
+    @TableField(exist = false)
+    private String auditTypeName;
+
+    @TableField(exist = false)
+    private String orgName;
+
     @ApiModelProperty(value = "预警状态：green-绿色预警(在办理期限内) yellow-黄色预警(超过环节期限但没超过流程期限) red-红色预警(超过流程期限)")
     @TableField(exist = false)
     @JsonProperty("warningStatus")

assistMg/src/main/java/com/hotent/project/resp/CostProjectApprovalDetailResp.java

@@ -62,6 +62,11 @@ public class CostProjectApprovalDetailResp {
     @JsonProperty("sourceType")
     private String sourceType;
 
+    @ApiModelProperty(value = "立项来源")
+    //@TableField("source_type")
+    @JsonProperty("sourceName")
+    private String sourceName;
+
     @ApiModelProperty(value = "监审形式")
     //@TableField("audit_type")
     @JsonProperty("auditType")
@@ -165,6 +170,8 @@ public class CostProjectApprovalDetailResp {
     @ApiModelProperty(value = "监审单位名称")
     private String auditUnitName;
 
+    private String catalogName;
+
     @ApiModelProperty(value = "预定的监审工作起止时间（开始）")
     private LocalDate plannedAuditStartDate;
 

assistMg/src/main/java/com/hotent/project/resp/CostProjectProccessNodeResp.java

@@ -38,6 +38,10 @@ public class CostProjectProccessNodeResp {
     @JsonProperty("nodeType")
     private String nodeType;
 
+    @ApiModelProperty(value = "环节类型 1外部环节2内部环节")
+    @JsonProperty("nodeTypeName")
+    private String nodeTypeName;
+
     @ApiModelProperty(value = "序号")
     @JsonProperty("orderNum")
     private Integer orderNum;
@@ -54,6 +58,10 @@ public class CostProjectProccessNodeResp {
     @JsonProperty("status")
     private String status;
 
+    @ApiModelProperty(value = "预置流转操作 100流转下一环节 200退回上一环节 300补充材料 400中止监审 500办结监审 ")
+    @JsonProperty("statusName")
+    private String statusName;
+
     @ApiModelProperty(value = "预置流转操作显示值")
     @JsonProperty("statusValue")
     private String statusValue;

base/src/main/java/com/hotent/base/query/QueryFilter.java

@@ -57,7 +57,7 @@ public class QueryFilter<T extends Model<T>> implements Serializable{
 	@ApiModelProperty(name = "vo", notes = "页面传递请求参数查询")
 	private Map<String, String> vo = new LinkedHashMap<String, String>();
 
-	private QueryFilter() {
+	public QueryFilter() {
 	}
 
 	public static <T extends Model<T>> QueryFilter<T> build() {