assistMg/src/main/java/com/hotent/baseInfo/controller/AuditedUnitController.java

@@ -1,6 +1,8 @@
 package com.hotent.baseInfo.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.exception.BaseException;
@@ -9,6 +11,7 @@ import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.baseInfo.manager.AuditedUnitManager;
+import com.hotent.baseInfo.req.AuditedUnitGetUserReq;
 import com.hotent.baseInfo.req.AuditedUnitPageReq;
 import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
 import com.hotent.common.CrudService;
@@ -16,16 +19,20 @@ import com.hotent.constant.BaseConstant;
 import com.hotent.project.model.CostAnnualPlan;
 import com.hotent.project.req.CostAnnualPlanPageReq;
 import com.hotent.resp.PageResp;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Api(tags = "被监审单位管理")
 @RestController
@@ -36,6 +43,9 @@ public class AuditedUnitController {
     @Autowired
     private AuditedUnitManager auditedUnitManager;
 
+    @Autowired
+    UserManager userService;
+
     // 创建通用服务实例
     private final CrudService crudService = new CrudService();
 
@@ -52,6 +62,33 @@ public class AuditedUnitController {
         }
     }
 
+    @PostMapping(value="/users/getList")
+    public PageList<User> getList(@RequestBody AuditedUnitGetUserReq req){
+        List<AuditedUnit> auditedUnits = auditedUnitManager.list();
+        // Apache Commons Lang
+        List<String> stringList = auditedUnits.stream()
+                .map(AuditedUnit::getAccount)
+                .filter(StringUtils::isNotBlank)
+                .distinct()
+                .collect(Collectors.toList());
+
+        QueryWrapper<User> wrapper = new QueryWrapper<>();
+        wrapper.notIn("ID_",stringList);
+        if (StringUtils.isNotBlank(req.getKeyword())) {
+            String keyword = req.getKeyword().trim();
+            wrapper.and(w -> w
+                    .like("FULLNAME_", keyword)      // 姓名模糊查询
+                    .or()
+                    .like("ACCOUNT_", keyword)   // 账号模糊查询
+            );
+        }
+        // 5. 分页查询
+        IPage<User> userPage = userService.page(
+                new Page<>(req.getPage(), req.getPageSize()),
+                wrapper
+        );
+        return new PageList<User>(userPage);
+    }
 
     @GetMapping("/list")
     @ApiOperation(value = "查询单位列表", notes = "按区域与名称过滤，上级可查看下级单位")

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

@@ -248,9 +248,9 @@ public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, Cost
         if (costCatalog == null) {
             throw new BaseException("父节点不存在");
         }
-        if (costCatalog.getNodeType().equals(BaseConstant.CATALOG_TYPE_NR)) {
+        /*if (costCatalog.getNodeType().equals(BaseConstant.CATALOG_TYPE_NR)) {
             throw new BaseException("父节点不能为内容节点");
-        }
+        }*/
 
         CostCatalog catalog = CopyUtil.copy(createDto, CostCatalog.class);
         catalog.setCatalogId(createDto.getId());

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

@@ -53,6 +53,9 @@ public class CostInformationManagerImpl extends BaseManagerImpl<CostInformationD
 		if(StringUtil.isNotEmpty(req.getDocumentNumber())){
 			qw.like(CostInformation::getDocumentNumber, req.getDocumentNumber());
 		}
+		if (StringUtil.isNotEmpty(req.getCatalogId())) {
+			qw.like(CostInformation::getCatalogId, req.getCatalogId());
+		}
 		IPage<CostInformation> page = new Page<>(req.getPageNum(), req.getPageSize());
 		IPage<CostInformation> respPage = this.page(page, qw);
 		for (CostInformation record : respPage.getRecords()) {

assistMg/src/main/java/com/hotent/baseInfo/req/AuditedUnitGetUserReq.java

@@ -0,0 +1,22 @@
+package com.hotent.baseInfo.req;/**
+ * @program: cbjs-mvue-master
+ * @description:
+ * @author: zhao yue yue
+ * @create: 2026-01-21 15:04
+ */
+
+import com.hotent.base.query.PageBean;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *@author: zhao yue yue
+ *@create: 2026-01-21 15:04
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AuditedUnitGetUserReq extends PageBean {
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+}

assistMg/src/main/java/com/hotent/baseInfo/req/CostInformationPageReq.java

@@ -16,7 +16,8 @@ public class CostInformationPageReq extends PageReq {
     @ApiModelProperty(value = "文号")
     private  String documentNumber;
 
-
+    @ApiModelProperty(value = "id")
+    private  String catalogId;
 
 
 }

assistMg/src/main/java/com/hotent/dataMiddlePlatform/controller/DataMiddlePlatformController.java

@@ -55,6 +55,7 @@ public class DataMiddlePlatformController {
     @ApiOperation(value = "接收中台用户数据", notes = "接收中台用户数据")
     public CommonResult<String> base(@RequestBody MiddlePlatformBaseParam param) {
         try {
+            System.out.println(param);
             String msg= dataMiddlePlatformManager.base(param);
             return CommonResult.<String>ok().message(msg);
         } catch (Exception e) {

assistMg/src/main/java/com/hotent/dataMiddlePlatform/manager/impl/DataMiddlePlatformManagerImpl.java

@@ -123,10 +123,12 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
                 OrgVo orgVo = new OrgVo();
                 BeanUtils.copyProperties(o,orgVo);
                 AreaFullInfo fullInfoByCode = areaService.getFullInfoByCode(o.getAreaCode());
-                orgVo.setProvinceCode(fullInfoByCode.getProvinceCode());
-                orgVo.setCityCode(fullInfoByCode.getCityCode());
-                orgVo.setCountyCode(fullInfoByCode.getDistrictCode());
-                orgVo.setDataScope(fullInfoByCode.getInputLevel()-1);
+                if (fullInfoByCode!=null) {
+                    orgVo.setProvinceCode(fullInfoByCode.getProvinceCode());
+                    orgVo.setCityCode(fullInfoByCode.getCityCode());
+                    orgVo.setCountyCode(fullInfoByCode.getDistrictCode());
+                    orgVo.setDataScope(fullInfoByCode.getInputLevel()-1);
+                }
                 return orgVo;
             }).collect(Collectors.toList());
             orgManager.addOrgs(orgVoList);
@@ -284,13 +286,18 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
                         org.springframework.beans.BeanUtils.copyProperties(userParam,userVo);
                         userVo.setFrom("ZT");
                         AreaFullInfo fullInfoByCode = areaService.getFullInfoByCode(userParam.getAreaCode());
-                        userVo.setProvinceCode(fullInfoByCode.getProvinceCode());
-                        userVo.setCityCode(fullInfoByCode.getCityCode());
-                        userVo.setCountyCode(fullInfoByCode.getDistrictCode());
-                        userVo.setDataScope(fullInfoByCode.getInputLevel()-1);
-                        userVo.setOrgId(userParam.getDeptId());
+                        if(fullInfoByCode!=null){
+                            userVo.setProvinceCode(fullInfoByCode.getProvinceCode());
+                            userVo.setCityCode(fullInfoByCode.getCityCode());
+                            userVo.setCountyCode(fullInfoByCode.getDistrictCode());
+                            userVo.setDataScope(fullInfoByCode.getInputLevel()-1);
+                            userVo.setOrgId(userParam.getDeptId());
+
+                        }
                         User user = userService.getById(userVo.getId());
                         if (user==null) {
+                            userVo.setPassword("zt123456.");
+                            userVo.setFrom("ZT");
                             userService.addUser(userVo);
                         }else {
                             userService.updateUser(userVo);
@@ -306,10 +313,13 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
                     org.setCode(orgParam.getCode());
 
                     AreaFullInfo fullInfoByCode = areaService.getFullInfoByCode(orgParam.getAreaCode());
-                    org.setProvinceCode(fullInfoByCode.getProvinceCode());
-                    org.setCityCode(fullInfoByCode.getCityCode());
-                    org.setCountyCode(fullInfoByCode.getDistrictCode());
-                    org.setDataScope(fullInfoByCode.getInputLevel()-1);
+                    if(fullInfoByCode!=null){
+                        org.setProvinceCode(fullInfoByCode.getProvinceCode());
+                        org.setCityCode(fullInfoByCode.getCityCode());
+                        org.setCountyCode(fullInfoByCode.getDistrictCode());
+                        org.setDataScope(fullInfoByCode.getInputLevel()-1);
+                    }
+
                     org.setOrderNo(Long.valueOf(orgParam.getOrderNo()));
                     org.setDemId(orgParam.getDemId());
                     org.setOrgType(orgParam.getOrgType()!=null?Integer.parseInt(orgParam.getOrgType()):0);

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/material/CostProjectTaskSurveyGenericController.java

@@ -620,7 +620,11 @@ public class CostProjectTaskSurveyGenericController {
         record.setIsDeleted("0");
         record.setType(record.getType());
         costAuditPeriodRecordManager.save(record);
-
+        CostSurveyTemplateUpload surveyTemplateUploadManagerById = costSurveyTemplateUploadManager.getById(record.getUploadId());
+        if (surveyTemplateUploadManagerById!=null) {
+            surveyTemplateUploadManagerById.setIsUpload("1");
+        }
+        costSurveyTemplateUploadManager.updateById(surveyTemplateUploadManagerById);
         return CommonResult.<CostAuditPeriodRecord>ok().value(record).message("新增监审期间记录成功");
     }
 
@@ -673,6 +677,11 @@ public class CostProjectTaskSurveyGenericController {
                     .eq("type", type);
 
             costSurveyTemplateUploadDataManager.remove(wrapper);
+            CostSurveyTemplateUpload surveyTemplateUploadManagerById = costSurveyTemplateUploadManager.getById(record.getUploadId());
+            if (surveyTemplateUploadManagerById!=null) {
+                surveyTemplateUploadManagerById.setIsUpload("0");
+            }
+            costSurveyTemplateUploadManager.updateById(surveyTemplateUploadManagerById);
         }
 
         return CommonResult.<String>ok().message("删除监审期间记录成功");

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

@@ -28,6 +28,8 @@ import com.hotent.base.controller.BaseController;
 import com.hotent.project.model.CostProjectProccess;
 import com.hotent.project.manager.CostProjectProccessManager;
 
+import java.util.Map;
+
 /**
  * 流程表 前端控制器
  *
@@ -76,6 +78,15 @@ public class CostProjectProccessController {
 
 
 
+	//根据id获取详情
+	@GetMapping(value = "/getOrganizeUser")
+	@ApiOperation(value = "根据项目id获取详情", httpMethod = "GET", notes = "根据项目id获取详情")
+	public CommonResult<Map<String,Object>> getOrganizeUser(@ApiParam(value = "项目id", required = true) @RequestParam String projectId) {
+		Map<String,Object> map=costProjectProccessManager.getOrganizeUser(projectId);
+		return CommonResult.<Map<String,Object>>ok().value(map);
+	}
+
+
 
 
 

assistMg/src/main/java/com/hotent/project/dao/CostAnnualPlanDao.java

@@ -5,6 +5,8 @@ import com.hotent.project.model.CostAnnualPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 年度监审计划表 Mapper 接口
  *
@@ -23,5 +25,6 @@ public interface CostAnnualPlanDao extends BaseMapper<CostAnnualPlan> {
             , @Param("areaCode") String areaCode
             , @Param("projectName") String projectName
             ,@Param("initiationStatus") Integer initiationStatus
+            ,@Param("areaCodes") List<Object> areaCodes
            );
 }

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

@@ -8,6 +8,8 @@ import com.hotent.project.req.CostProjectBasePageReq;
 import com.hotent.project.req.CostProjectProcessReq;
 import com.hotent.project.resp.CostProjectProccessResp;
 
+import java.util.Map;
+
 /**
  * 流程表 服务类
  *
@@ -37,4 +39,5 @@ public interface CostProjectProccessManager extends BaseManager<CostProjectProcc
 	CostProjectProccess getProcessByProjectId(String projectId);
 
 
+	Map<String, Object> getOrganizeUser(String projectId);
 }

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

@@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.exception.BaseException;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.manager.AuditedUnitManager;
+import com.hotent.baseInfo.manager.CostDistrictManager;
 import com.hotent.baseInfo.model.AuditedUnit;
+import com.hotent.baseInfo.model.CostDistrict;
 import com.hotent.constant.BaseConstant;
 import com.hotent.project.model.CostAnnualPlan;
 import com.hotent.project.dao.CostAnnualPlanDao;
@@ -32,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -56,6 +59,9 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 	private UserManager userService;
 
 	@Autowired
+	private CostDistrictManager costDistrictManager;
+
+	@Autowired
 	private AuditedUnitManager auditedUnitManager;
 
 	@Override
@@ -125,6 +131,17 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 		req.setProvinceCode(user.getProvinceCode());
 		req.setCityCode(user.getCityCode());
 		req.setCountyCode(user.getCountyCode());
+
+		List<Object> objects = new ArrayList<>();
+		if(StringUtil.isNotEmpty(req.getAreaCode())){
+			objects.add(req.getAreaCode());
+			CostDistrict district = costDistrictManager.getByCode(req.getAreaCode());
+			QueryWrapper<CostDistrict> wrapper = new QueryWrapper<>();
+			wrapper.eq("pid",district.getId());
+			List<CostDistrict> list = costDistrictManager.list(wrapper);
+			List<String> strings = list.stream().map(CostDistrict::getCode).distinct().collect(Collectors.toList());
+			objects.addAll(strings);
+		}
 		Page<CostAnnualPlan> objectPage = new Page<>(req.getPage(),req.getPageSize());
 		//Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
 		Page<CostAnnualPlan> page =baseMapper.getCostAnnualPlanPage(objectPage
@@ -134,7 +151,7 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 				,req.getPlanYear()
 				,req.getAreaCode()
 				,req.getProjectName()
-				,req.getInitiationStatus()
+				,req.getInitiationStatus(),objects
 		);
 		return new PageList<>(page);
 	}

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

@@ -447,7 +447,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         QueryWrapper<CostProjectDocument> wrapper = new QueryWrapper<>();
         wrapper.in("enterprise_id",req.getAuditedUnitId());
         wrapper.eq("project_id",req.getProjectId());
-        wrapper.eq("document_type",4);
+        wrapper.eq("document_type","4");
         List<CostProjectDocument> list = costProjectDocumentManager.list(wrapper);
 
         if (list == null || list.isEmpty() || list.size()!=req.getAuditedUnitId().size()) {

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

@@ -739,9 +739,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         if (ObjectUtil.isEmpty(req.getId())) {
             throw new BaseException("请选择要修改的文书");
         }
-        if (ObjectUtil.isEmpty(req.getFeedbackDocumentUrl())) {
+        /*if (ObjectUtil.isEmpty(req.getFeedbackDocumentUrl())) {
             throw new BaseException("被监审单位反馈资料附件ID集合不能为空");
-        }
+        }*/
         CostProjectDocument projectDocument = this.get(req.getId());
         if(projectDocument==null){
             throw new BaseException("根据id未查询到实体信息");

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

@@ -77,73 +77,6 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 
 @Override
 	public IPage<CostProjectMemo> pageList(CostProjectMemoQueryReq req){
-		// 检查pageNum和pageSize是否合理
-		/*if (req.getPageNum() <= 0 || req.getPageSize() <= 0) {
-			throw new IllegalArgumentException("pageNum和pageSize必须大于0");
-		}*/
-
-		/*LambdaQueryWrapper<CostProjectMemo> qw = new LambdaQueryWrapper<>();
-		if (req.getProjectId() != null) {
-			qw.eq(CostProjectMemo::getProjectId, req.getProjectId());
-		}
-		if (req.getStartTime() != null && req.getEndTime() != null) {
-			qw.between(CostProjectMemo::getCreateTime, req.getStartTime(), req.getEndTime());
-		}
-		if (StringUtil.isNotEmpty(req.getContent())) {
-			qw.like(CostProjectMemo::getContent, req.getContent());
-		}
-
-		if(ObjectUtil.isNotEmpty(req.getYear())){
-			qw.like(CostProjectMemo::getCreateTime, req.getYear());
-		}
-		qw.orderByDesc(CostProjectMemo::getId);*/
-
-		// 使用MyBatis Plus分页查询
-		/*Page<CostProjectMemo> page = new Page<>(req.getPageNum(), req.getPageSize());
-		IPage<CostProjectMemo> costProjectMemoIPage = this.page(page, qw);
-
-		// 查询年度计划项目名称
-		List<CostProjectMemo> costProjectMemos = costProjectMemoIPage.getRecords();
-		List<String> planNameIds = costProjectMemos.stream()
-				.map(CostProjectMemo::getProjectId)
-				.filter(java.util.Objects::nonNull)
-				.distinct()
-				.collect(Collectors.toList());
-
-		Map<String,  CostProjectApproval> planNameMap;
-		if (!planNameIds.isEmpty()) {
-			LambdaQueryWrapper< CostProjectApproval> qwPlan = new LambdaQueryWrapper<>();
-			qwPlan.in( CostProjectApproval::getProjectId, planNameIds);
-			List< CostProjectApproval> planNameList = costProjectApprovalDao.selectList(qwPlan);
-			planNameMap = planNameList.stream()
-					.collect(Collectors.toMap(
-							 CostProjectApproval::getProjectId,
-							Function.identity(),
-							(existing, replacement) -> existing
-					));
-		} else {
-            planNameMap = new HashMap<>();
-        }
-
-    // 转换为响应对象
-		List<CostProjectMemoQueryResp> costProjectMemoQueryResps = costProjectMemos.stream().map(item -> {
-			CostProjectMemoQueryResp resp = CopyUtil.copy(item, CostProjectMemoQueryResp.class);
-			resp.setId(item.getId());
-			 CostProjectApproval planName = planNameMap.get(String.valueOf(item.getProjectId()));
-			if (planName != null) {
-				resp.setProjectName(planName.getProjectName());
-			} else {
-				resp.setProjectName("");
-			}
-			return resp;
-		}).collect(Collectors.toList());
-
-		// 构造返回的分页对象
-		Page<CostProjectMemoQueryResp> respPage = new Page<>(req.getPageNum(), req.getPageSize(), costProjectMemoIPage.getTotal());
-		respPage.setRecords(costProjectMemoQueryResps);*/
-
-		//return respPage;
-
 
 
 	IUser iUser = ContextUtil.getCurrentUser();

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

@@ -6,13 +6,9 @@ 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.model.*;
 import com.hotent.project.dao.CostProjectProccessDao;
 import com.hotent.base.manager.impl.BaseManagerImpl;
-import com.hotent.project.model.CostProjectProccessNode;
-import com.hotent.project.model.CostProjectProccessNodeDetail;
-import com.hotent.project.model.CostProjectProccessNodeTemplete;
 import com.hotent.project.req.CostProjectProcessNodeReq;
 import com.hotent.project.req.CostProjectProcessReq;
 import com.hotent.project.resp.CostProjectProccessNodeResp;
@@ -28,10 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -50,7 +43,8 @@ public class CostProjectProccessManagerImpl extends BaseManagerImpl<CostProjectP
 
     @Autowired
     private CostProjectProccessNodeTempleteManager costProjectProccessNodeTempleteManager;
-
+    @Autowired
+    private CostProjectApprovalManager costProjectApprovalManager;
 
     @Autowired
     private CostProjectProccessNodeManager costProjectProccessNodeManager;
@@ -317,6 +311,24 @@ public class CostProjectProccessManagerImpl extends BaseManagerImpl<CostProjectP
         return one;
     }
 
+    @Override
+    public Map<String, Object> getOrganizeUser(String projectId) {
+        CostProjectApproval costProjectApproval = costProjectApprovalManager.getById(projectId);
+        String[] split = costProjectApproval.getLeaderIds().split(",");
+        String[] strings = costProjectApproval.getProjectMembers().split(",");
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        if (split.length>1) {
+            objectObjectHashMap.put("organizeUserId",split[split.length-1]);
+            User user = userManager.getById(split[split.length - 1]);
+            objectObjectHashMap.put("organizeUserName",user.getFullname());
+            objectObjectHashMap.put("handlingUserId",strings[strings.length-1]);
+            User handlingUser = userManager.getById(strings[strings.length - 1]);
+            objectObjectHashMap.put("handlingUserName",handlingUser.getFullname());
+
+        }
+        return objectObjectHashMap;
+    }
+
     private static CostProjectProccessNode getCostProjectProccessNode(CostProjectProccessNodeTemplete
                                                                               nodeTemplete, CostProjectProccess costProjectProccess, CostProjectProcessNodeReq nodeReq) {
         CostProjectProccessNode costProjectProccessNode = new CostProjectProccessNode();

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

@@ -825,7 +825,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                         childTask.setStatus(TaskStatusConstant.BCCL.getStatusCode());
                         costProjectTaskManager.updateById(childTask);
                         // 通知内容组装（针对子任务对应的单位）
-                        String childContent = "【" + nodeName + "】您有一条任务未处理，请及时办理";
+                        String childContent = "【" + nodeName + "】您有一条任务需要补充资料，请及时办理";
                         if (StringUtil.isNotEmpty(req.getContent())) {
                             childContent += "，原因：" + req.getContent();
                         }
@@ -853,7 +853,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 }
                 task.setStatus(TaskStatusConstant.BCCL.getStatusCode());
                 costProjectTaskManager.updateById(task);
-                String content = "【" + nodeName + "】您有一条任务未处理，请及时办理";
+                String content = "【" + nodeName + "】您有一条任务需要补充资料，请及时办理";
                 if (StringUtil.isNotEmpty(req.getContent())) {
                     content += "，原因：" + req.getContent();
                 }

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

@@ -64,6 +64,9 @@ public class CostProjectTaskMaterialManagerImpl extends BaseManagerImpl<CostProj
 			CostProjectTaskMaterial oldMaterial = this.getById(costProjectTaskMaterial.getId());
 			if (oldMaterial != null) {
 				oldFileUrl = oldMaterial.getFileUrl();
+				if (oldMaterial.getAuditedStatus().equals("2") || oldMaterial.getAuditedStatus().equals("1")) {
+					costProjectTaskMaterial.setAuditedStatus("0");
+				}
 			}
 		}
 

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyFdTemplateVersionController.java

@@ -62,7 +62,13 @@ public class CostSurveyFdTemplateVersionController extends BaseController<CostSu
 		List<CostSurveyFdTemplateVersion> versions = baseService.selectByFdTemplateIdAndStatus(surveyTemplateId, status);
 		return CommonResult.<List<CostSurveyFdTemplateVersion>>ok().value(versions);
 	}
-
+	@PostMapping(value="/modify")
+	@ApiOperation(value="修改",httpMethod = "POST",notes = "修改")
+	public CommonResult<CostSurveyFdTemplateVersion> modify(
+			@RequestBody CostSurveyFdTemplateVersion version) throws Exception{
+		CostSurveyFdTemplateVersion fdTemplateVersion=baseService.modify(version);
+		return CommonResult.<CostSurveyFdTemplateVersion>ok().value(fdTemplateVersion);
+	}
 
 
 	/**
@@ -113,30 +119,38 @@ public class CostSurveyFdTemplateVersionController extends BaseController<CostSu
 	@ApiOperation(value = "版本发布", httpMethod = "POST", notes = "版本发布")
 	public CommonResult<String>  publishVersion(@RequestBody CostSurveyFdTemplateVersion version) {
 
-// 1. 检查是否存在现行版本
-		CostSurveyFdTemplateVersion currentVersion =
-				costSurveyTemplateVersionMapper.selectCurrentVersion(version.getSurveyTemplateId());
-
-		if (currentVersion != null) {
-			// 2. 将现有现行版本状态改为"历史"
-			currentVersion.setStatus("1"); // 1-历史
-			currentVersion.setUpdateTime(LocalDateTime.now());
-			costSurveyTemplateVersionMapper.updateById(currentVersion);
+		if (version.getStatus().equals("1")) {
+			version.setUpdateTime(LocalDateTime.now());
+			costSurveyTemplateVersionMapper.updateById(version);
+		}else {
+			// 1. 检查是否存在现行版本
+			CostSurveyFdTemplateVersion currentVersion =
+					costSurveyTemplateVersionMapper.selectCurrentVersion(version.getSurveyTemplateId());
+
+			if (currentVersion != null) {
+				// 2. 将现有现行版本状态改为"历史"
+				currentVersion.setStatus("1"); // 1-历史
+				currentVersion.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateVersionMapper.updateById(currentVersion);
+				// 3. 设置新版本为"现行"
+				version.setStatus("0"); // 0-现行
+				version.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateVersionMapper.updateById(version);
+			}else {
+				// 3. 设置新版本为"现行"
+				version.setStatus("0"); // 0-现行
+				version.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateVersionMapper.updateById(version);
+			}
+			// 4. 更新模板状态
+			CostSurveyFdTemplate template = costSurveyTemplateMapper.getDetail(version.getSurveyTemplateId());
+			if (template != null) {
+				template.setStatus("0"); // 启用
+				template.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateMapper.updateById(template);
+			}
 		}
 
-		// 3. 设置新版本为"现行"
-		version.setStatus("0"); // 0-现行
-		version.setCreateTime(LocalDateTime.now());
-		version.setUpdateTime(LocalDateTime.now());
-		costSurveyTemplateVersionMapper.updateById(version);
-
-		// 4. 更新模板状态
-		CostSurveyFdTemplate template = costSurveyTemplateMapper.getDetail(version.getSurveyTemplateId());
-		if (template != null) {
-			template.setStatus("0"); // 启用
-			template.setUpdateTime(LocalDateTime.now());
-			costSurveyTemplateMapper.updateById(template);
-		}
 
 		return CommonResult.<String>ok().message("版本发布成功");
 	}

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateController.java

@@ -383,10 +383,10 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
             // 复制源模板的基本属性
             ttemplateId = UUID.randomUUID().toString();
             costVerifyTemplate.setSurveyTemplateId(ttemplateId);
-            costVerifyTemplate.setSurveyTemplateName(sourceTemplate.getSurveyTemplateName());
+            costVerifyTemplate.setSurveyTemplateName(templatename);
             costVerifyTemplate.setTemplateType(sourceTemplate.getTemplateType());
             costVerifyTemplate.setCreatemode("1");
-            costVerifyTemplate.setSurveyTemplateNameYw(PinyinUtil.getPinyin(sourceTemplate.getSurveyTemplateName()));
+            costVerifyTemplate.setSurveyTemplateNameYw(PinyinUtil.getPinyin(templatename));
             costVerifyTemplate.setCreatetemplateid(sourceTemplate.getSurveyTemplateId());
             costVerifyTemplate.setStatus(taskId==null?"-1":"0");
             costVerifyTemplate.setCatalogId(catalogId);

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateVersionController.java

@@ -125,36 +125,40 @@ public class CostSurveyTemplateVersionController extends BaseController<CostSurv
 	@PostMapping("/publish-version")
 	@ApiOperation(value = "版本发布", httpMethod = "POST", notes = "版本发布")
 	public CommonResult<String>  publishVersion(@RequestBody CostSurveyTemplateVersion version) {
-
-		// 1. 检查是否存在现行版本
-		CostSurveyTemplateVersion currentVersion =
-				costSurveyTemplateVersionMapper.selectCurrentVersion(version.getSurveyTemplateId());
-
-		if (currentVersion != null) {
-			// 2. 将现有现行版本状态改为"历史"
-			currentVersion.setStatus("1"); // 1-历史
-			currentVersion.setUpdateTime(LocalDateTime.now());
-			costSurveyTemplateVersionMapper.updateById(currentVersion);
+		if (version.getStatus().equals("1")){
 			// 3. 设置新版本为"现行"
 			version.setStatus("0"); // 0-现行
-			version.setCreateTime(LocalDateTime.now());
-			version.setUpdateTime(LocalDateTime.now());
 			costSurveyTemplateVersionMapper.updateById(version);
 		}else {
-			// 3. 设置新版本为"现行"
-			version.setStatus("0"); // 0-现行
-			version.setCreateTime(LocalDateTime.now());
-			version.setUpdateTime(LocalDateTime.now());
-			costSurveyTemplateVersionMapper.updateById(version);
-		}
-		// 4. 更新模板状态
-		CostSurveyTemplate template = costSurveyTemplateMapper.getDetail(version.getSurveyTemplateId());
-		if (template != null) {
-			template.setStatus("0"); // 启用
-			template.setUpdateTime(LocalDateTime.now());
-			costSurveyTemplateMapper.updateById(template);
+			// 1. 检查是否存在现行版本
+			CostSurveyTemplateVersion currentVersion =
+					costSurveyTemplateVersionMapper.selectCurrentVersion(version.getSurveyTemplateId());
+
+			if (currentVersion != null) {
+				// 2. 将现有现行版本状态改为"历史"
+				currentVersion.setStatus("1"); // 1-历史
+				currentVersion.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateVersionMapper.updateById(currentVersion);
+				// 3. 设置新版本为"现行"
+				version.setStatus("0"); // 0-现行
+				version.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateVersionMapper.updateById(version);
+			}else {
+				// 3. 设置新版本为"现行"
+				version.setStatus("0"); // 0-现行
+				version.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateVersionMapper.updateById(version);
+			}
+			// 4. 更新模板状态
+			CostSurveyTemplate template = costSurveyTemplateMapper.getDetail(version.getSurveyTemplateId());
+			if (template != null) {
+				template.setStatus("0"); // 启用
+				template.setUpdateTime(LocalDateTime.now());
+				costSurveyTemplateMapper.updateById(template);
+			}
 		}
 
+
 		return CommonResult.<String>ok().message("版本发布成功");
 	}
 

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostVerifyTemplateController.java

@@ -106,7 +106,15 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 	public CommonResult<List<CostVerifyTemplate>> listEnabled() throws Exception {
 		CostVerifyTemplate queryCondition = new CostVerifyTemplate();
 		queryCondition.setStatus("0"); // 启用状态
-
+		IUser iUser = ContextUtil.getCurrentUser();
+		User user = userService.getByAccount(iUser.getAccount());
+		if (user.getDataScope().equals(1)) {
+			queryCondition.setAreaCode(user.getCityCode());
+		} else if (user.getDataScope().equals(2)) {
+			queryCondition.setAreaCode(user.getCountyCode());
+		}else {
+			queryCondition.setAreaCode(user.getProvinceCode());
+		}
 		List<CostVerifyTemplate> enabledTemplates = costSurveyTemplateDao.selectByCondition(queryCondition);
 		return CommonResult.<List<CostVerifyTemplate>>ok().value(enabledTemplates);
 	}

assistMg/src/main/java/com/hotent/surveyinfo/manager/CostSurveyFdTemplateVersionManager.java

@@ -55,4 +55,5 @@ public interface CostSurveyFdTemplateVersionManager extends BaseManager<CostSurv
 	 */
 	List<CostSurveyFdTemplateVersion> selectByFdTemplateIdAndStatus(String surveyFdTemplateId, String status);
 
+	CostSurveyFdTemplateVersion modify(CostSurveyFdTemplateVersion version);
 }

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyFdTemplateVersionManagerImpl.java

@@ -1,6 +1,7 @@
 package com.hotent.surveyinfo.manager.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hotent.base.exception.BaseException;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.surveyinfo.dao.CostSurveyFdTemplateVersionDao;
 import com.hotent.surveyinfo.dao.CostSurveyTemplateVersionDao;
@@ -146,5 +147,16 @@ public class CostSurveyFdTemplateVersionManagerImpl extends BaseManagerImpl<Cost
 		return this.list(wrapper);
 	}
 
+	@Override
+	public CostSurveyFdTemplateVersion modify(CostSurveyFdTemplateVersion version) {
+		CostSurveyFdTemplateVersion costSurveyFdTemplateVersion = this.getById(version.getId());
+		if (costSurveyFdTemplateVersion==null) {
+			throw new BaseException("实体未查询到");
+		}
+		costSurveyFdTemplateVersion.setRemarks(version.getRemarks());
+		this.updateById(costSurveyFdTemplateVersion);
+		return costSurveyFdTemplateVersion;
+	}
+
 
 }

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

@@ -59,15 +59,20 @@
         SELECT
         c.*
         FROM
-        cost_annual_plan c,
-        uc_user u
+        cost_annual_plan c
         WHERE
-        c.create_by=u.ID_
+        0=0
         <if test=" planYear != null and  planYear != ''">
             and c.plan_year=#{planYear}
         </if>
-        <if test=" areaCode != null and  areaCode != ''">
-            and c.area_code=#{areaCode}
+
+
+
+        <if test="areaCodes != null and !areaCodes.isEmpty()">
+            and c.area_code in
+            <foreach collection="areaCodes" item="code" open="(" separator="," close=")">
+                #{code}
+            </foreach>
         </if>
 
         <if test=" projectName != null and  projectName != ''">
@@ -80,10 +85,10 @@
 
         <if test=" dataScope != null and  dataScope != ''">
             <if test=" dataScope ==1">
-                and  (u.CITY_CODE=#{ cityCode} or c.area_code=#{ cityCode})
+                and  ( c.area_code=#{ cityCode})
             </if>
             <if test=" dataScope ==2">
-                and (u.COUNTY_CODE=#{ countyCode} or c.area_code=#{ countyCode})
+                and ( c.area_code=#{ countyCode})
             </if>
         </if>
         ORDER BY c.create_time DESC

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

@@ -123,7 +123,7 @@
             </if>
         </where>
 
-        ORDER BY cpm.create_time DESC
+        ORDER BY cpm.reminder_type ,cpm.memo_date DESC
     </select>
 	<select id="getIndexList" resultType="com.hotent.project.model.CostProjectMemo">
         SELECT

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

@@ -39,6 +39,9 @@
 		FROM
 		cost_verify_template
 		<where>
+			<if test="costSurveyTemplate.areaCode != null and costSurveyTemplate.areaCode != ''">
+				AND area_code = #{costSurveyTemplate.areaCode}
+			</if>
 			<if test="costSurveyTemplate.surveyTemplateId != null and costSurveyTemplate.surveyTemplateId != ''">
 				AND survey_template_id = #{costSurveyTemplate.surveyTemplateId}
 			</if>

uc/src/main/java/com/hotent/uc/controller/UserController.java

@@ -162,6 +162,9 @@ public class UserController extends BaseController<UserManager, User> {
 	}
 
 
+
+
+
 	@RequestMapping(value="users/getAllUser",method=RequestMethod.GET, produces = {
 			"application/json; charset=utf-8" })
 	@ApiOperation(value = "获取系统中所有用户", httpMethod = "GET", notes = "获取系统中所有用户")
@@ -171,7 +174,8 @@ public class UserController extends BaseController<UserManager, User> {
 
 	@RequestMapping(value="users/getAllUserListByFilter",method=RequestMethod.POST, produces = {"application/json; charset=utf-8" })
 	@ApiOperation(value = "获取系统中所有用户 根据条件", httpMethod = "POST", notes = "获取系统中所有用户")
-	public List<UserVo> getAllUserListByFilter(@ApiParam(name="queryFilter",value="通用查询对象") @RequestBody QueryFilter queryFilter) throws Exception{
+	public List<UserVo> getAllUserListByFilter(@ApiParam(name="queryFilter",value="通用查询对象")
+												   @RequestBody QueryFilter queryFilter) throws Exception{
 		List<UserVo> query = userService.queryUser(queryFilter);
 		return query;
 	}

uc/src/main/java/com/hotent/uc/manager/UserManager.java

@@ -844,4 +844,5 @@ public interface UserManager extends BaseManager<User>{
 	List<User> getUserListByRoleCodes(List<String> list1,List<String> auditGroups);
 
 	List<User> getUserListByIds(List<String> ids);
+
 }

uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java

@@ -198,6 +198,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 	OrgUserManager orgUserManager;
 	@Autowired
 	UserParamsDao userParamsDao;
+
 	@Autowired
 	OrgManager orgService;
 	@Autowired
@@ -294,10 +295,17 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		newUser.setStatus(User.STATUS_NORMAL);
 		newUser.setId(UniqueIdUtil.getSuid());
 		newUser.setCreateTime(LocalDateTime.now());
-		newUser.setFrom(User.FROM_RESTFUL);
+		if (StringUtil.isEmpty(user.getFrom())) {
+			newUser.setFrom(User.FROM_RESTFUL);
+		}else {
+			newUser.setFrom(user.getFrom());
+		}
+
 		String password = user.getPassword();
 		if (StringUtil.isEmpty(user.getPassword())) {
 			password = pwdStrategyManager.getDefault().getInitPwd();
+		}else {
+			password="zt123456.";
 		}
 		newUser.setPassword(passwordEncoder.encode(password));
 		newUser.setPwdCreateTime(LocalDateTime.now());
@@ -4044,6 +4052,8 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 	}
 
 
+
+
 	private boolean isUserNotInList(List<UserVo> list, UserVo user){
 		for (UserVo userVo : list) {
 			if(userVo.getId().equals(user.getId())){