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

@@ -1,10 +1,12 @@
 package com.hotent.baseInfo.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.exception.BaseException;
 import com.hotent.base.model.CommonResult;
 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.AuditedUnitPageReq;
@@ -97,6 +99,9 @@ public class AuditedUnitController {
     @ApiOperation(value = "新增单位", notes = "按表单创建被监审单位")
     public CommonResult<String> create(@Valid @RequestBody AuditedUnit unit) {
         try {
+            if(StringUtil.isEmpty(unit.getAreaCode())){
+                throw new BaseException("所属区域不能为空");
+            }
             unit.setIsDeleted(BaseConstant.NORMAL_STATUS);
             unit.setStatus(1);
             unit.setCreateTime(LocalDateTime.now());
@@ -116,6 +121,12 @@ public class AuditedUnitController {
     @ApiOperation(value = "修改单位", notes = "编辑被监审单位信息")
     public CommonResult<String> update(@Valid @RequestBody AuditedUnit unit) {
         try {
+            QueryWrapper<AuditedUnit> wrapper = new QueryWrapper<>();
+            wrapper.eq("account",unit.getAccount());
+            List<AuditedUnit> list = auditedUnitManager.list(wrapper);
+            if(!list.isEmpty()){
+                throw new BaseException("账号已经关联其他被监审单位！");
+            }
             unit.setUpdateTime(LocalDateTime.now());
             unit.setUpdateBy("system");
             //子单位不能包含自己

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

@@ -1,5 +1,6 @@
 package com.hotent.baseInfo.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.enums.ResponseErrorEnums;
@@ -195,10 +196,10 @@ public class CostCatalogController {
     @PostMapping("/deleteById")
     @ApiOperation("根据id删除")
     public CommonResult<String> deleteById(@ApiParam("id") @RequestParam("id") String id) {
-        boolean result = costCatalogManager.removeById(id);
-        if(!result) {
+        costCatalogManager.remove(id);
+        /*if(!result) {
             return new CommonResult<>(ResponseErrorEnums.FAIL_OPTION, "删除实体失败");
-        }
+        }*/
         return new CommonResult<>();
     }
 

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

@@ -81,4 +81,7 @@ public class CostDocumentTemplateController extends BaseController<CostDocumentT
 		return CommonResult.<String>ok().message("删除文书成功");
 	}
 
+
+
+
 }

assistMg/src/main/java/com/hotent/baseInfo/dao/AuditedUnitDao.java

@@ -18,7 +18,7 @@ public interface AuditedUnitDao extends BaseMapper<AuditedUnit> {
                                          @Param("cityCode") String cityCode,
                                          @Param("countyCode") String countyCode,
                                          @Param("areaCode") String areaCode,
-                                         @Param("unitName") String unitName);
+                                         @Param("unitName") String unitName, @Param("areaCodes") List<Object> areaCodes);
 
     List<AuditedUnit> getList(
             @Param("unitId") String unitId,

assistMg/src/main/java/com/hotent/baseInfo/dto/ContentCreateDto.java

@@ -1,5 +1,6 @@
 package com.hotent.baseInfo.dto;
 
+import com.hotent.baseInfo.model.CostCatalog;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -17,11 +18,14 @@ import java.util.List;
 @ApiModel(value = "ContentCreateDto", description = "目录内容新增DTO")
 @Getter
 @Setter
-public class ContentCreateDto {
+public class ContentCreateDto extends CostCatalog {
 
     @ApiModelProperty(value = "目录ID  修改时传入")
     private String catalogId;
 
+    @ApiModelProperty(value = "目录ID  修改时传入")
+    private String id;
+
     @ApiModelProperty(value = "上级类别ID", required = true)
     @NotEmpty(message = "上级类别ID不能为空")
     private String parentId;

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

@@ -38,4 +38,6 @@ public interface CostDocumentTemplateFileManager extends BaseManager<CostDocumen
     String getColValue2(String tableName);
 
 	List<Map<String, Object>> getSurveyTemplate(String id);
+
+	List<CostDocumentTemplateFile> findByPinyinAndDocumentId(String id, String pinyin);
 }

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

@@ -10,7 +10,9 @@ import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.dao.AuditedUnitDao;
 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.baseInfo.req.AuditedUnitPageReq;
 import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
 import com.hotent.constant.BaseConstant;
@@ -28,6 +30,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, AuditedUnit> implements AuditedUnitManager {
@@ -35,6 +38,10 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
     @Autowired
     private UserManager userService;
 
+
+    @Autowired
+    private CostDistrictManager costDistrictManager;
+
     @Override
     public List<AuditedUnit> listByRegionAndName( String unitId) {
         QueryWrapper<AuditedUnit> qw = new QueryWrapper<>();
@@ -70,7 +77,7 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
         unit.setIsDeleted(BaseConstant.DELETE_FLAG);
         unit.setUpdateTime(LocalDateTime.now());
         unit.setUpdateBy(ContextUtil.getCurrentUser().getAccount());
-        return this.updateById(unit);
+        return this.removeById(unit);
     }
 
     @Override
@@ -132,6 +139,16 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
         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<AuditedUnit> objectPage = new Page<>(req.getPage(),req.getPageSize());
         //Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
         Page<AuditedUnit> page =baseMapper.getAuditedUnitPage(objectPage
@@ -139,7 +156,7 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
                 ,req.getProvinceCode(),req.getCityCode()
                 ,req.getCountyCode()
                 ,req.getAreaCode()
-                ,req.getUnitName());
+                ,req.getUnitName(),objects);
         return new PageList<>(page);
     }
 

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

@@ -2,6 +2,7 @@ package com.hotent.baseInfo.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.exception.BaseException;
 import com.hotent.baseInfo.dto.CatalogStatusDto;
 import com.hotent.baseInfo.dto.CategoryCreateDto;
@@ -80,7 +81,7 @@ public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, Cost
             queryWrapper.eq(CostCatalog::getCatalogId, req.getCategoryId());
         }
         if (StringUtil.isNotEmpty(req.getAuditType())) {
-            queryWrapper.in(CostCatalog::getAuditType, Arrays.asList(req.getAuditType().split(",")));
+            queryWrapper.like(CostCatalog::getAuditType, req.getAuditType());
         }
         if (StringUtil.isNotEmpty(req.getCatalogName())) {
             queryWrapper.like(CostCatalog::getCatalogName, req.getCatalogName());
@@ -251,13 +252,14 @@ public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, Cost
         }
 
         CostCatalog catalog = CopyUtil.copy(createDto, CostCatalog.class);
+        catalog.setCatalogId(createDto.getId());
         catalog.setCode(generateNewCode(costCatalog.getCatalogId()));
         catalog.setNodeType(BaseConstant.CATALOG_TYPE_NR);
         catalog.setCreateTime(LocalDateTime.now());
         catalog.setCreateBy(ContextUtil.getCurrentUser().getAccount());
         catalog.setNodeType(createDto.getNodeType());
         catalog.setLayerLevel(costCatalog.getLayerLevel() + "," + catalog.getParentId());
-        this.save(catalog);
+        this.updateById(catalog);
     }
 
     @Override
@@ -271,7 +273,16 @@ public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, Cost
         }
         catalog.setStatus(statusDto.getStatus());
         catalog.setUpdateTime(LocalDateTime.now());
-        catalog.setUpdateBy(ContextUtil.getCurrentUser().getAccount());
+        catalog.setUpdateBy(ContextUtil.getCurrentUser().getFullname());
+        QueryWrapper<CostCatalog> wrapper = new QueryWrapper<>();
+        wrapper.eq("parent_id",catalog.getCatalogId());
+        List<CostCatalog> list = this.list(wrapper);
+        List<CostCatalog> collect = list.stream().peek(l -> {
+            l.setStatus(catalog.getStatus());
+            l.setUpdateTime(catalog.getUpdateTime());
+            l.setUpdateBy(catalog.getUpdateBy());
+        }).collect(Collectors.toList());
+        this.updateBatchById(collect);
         return this.updateById(catalog);
     }
 

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

@@ -121,9 +121,9 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
         LambdaQueryWrapper<CostDocumentTemplateFile> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CostDocumentTemplateFile::getDocumentId, documentId);
         List<CostDocumentTemplateFile> list = this.list(queryWrapper);
-        if (ObjectUtil.isEmpty(list)) {
+        /*if (ObjectUtil.isEmpty(list)) {
             throw new BaseException("没有找到对应的数据");
-        }
+        }*/
         return list;
     }
 
@@ -142,4 +142,12 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
 
         return baseMapper.getSurveyTemplate(id);
     }
+
+    @Override
+    public List<CostDocumentTemplateFile> findByPinyinAndDocumentId(String id, String pinyin) {
+        QueryWrapper<CostDocumentTemplateFile> wrapper = new QueryWrapper<>();
+        wrapper.eq("pinyin",pinyin);
+        wrapper.eq("document_id",id);
+        return this.list(wrapper);
+    }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.exception.BaseException;
 import com.hotent.base.util.StringUtil;
+import com.hotent.base.util.UniqueIdUtil;
 import com.hotent.baseInfo.dao.CostDocumentTemplateFileDao;
 import com.hotent.baseInfo.manager.CostDocumentTemplateFileManager;
 import com.hotent.baseInfo.model.CostDocumentTemplate;
@@ -32,6 +33,7 @@ import java.sql.Statement;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import com.hotent.base.util.BeanUtils;
 
@@ -144,7 +146,7 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 		CostDocumentTemplate entity = BeanUtil.copyProperties(req, CostDocumentTemplate.class);
 		if(costDocumentTemplate== null || costDocumentTemplate.getId().equals(entity.getId())){
 			if (costDocumentTemplate!=null){
-				entity.setStatus(costDocumentTemplate.getStatus());
+				//entity.setStatus(costDocumentTemplate.getStatus());
 				entity.setIsDeleted(costDocumentTemplate.getIsDeleted());
 				entity.setUpdateTime(LocalDateTime.now());
 				entity.setCreateTime(costDocumentTemplate.getCreateTime());
@@ -157,19 +159,21 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 			List<CostDocumentTemplateFile> costDocumentTemplateFiles = req.getCostDocumentTemplateFiles();
 
 			if (costDocumentTemplateFiles != null ){
-				costDocumentTemplateFiles.forEach(item -> {
-					item.setDocumentId(entity.getId().toString());
-//					int tableExists = this.costDocumentTemplateFileDao.tableExists(item.getTableName());
-//					if (tableExists==0){
-//						throw new BaseException("请检查表是否存在 表名:"+item.getTableName()+" 字段名:"+item.getColName());
-//					}
-//					int colExists = this.costDocumentTemplateFileDao.colExists(item.getTableName(), item.getColName());
-//					if(colExists==0){
-//						throw new BaseException("请检查表是否存在 表名:"+item.getTableName()+" 字段名:"+item.getColName());
-//					}
-
-				});
-				//costDocumentTemplateFileManager.saveBatch(costDocumentTemplateFiles);
+			for (CostDocumentTemplateFile item:costDocumentTemplateFiles){
+					List<CostDocumentTemplateFile> documentTemplateFile =costDocumentTemplateFileManager.findByPinyinAndDocumentId(item.getDocumentId(),item.getPinyin());
+
+					if (!documentTemplateFile.isEmpty()) {
+						List<CostDocumentTemplateFile> collect = documentTemplateFile.stream().map(d -> {
+							item.setId(d.getId());
+							BeanUtil.copyProperties(item, d);
+							return d;
+						}).collect(Collectors.toList());
+						costDocumentTemplateFileManager.updateBatchById(documentTemplateFile);
+					}else {
+						item.setId(UniqueIdUtil.getUId());
+						costDocumentTemplateFileManager.save(item);
+					}
+				}
 			}
 		}else{
 			if(!req.getId().equals(costDocumentTemplate.getId())){
@@ -183,11 +187,10 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 	public void deleteByIds(List<String> ids) {
 		List<CostDocumentTemplate> costDocumentTemplates = this.listByIds(ids);
 		costDocumentTemplates.forEach(item -> {
-			//逻辑删除
-			item.setIsDeleted(BaseConstant.DELETE_FLAG);
+			List<CostDocumentTemplateFile> documentFileList = costDocumentTemplateFileManager.getDocumentFileList(String.valueOf(item.getId()));
+			costDocumentTemplateFileManager.removeByIds(documentFileList);
 		});
-		this.updateBatchById(costDocumentTemplates);
-
+		this.removeByIds(ids);
 	}
 
 	@Override

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

@@ -101,11 +101,11 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
         IUser iUser = ContextUtil.getCurrentUser();
         User user = userService.getByAccount(iUser.getAccount());
         if (StringUtil.isNotEmpty(costDocumentWh.getId())) {
-            costDocumentWh.setUpdateBy(user.getAccount());
+            costDocumentWh.setUpdateBy(user.getFullname());
             costDocumentWh.setUpdateTime(LocalDateTime.now());
         }else {
             costDocumentWh.setCreateTime(LocalDateTime.now());
-            costDocumentWh.setCreateBy(user.getAccount());
+            costDocumentWh.setCreateBy(user.getFullname());
         }
         costDocumentWh.setLastGenerateDate(LocalDate.now());
         //新建或更新

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

@@ -257,11 +257,11 @@ public class DataMiddlePlatformManagerImpl implements DataMiddlePlatformManager
     public String sendMsg(String subject, String description, String content, String receiverId) {
 
         // 将同步调用改为异步执行
-        /*myAsyncExecutor.execute(() -> {
+        myAsyncExecutor.execute(() -> {
             String openApiToken = OAuth2ToMethod.getOpenApiToken("");
             CommonResult result = OAuth2ToMethod.sendMsg(openApiToken, subject, description, content, receiverId);
             System.out.println("消息id: " + result.getValue().toString());
-        });*/
+        });
 
         // 立即返回，不等待消息发送完成
         return "消息发送任务已提交";

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

@@ -69,4 +69,11 @@ public class CostAnnualPlanController extends BaseController<CostAnnualPlanManag
 		return  costAnnualPlanManager.pageList(req);
 	}
 
+
+	@PostMapping(value="/modifyStatus")
+	@ApiOperation(value="",httpMethod = "POST",notes = "")
+	public CommonResult<CostAnnualPlan> modifyStatus(@RequestBody CostAnnualPlan req) throws Exception {
+		return  costAnnualPlanManager.modifyStatus(req);
+	}
+
 }

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

@@ -65,4 +65,20 @@ public class ProjectReviewIssueDetailsController {
         List<ProjectReviewIssueDetails> projectReviewIssueDetails= projectReviewIssueDetailsManager.getList(projectReviewIssue);
         return CommonResult.<List<ProjectReviewIssueDetails>>ok().value(projectReviewIssueDetails);
     }
+
+    /**
+     * 签发拒绝控制审核字段
+     * @param projectReviewIssue
+     * @throws Exception
+     * @return
+     * @exception
+     */
+    @PostMapping(value="/control")
+    @ApiOperation(value = "根据条件查询审核详情（集合）", httpMethod = "POST", notes = "根据条件查询审核详情（集合）")
+    public CommonResult<String> control(@ApiParam(name="CostProjectTaskLog",value="根据条件查询审核详情（集合）", required = true)
+                                                              @RequestBody ProjectReviewIssueReq projectReviewIssue) throws Exception{
+        String projectReviewIssueDetails= projectReviewIssueDetailsManager.control(projectReviewIssue);
+        return CommonResult.<String>ok().value(projectReviewIssueDetails);
+    }
+
 }

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

@@ -5,6 +5,8 @@ import com.hotent.project.model.CostProjectApproval;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 成本监审立项主表 Mapper 接口
  *
@@ -20,5 +22,6 @@ public interface CostProjectApprovalDao extends BaseMapper<CostProjectApproval>
             , @Param("countyCode") String countyCode
             , @Param("projectYear") String projectYear
             , @Param("areaCode") String areaCode
-            , @Param("projectName") String projectName);
+            , @Param("projectName") String projectName
+    ,@Param("areaCodes") List<Object> areaCodes);
 }

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

@@ -1,6 +1,7 @@
 package com.hotent.project.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.model.CommonResult;
 import com.hotent.base.query.PageList;
 import com.hotent.project.model.CostAnnualPlan;
 import com.hotent.base.manager.BaseManager;
@@ -30,4 +31,5 @@ public interface CostAnnualPlanManager extends BaseManager<CostAnnualPlan> {
 
 	PageList<CostAnnualPlan> pageList(CostAnnualPlanPageReq req) throws Exception;
 
+	CommonResult<CostAnnualPlan> modifyStatus(CostAnnualPlan req);
 }

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

@@ -18,4 +18,5 @@ public interface ProjectReviewIssueDetailsManager extends IService<ProjectReview
 
     List<ProjectReviewIssueDetails> getList(ProjectReviewIssueReq projectReviewIssue);
 
+    String control(ProjectReviewIssueReq projectReviewIssue);
 }

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

@@ -3,6 +3,7 @@ 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.metadata.IPage;
+import com.hotent.base.model.CommonResult;
 import com.hotent.base.query.PageList;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.exception.BaseException;
@@ -136,6 +137,14 @@ public class CostAnnualPlanManagerImpl extends BaseManagerImpl<CostAnnualPlanDao
 		return new PageList<>(page);
 	}
 
+	@Override
+	public CommonResult<CostAnnualPlan> modifyStatus(CostAnnualPlan req) {
+		CostAnnualPlan costAnnualPlan = this.get(req.getPlanId());
+		costAnnualPlan.setStatus(1);
+		this.updateById(costAnnualPlan);
+		return CommonResult.<CostAnnualPlan>ok().value(costAnnualPlan);
+	}
+
 	//新增
 	@Override
 	@Transactional

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

@@ -115,6 +115,9 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     private CostCatalogManager costCatalogManager;
 
     @Autowired
+    private CostDistrictManager costDistrictManager;
+
+    @Autowired
     private CostCatalogUnitManager costCatalogUnitManager;
 
     @Autowired
@@ -150,8 +153,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
     @Autowired
     private CostSurveyTemplateItemsManager costSurveyTemplateItemsManager;
 
-    @Autowired
-    private CostDistrictManager costDistrictManager;
+
 
     /**
      * cost_survey_fd_project_data
@@ -376,6 +378,16 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         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<CostProjectApproval> objectPage = new Page<>(req.getPage(),req.getPageSize());
         //Page<CostSurveyTemplate> page =baseMapper.getCostSurveyTemplatePage(objectPage,params);
         Page<CostProjectApproval> page =baseMapper.getCostProjectApprovalPage(objectPage
@@ -384,7 +396,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
                 ,req.getCountyCode()
                 ,req.getProjectYear()
                 ,req.getAreaCode()
-                ,req.getProjectName());
+                ,req.getProjectName(),objects);
         PageList<CostProjectApproval> costProjectApprovalPageList = new PageList<>(page);
         List<CostProjectApproval> rows = costProjectApprovalPageList.getRows();
         List<String> ids = rows.stream()

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

@@ -170,6 +170,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                 qw.in(CostProjectDocument::getEnterpriseId, collected);
             }
             qw.eq(CostProjectDocument::getStatus, 1);
+            qw.eq(CostProjectDocument::getIsPushed, 1);
+            List<String> strings = Arrays.asList("8", "6", "9", "7");
+            qw.notIn(CostProjectDocument::getDocumentType,strings);
         } else if (req.getPermissionType().equals(2)) {
             IUser iUser = ContextUtil.getCurrentUser();
             User user = userService.getByAccount(iUser.getAccount());
@@ -182,9 +185,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             List<Role> roles = list.stream()
                     .filter(role -> targetCodes.contains(role.getCode()))
                     .collect(Collectors.toList());
-            if (!roles.isEmpty() ) {
+            /*if (!roles.isEmpty() ) {
                 qw.eq(CostProjectDocument::getIsPushed, 1);
-            }
+            }*/
         }
         IPage<CostProjectDocument> page = new Page<>(req.getPageNum(), req.getPageSize());
         IPage<CostProjectDocument> documentIPage = this.page(page, qw);
@@ -274,7 +277,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             throw new BaseException("请选择监审单位");
         }
         req.setGenerateTime(LocalDateTime.now());
-        req.setIsPushed("1");
+        //req.setIsPushed("1");
 
 
         req.setDocumentAlias(costDocumentTemplate.getAlias());
@@ -313,7 +316,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         BeanUtil.copyProperties(req, costProjectDocument);
         costProjectDocument.setDocumentNumber(whNo);
         costProjectDocument.setDocumentName(costDocumentTemplate.getDocumentName());
-        costProjectDocument.setCreateBy(user.getCreateBy());
+        costProjectDocument.setCreateBy(user.getFullname());
         //costProjectDocument.setDocumentType(costDocumentTemplate.getType());
         costProjectDocument.setProjectId(costProjectApproval.getProjectId());
         if (costProjectDocument.getDocumentType().equals("3")) {
@@ -390,7 +393,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             CostProjectDocument projectDocument = new CostProjectDocument();
             BeanUtil.copyProperties(costProjectDocument, projectDocument);
             projectDocument.setId(UniqueIdUtil.getSuid());
-            projectDocument.setCreateBy(user.getAccount());
+            projectDocument.setCreateBy(user.getFullname());
             projectDocument.setCreateTime(LocalDateTime.now());
 
 
@@ -607,11 +610,12 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
          BeanUtil.copyProperties(req,selectCostProjectDocument);
         selectCostProjectDocument.setDocumentNumber(whNo);
         super.update(selectCostProjectDocument);
-
-        req.getCostProjectDocumentFiles().forEach(f->{
-            f.setProjectDocumentId(selectCostProjectDocument.getId());
-        });
-        costProjectDocumentFileManager.updateBatchById(req.getCostProjectDocumentFiles());
+        if(req.getCostProjectDocumentFiles()!=null && !req.getCostProjectDocumentFiles().isEmpty()){
+            req.getCostProjectDocumentFiles().forEach(f->{
+                f.setProjectDocumentId(selectCostProjectDocument.getId());
+            });
+            costProjectDocumentFileManager.updateBatchById(req.getCostProjectDocumentFiles());
+        }
     }
 
     @Override

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

@@ -223,6 +223,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
         if (StringUtil.isNotEmpty(req.getAuditedUnitName())) {
             approvalQueryWrapper.like(CostProjectApproval::getAuditedUnitName,req.getAuditedUnitName());
         }
+        if (StringUtil.isNotEmpty(req.getAreaCode())) {
+            approvalQueryWrapper.like(CostProjectApproval::getAreaCode,req.getAreaCode());
+        }
         if (StringUtil.isNotEmpty(req.getProjectYear())) {
             approvalQueryWrapper.like(CostProjectApproval::getProjectYear,req.getProjectYear());
         }
@@ -1326,6 +1329,7 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     public List<Map<String, Object>> getDoChartList(String year, String region) {
         List<CostCatalog> list = costCatalogManager.list(
                 new LambdaQueryWrapper<CostCatalog>().eq(CostCatalog::getParentId, "1969351600934948833")
+                        .eq(CostCatalog::getIsDeleted,0)
         );
         List<Map<String, Object>> maps = new ArrayList<>();
 

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

@@ -1,5 +1,6 @@
 package com.hotent.project.manager.impl;
 
+import com.aspose.cells.IconFilter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hotent.base.exception.BaseException;
@@ -136,6 +137,14 @@ public class ProjectReviewIssueDetailsManagerImpl extends ServiceImpl<ProjectRev
                             contentReview, null, "审核签发", projectDocument.getCreateBy());
                     projectDocument.setStatus(1);
                     costProjectDocumentManager.updateById(projectDocument);
+                    QueryWrapper<CostProjectDocument> wrapper = new QueryWrapper<>();
+                    wrapper.eq("document_type",projectDocument.getDocumentType()+"-12");
+                    wrapper.eq("project_id",projectDocument.getProjectId());
+                    List<CostProjectDocument> list = costProjectDocumentManager.list(wrapper);
+                    list.forEach(l->{
+                        l.setStatus(1);
+                    });
+                    costProjectDocumentManager.updateBatchById(list);
                 }else {
                     //签发消息推送
                     String contentReview="《"+projectReviewIssue.getProjectName()+"》项目的成本监审通知书，签发流程未通过，请修正后重新发起签发流程。未通过审核原因："+projectReviewIssueDetails.getContent();
@@ -225,4 +234,54 @@ public class ProjectReviewIssueDetailsManagerImpl extends ServiceImpl<ProjectRev
         return this.list(wrapper);
     }
 
+    @Override
+    public String control(ProjectReviewIssueReq projectReviewIssue) {
+        String control=null;
+        QueryWrapper<ProjectReviewIssue> wrapper = new QueryWrapper<>();
+        if (StringUtil.isNotEmpty(projectReviewIssue.getProjectId())) {
+            wrapper.eq("project_id",projectReviewIssue.getProjectId());
+        }else {
+            throw new BaseException("项目id不能为空");
+        }
+        if (StringUtil.isNotEmpty(projectReviewIssue.getAuditedUnitId())) {
+            wrapper.eq("audited_unit_id",projectReviewIssue.getAuditedUnitId());
+        }else {
+            throw new BaseException("企业id不能为空");
+        }
+        wrapper.orderByDesc("create_time");
+        List<ProjectReviewIssue> list = projectReviewIssueManager.list(wrapper);
+        if (!list.isEmpty()) {
+            ProjectReviewIssue reviewIssue = list.get(0);
+            QueryWrapper<ProjectReviewIssueDetails> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("project_review_issue_id",reviewIssue.getId());
+            queryWrapper.eq("status",3);
+            queryWrapper.eq("type",1);
+            List<ProjectReviewIssueDetails> issueDetails = this.list(queryWrapper);
+
+            if (!issueDetails.isEmpty()) {
+                control="0";
+            }
+
+
+            /*if (!issueDetails.isEmpty()) {
+                List<ProjectReviewIssueDetails> collect = issueDetails.stream().filter(i ->i.getType().equals(2) && i.getStatus().equals(1)).collect(Collectors.toList());
+                if (!collect.isEmpty()) {
+                    control="1";
+                }else {
+                    List<ProjectReviewIssueDetails> details = issueDetails.stream().filter(i ->i.getType().equals(1) && (i.getStatus().equals(0) || i.getStatus().equals(1))).collect(Collectors.toList());
+                    if (!details.isEmpty()) {
+                        control="1";
+                    }else {
+                        control="0";
+                    }
+
+                }
+            }else {
+                control="1";
+            }*/
+
+        }
+        return control;
+    }
+
 }

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

@@ -102,6 +102,12 @@ public class CostAnnualPlan extends BaseModel<CostAnnualPlan> {
     @TableField("area_code")
     @JsonProperty("areaCode")
     private String areaCode;
+
+
+    @ApiModelProperty(value = "状态：0未立项，1立项")
+    @TableField("status")
+    @JsonProperty("status")
+    private Integer status;
     
 
     public String getPlanId() {
@@ -111,6 +117,14 @@ public class CostAnnualPlan extends BaseModel<CostAnnualPlan> {
     public void setPlanId(String planId) {
         this.planId = planId;
     }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
     public String getPlanYear() {
         return planYear;
     }

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

@@ -161,12 +161,12 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
         }
         if (StringUtil.isEmpty(costSurveyTemplate.getSurveyTemplateId())) {
             IUser user = ContextUtil.getCurrentUser();
-            costSurveyTemplate.setCreateBy(user.getAccount());
+            costSurveyTemplate.setCreateBy(user.getFullname());
             costSurveyTemplate.setCreateTime(LocalDateTime.now());
             costSurveyTemplate.setIsDelete("0");
             costSurveyTemplate.setStatus("-1");
         } else {
-            costSurveyTemplate.setUpdateBy(ContextUtil.getCurrentUser().getAccount());
+            costSurveyTemplate.setUpdateBy(ContextUtil.getCurrentUser().getFullname());
             costSurveyTemplate.setUpdateTime(LocalDateTime.now());
         }
 

assistMg/src/main/java/com/hotent/surveyinfo/dao/CostVerifyTemplateDao.java

@@ -26,5 +26,6 @@ public interface CostVerifyTemplateDao extends BaseMapper<CostVerifyTemplate> {
             , @Param("cityCode") String cityCode
             , @Param("countyCode") String countyCode
             , @Param("keyword") String keyword
-            , @Param("status") Integer status);
+            , @Param("status") Integer status
+            , @Param("catalogId") String catalogId);
 }

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

@@ -168,7 +168,7 @@ public class CostVerifyTemplateManagerImpl extends BaseManagerImpl<CostVerifyTem
 		Page<CostVerifyTemplate> page =baseMapper.getConstVerifyPage(objectPage,param.getContentType()
 				,param.getType(),param.getDataScope()
 				,param.getProvinceCode(),param.getCityCode()
-				,param.getCountyCode(),param.getKeyword(),param.getStatus());
+				,param.getCountyCode(),param.getKeyword(),param.getStatus(),param.getCatalogId());
 		return new PageList<>(page);
 	}
 

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

@@ -57,10 +57,14 @@
         WHERE
         c.create_by=u.ACCOUNT_
 
-        <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=" unitName != null and  unitName != ''">
             and c.unit_name LIKE CONCAT('%', #{unitName}, '%')
         </if>

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

@@ -20,11 +20,12 @@
         <result column="update_by" property="updateBy"/>
         <result column="audited_unit_id" property="auditedUnitId"/>
         <result column="audited_unit_name" property="auditedUnitName"/>
+        <result column="status" property="status"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        plan_id
+        plan_id ,status
         , plan_year , area_code,area_level, catalog_id, project_name, audit_time, audit_type, org_id, is_deleted, create_time, create_by, update_time, update_by, audited_unit_id, audited_unit_name
     </sql>
 

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

@@ -66,6 +66,7 @@
         uc_user u
         WHERE
         c.create_by=u.ACCOUNT_
+        AND  c.is_deleted=0
         <if test=" whType != null and  whType != ''">
             and c.wh_type=#{whType}
         </if>

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

@@ -80,8 +80,13 @@
         <if test=" projectYear != null and  projectYear != ''">
             and c.project_year=#{projectYear}
         </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 != ''">

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

@@ -114,6 +114,9 @@
 			<if test=" status != null and  status != ''">
 				and c.status=#{ status}
 			</if>
+			<if test=" catalogId != null and  catalogId != ''">
+				and c.catalog_id=#{catalogId}
+			</if>
 			<if test=" dataScope != null and dataScope >= 0">
 				<if test=" dataScope ==0">
 					and c.area_code= #{provinceCode}

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

@@ -127,7 +127,8 @@ public class UserController extends BaseController<UserManager, User> {
 
 	@RequestMapping(value="users/getOrgUserQuery",method=RequestMethod.POST, produces = {"application/json; charset=utf-8" })
 	@ApiOperation(value = "获取用户列表（根据维度、组织、岗位、职务、角色进行过滤）", httpMethod = "POST", notes = "获取用户列表（根据维度、组织、岗位、职务、角色进行过滤）")
-	public PageList<User> getOrgUserQuery(@ApiParam(name="queryFilter",value="通用查询对象") @RequestBody QueryFilter<User> queryFilter) throws Exception{
+	public PageList<User> getOrgUserQuery(@ApiParam(name="queryFilter",value="通用查询对象")
+											  @RequestBody QueryFilter<User> queryFilter) throws Exception{
 		Map<String,String> vo = queryFilter.getVo();
 		if(vo!=null && vo.size() > 0 && "true".equals(vo.get(QueryFilter.VO_AUTHFILTER))) {
 			Boolean isAdmin = ContextUtil.getCurrentUser().isAdmin();