1.文书模板新增类型

2.综合查询优化

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

@@ -84,7 +84,8 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 		page.getRecords().forEach(item -> {
 
 		});
-		return this.page(page, queryWrapper);
+		IPage<CostDocumentTemplate> page1 = this.page(page, queryWrapper);
+		return page1;
 	}
 
 	@Override

assistMg/src/main/java/com/hotent/enterpriseDeclare/req/CostTaskReviewPageReq.java

@@ -41,5 +41,7 @@ public class CostTaskReviewPageReq extends PageReq {
     private String endYear;
 
     private String startYear;
+
+    private Integer type=2;
 }
 

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

@@ -58,6 +58,7 @@ public class ComprehensiveStatisticsManagerImpl implements ComprehensiveStatisti
         }
         List<CostProjectApproval> projectApprovals = costProjectApprovalManager.list(projectWrapper);
         QueryWrapper<CostProjectTask> taskWrapper = new QueryWrapper<>();
+        taskWrapper.eq("is_gd",1);
         if (StringUtil.isNotEmpty(req.getAuditedUnitId())) {
             taskWrapper.eq("audited_unit_id",req.getAuditedUnitId());
         }

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

@@ -135,7 +135,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
     @Override
     public IPage<CostProjectDocument> pageList(CostProjectDocumentPageReq req) throws Exception {
         LambdaQueryWrapper<CostProjectDocument> qw = new LambdaQueryWrapper<>();
-        if (req.getDocumentType() != null) {
+        if (StringUtil.isNotEmpty(req.getDocumentType())) {
 //            LambdaQueryWrapper<CostDocumentTemplate> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 //            lambdaQueryWrapper.eq(CostDocumentTemplate::getId, req.getDocumentType());
 //            lambdaQueryWrapper.eq(CostDocumentTemplate::getIsWh, "0");

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

@@ -76,6 +76,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     DataDictManager dataDictManager;
 
     @Autowired
+    UserManager userService;
+
+    @Autowired
     private CostProjectApprovalManager costProjectApprovalManager;
 
     @Autowired
@@ -212,15 +215,42 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         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);
-                })
-        );
+        if (req.getType().equals(1)) {
+            String userId = currentUser.getUserId();
+            User user = userService.getById(userId);
+            Integer dataScope = user.getDataScope();
+            // 只能查自己和自己下属的
+            if(dataScope != null && dataScope != 0){
+                Set<String> areaSet = new HashSet<>();
+                if(dataScope == 1){
+                    String cityCode = user.getCityCode();
+                    String codeSub = cityCode.substring(0, 4);
+                    QueryWrapper<CostDistrict> districtQueryWrapper = new QueryWrapper<>();
+                    districtQueryWrapper.like("code", codeSub);
+                    List<CostDistrict> costDistricts = costDistrictManager.list(districtQueryWrapper);
+                    for (CostDistrict costDistrict1 : costDistricts) {
+                        areaSet.add(costDistrict1.getCode());
+                    }
+                }
+                if(dataScope == 2){
+                    String code = user.getCountyCode();
+                    areaSet.add(code);
+                }
+                approvalQueryWrapper.in(CostProjectApproval::getAreaCode,areaSet);
+                //queryWrapper.in("area_code", areaSet);
+            }
+        }else {
+            // 1. 先查询当前用户有权限的立项（负责人或项目组成员）
+            approvalQueryWrapper.eq(CostProjectApproval::getIsDeleted, "0");
+            approvalQueryWrapper.and(wrapper -> wrapper
+                    .eq(CostProjectApproval::getLeaderId, currentUserId)
+                    .or(projectMembersWrapper -> {
+                        projectMembersWrapper.like(CostProjectApproval::getProjectMembers, currentUserId);
+                    })
+            );
+        }
+
 
 
         if (StringUtil.isNotEmpty(req.getAuditedUnitName())) {

assistMg/src/main/java/com/hotent/project/service/AsyncMaterialSummaryService.java

@@ -559,7 +559,7 @@ public class AsyncMaterialSummaryService {
         );
         for (CostProjectDeliberate deliberate : list) {
             // 只处理有附件的审议记录
-            if (StringUtil.isNotEmpty(deliberate.getAttachmentIds())) {
+            if (StringUtil.isNotEmpty(deliberate.getAttachmentUrl())) {
                 CostProjectTaskMaterialSummaryDetail detail = new CostProjectTaskMaterialSummaryDetail();
                 detail.setMasterId(summary.getId());
                 detail.setTaskId(mainTask.getId());
@@ -568,7 +568,7 @@ public class AsyncMaterialSummaryService {
                 detail.setAuditedUnitName("");
                 detail.setFileSource("系统生成电子文书");
                 detail.setPageCount(0);
-                detail.setAttachmentUrl(deliberate.getAttachmentIds());
+                detail.setAttachmentUrl(deliberate.getAttachmentUrl());
                 detail.setOrderNum(orderNum++);
                 detail.setIsDeleted("0");
                 costProjectTaskMaterialSummaryDetailManager.save(detail);

assistMg/src/main/resources/mapper/CostDocumentTemplateMapper.xml

@@ -20,11 +20,13 @@
         <result column="update_by" property="updateBy"/>
         <result column="table_id" property="tableId"/>
         <result column="is_wh" property="isWh"/>
+        <result column="document_type" property="documentType"/>
+        <result column="document_type_name" property="documentTypeName"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id
+        id,document_type,document_type_name
         , document_name, alias, type, data_source_type, file_url, version_details, description, status, is_deleted,is_wh, create_time, create_by, update_time, update_by, table_id
     </sql>