Merge remote-tracking branch 'cs/master'

assembly/src/main/resources/application-dev.yml

@@ -201,4 +201,4 @@ third:
 assistmg:
   profile: /home/eip/uploadPath
   imgUrl: http://1.71.9.215:9506
-  # imgUrl: http://127.0.0.1:9506
+  #  imgUrl: http://127.0.0.1:9506

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

@@ -4,6 +4,9 @@ import com.hotent.baseInfo.model.CostDocumentTemplateFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 监审文书文件内容表 Mapper 接口
  *
@@ -20,5 +23,8 @@ public interface CostDocumentTemplateFileDao extends BaseMapper<CostDocumentTemp
 
     //获取字段值
     String getColValue(@Param("tableName") String tableName,@Param("colName") String colName,@Param("whereName") String whereName,@Param("whereValue") String whereValue);
+    //获取字段值
+    String getColValue2(@Param("tableName") String tableName);
 
+    List<Map<String, Object>> getSurveyTemplate(@Param("id") String id);
 }

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

@@ -5,6 +5,7 @@ import com.hotent.base.manager.BaseManager;
 import com.hotent.project.model.CostProjectDocumentFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 监审文书文件内容表 服务类
@@ -33,4 +34,8 @@ public interface CostDocumentTemplateFileManager extends BaseManager<CostDocumen
 	List<CostDocumentTemplateFile> getDocumentFileList(String documentId);
 
 	String getColValue(String tableName,String colName,String whereName,String whereValue);
+
+    String getColValue2(String tableName);
+
+	List<Map<String, Object>> getSurveyTemplate(String id);
 }

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

@@ -9,7 +9,9 @@ import com.hotent.baseInfo.model.CostDocumentTemplateFile;
 import com.hotent.baseInfo.dao.CostDocumentTemplateFileDao;
 import com.hotent.baseInfo.manager.CostDocumentTemplateFileManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.project.manager.CostProjectTaskManager;
 import com.hotent.project.model.CostProjectDocumentFile;
+import com.hotent.project.model.CostProjectTask;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.exception.BaseException;
 import com.hotent.uc.manager.UserManager;
@@ -21,7 +23,9 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import javax.annotation.Resource;
 
 import com.hotent.base.util.BeanUtils;
@@ -43,6 +47,12 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
     @Autowired
     private UserManager userService;
 
+    @Autowired
+    private CostProjectTaskManager costProjectTaskManager;
+
+    @Autowired
+    private CostDocumentTemplateFileManager costTemplateFileManager;
+
     @Override
     public CostDocumentTemplateFile getDetail(String id) {
         CostDocumentTemplateFile costDocumentTemplateFile = this.get(id);
@@ -66,7 +76,19 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
         QueryWrapper<CostDocumentTemplateFile> eq = new QueryWrapper<CostDocumentTemplateFile>().eq("document_id", documentId);
         for (CostDocumentTemplateFile costProjectDocumentFile : documentFileList) {
             try {
-                if (StringUtil.isNotEmpty(costProjectDocumentFile.getTableName())){
+                if (StringUtil.isEmpty(costProjectDocumentFile.getWhereName())
+                        && StringUtil.isEmpty(costProjectDocumentFile.getWhereValue())
+                        && StringUtil.isNotEmpty(costProjectDocumentFile.getTableName())) {
+                    String tableName = costProjectDocumentFile.getTableName();
+                    List<CostProjectTask> taskByProjectId = costProjectTaskManager.findTaskByProjectId(whereValue,unitId);
+                    if (taskByProjectId!=null && !taskByProjectId.isEmpty()) {
+                        String replace = tableName.replace("?", "'" + taskByProjectId.get(0).getId() + "'");
+                        String colValue = costTemplateFileManager.getColValue2(replace);
+                        costProjectDocumentFile.setDataValue(colValue);
+                    }
+
+                }else  if (StringUtil.isNotEmpty(costProjectDocumentFile.getTableName())
+                &&StringUtil.isNotEmpty(costProjectDocumentFile.getWhereName())){
                     if(StringUtil.isEmpty(costProjectDocumentFile.getWhereValue())){
                         costProjectDocumentFile.setWhereValue(whereValue);
                     } else {
@@ -108,4 +130,15 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
     public String getColValue(String tableName, String colName, String whereName, String whereValue) {
         return baseMapper.getColValue(tableName, colName, whereName, whereValue);
     }
+
+    @Override
+    public String getColValue2(String tableName) {
+        return baseMapper.getColValue2(tableName);
+    }
+
+    @Override
+    public List<Map<String, Object>> getSurveyTemplate(String id) {
+
+        return baseMapper.getSurveyTemplate(id);
+    }
 }

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

@@ -166,7 +166,7 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
 
         //返回文号
         String replace = costDocumentWh.getRulePattern().replace("{prefixText}", costDocumentWh.getPrefixText())
-                .replace("{year}", costDocumentWh.getYear()).replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
+                .replace("{year}", "【" +costDocumentWh.getYear()+"】").replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
         costDocumentWh.setRulePattern(replace);
         return costDocumentWh;
 
@@ -220,7 +220,7 @@ public class CostDocumentWhManagerImpl extends BaseManagerImpl<CostDocumentWhDao
 
             //返回文号
             String replace = costDocumentWh.getRulePattern().replace("{prefixText}", costDocumentWh.getPrefixText())
-                    .replace("{year}", costDocumentWh.getYear()).replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
+                    .replace("{year}", "【" +costDocumentWh.getYear()+"】").replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
             costDocumentWh.setWhNo(replace);
         }
         return new PageList<>(respPage);

assistMg/src/main/java/com/hotent/baseInfo/model/AuditedUnit.java

@@ -45,6 +45,13 @@ public class AuditedUnit extends BaseModel<AuditedUnit> {
     @JsonProperty("address")
     private String address;
 
+    /**
+     * 法人代表
+     */
+    @TableField("corporate_representative")
+    @ApiModelProperty(name="corporateRepresentative",notes="法人代表")
+    protected  String corporateRepresentative;
+
     @TableField("entity_type")
     @ApiModelProperty("主体性质：母公司/本部/子公司/关联单位")
     @JsonProperty("entityType")
@@ -145,6 +152,14 @@ public class AuditedUnit extends BaseModel<AuditedUnit> {
         return unitName;
     }
 
+    public String getCorporateRepresentative() {
+        return corporateRepresentative;
+    }
+
+    public void setCorporateRepresentative(String corporateRepresentative) {
+        this.corporateRepresentative = corporateRepresentative;
+    }
+
     public void setUnitName(String unitName) {
         this.unitName = unitName;
     }

assistMg/src/main/java/com/hotent/baseInfo/resp/AuditedUnitDetailResp.java

@@ -22,6 +22,13 @@ public class AuditedUnitDetailResp {
     @JsonProperty("unitId")
     private String unitId;
 
+  /**
+   * 法人代表
+   */
+  //@TableField("corporate_representative")
+  @ApiModelProperty(name="corporateRepresentative",notes="法人代表")
+  protected  String corporateRepresentative;
+
     //@TableField("unit_name")
     @ApiModelProperty("被监审单位名称")
     @JsonProperty("unitName")

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

@@ -2,6 +2,7 @@ package com.hotent.project.manager.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,24 +19,21 @@ import com.hotent.baseInfo.model.CostDocumentTemplateFile;
 import com.hotent.baseInfo.model.CostDocumentWh;
 import com.hotent.config.EipConfig;
 import com.hotent.constant.BaseConstant;
-import com.hotent.project.manager.CostProjectApprovalManager;
-import com.hotent.project.manager.CostProjectDocumentFileManager;
-import com.hotent.project.manager.CostProjectTaskEvidenceManager;
-import com.hotent.project.model.CostProjectApproval;
-import com.hotent.project.model.CostProjectDocument;
+import com.hotent.project.manager.*;
+import com.hotent.project.model.*;
 import com.hotent.project.dao.CostProjectDocumentDao;
-import com.hotent.project.manager.CostProjectDocumentManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
-import com.hotent.project.model.CostProjectDocumentFile;
-import com.hotent.project.model.CostProjectTaskEvidence;
 import com.hotent.project.req.CostProjectDocumentPageReq;
 import com.hotent.project.req.CostProjectDocumentReq;
 import com.hotent.project.resp.CostProjectDocumentResp;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.exception.BaseException;
+import com.hotent.uc.manager.OrgManager;
 import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.Org;
 import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
+import com.hotent.util.CostDataUtil;
 import com.hotent.util.FileUtils;
 import com.hotent.util.HtmlUtils;
 import com.hotent.util.wordexcelutils.*;
@@ -54,9 +52,12 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import com.hotent.util.FileUploadUtil;
+import springfox.documentation.spring.web.json.Json;
 
 import static org.apache.tools.ant.util.DateUtils.ISO8601_DATE_PATTERN;
 
@@ -87,6 +88,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
     private CostProjectTaskEvidenceManager costProjectTaskEvidenceManager;
 
     @Autowired
+    private CostProjectTaskManager costProjectTaskManager;
+
+    @Autowired
     private CostDocumentWhManager costDocumentWhManager;
 
     @Autowired
@@ -97,6 +101,8 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
 
     @Autowired
     private CostDocumentTemplateFileManager costTemplateFileManager;
+    @Autowired
+    private OrgManager orgManager;
 
     @Override
     public CostProjectDocument getDetail(String id) {
@@ -212,11 +218,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         if (costDocumentTemplate == null || BaseConstant.DELETE_FLAG.equals(costDocumentTemplate.getIsDeleted())) {
             throw new BaseException("文书模板不存在");
         }
-        if (!costDocumentTemplate.getAlias().equals("cbjsgzdg")
-                &&!costDocumentTemplate.getAlias().equals("cbjsjtsyjl")
-                &&!costDocumentTemplate.getAlias().equals("cbshcbyjb1")
-                &&!costDocumentTemplate.getAlias().equals("cbjstqzldjb")
-                && ObjectUtil.isEmpty(req.getDocumentNumber())) {
+        if (costDocumentTemplate.getIsWh().equals("1")) {
             throw new BaseException("请填写通知文号");
         }
         if (ObjectUtil.isEmpty(req.getEnterpriseId())) {
@@ -235,12 +237,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         //返回文号
         String whNo;
 
-        if (!costDocumentTemplate.getAlias().equals("cbjsgzdg")
-                &&!costDocumentTemplate.getAlias().equals("cbjsjtsyjl")
-                &&!costDocumentTemplate.getAlias().equals("cbshcbyjb1")
-                &&!costDocumentTemplate.getAlias().equals("cbjstqzldjb")) {
+        if (costDocumentTemplate.getIsWh().equals("0")) {
             costDocumentWh= costDocumentWhManager.get(req.getDocumentWhId());
-            if (costDocumentWh == null || BaseConstant.DELETE_FLAG.equals(costDocumentWh.getIsDeleted())) {
+            if (costDocumentWh == null) {
                 throw new BaseException("文书文号不存在");
             }
             //返回文号
@@ -259,6 +258,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         IUser iUser = ContextUtil.getCurrentUser();
         User user = userService.getByAccount(iUser.getAccount());
         CostProjectApproval costProjectApproval = costProjectApprovalManager.get(req.getProjectId());
+        Org org = orgManager.getById(costProjectApproval.getOrgId());
         //类型转换
         CostProjectDocument costProjectDocument = new CostProjectDocument();
         BeanUtil.copyProperties(req, costProjectDocument);
@@ -280,7 +280,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                     break;
             }
             if (StringUtils.isNotBlank(costProjectDocumentFile.getTableName())){
-                if(StringUtil.isEmpty(costProjectDocumentFile.getWhereValue())){
+                if(StringUtil.isEmpty(costProjectDocumentFile.getWhereValue()) && StringUtil.isNotEmpty(costProjectDocumentFile.getWhereName())){
                     costProjectDocumentFile.setWhereValue(costProjectApproval.getProjectId());
                 } else if (costProjectDocument.getDocumentAlias().equals("cbjsgzdg")
                         &&!costProjectDocument.getDocumentAlias().equals("cbjsjtsyjl")
@@ -290,20 +290,33 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                     String replace = whereValue1.replace("?", "'" + costProjectApproval.getProjectId() + "'");
                     String replaced = replace.replace("&", auditedUnit.getUnitId());
                     costProjectDocumentFile.setWhereValue(replaced);
+                    String colValue = costTemplateFileManager.getColValue(costProjectDocumentFile.getTableName(), costProjectDocumentFile.getColName(), costProjectDocumentFile.getWhereName(), costProjectDocumentFile.getWhereValue());
+                    //获取whereValue字段值
+                    costProjectDocumentFile.setDataValue(colValue);
+                } else if (StringUtil.isEmpty(costProjectDocumentFile.getWhereName()) && StringUtil.isEmpty(costProjectDocumentFile.getWhereValue())) {
+                    String tableName = costProjectDocumentFile.getTableName();
+                    List<CostProjectTask> taskByProjectId = costProjectTaskManager.findTaskByProjectId(costProjectApproval.getProjectId(), auditedUnit.getUnitId());
+                    if (taskByProjectId!=null && !taskByProjectId.isEmpty()) {
+                        String replace = tableName.replace("?", "'" + taskByProjectId.get(0).getId() + "'");
+                        String colValue = costTemplateFileManager.getColValue2(replace);
+                        costProjectDocumentFile.setDataValue(colValue);
+                    }
+
                 } else {
                     String whereValue1 = costProjectDocumentFile.getWhereValue();
                     String replace = whereValue1.replace("?", "'" + costProjectApproval.getProjectId() + "'");
                     costProjectDocumentFile.setWhereValue(replace);
+                    String colValue = costTemplateFileManager.getColValue(costProjectDocumentFile.getTableName(), costProjectDocumentFile.getColName(), costProjectDocumentFile.getWhereName(), costProjectDocumentFile.getWhereValue());
+                    //获取whereValue字段值
+                    costProjectDocumentFile.setDataValue(colValue);
                 }
-                String colValue = costTemplateFileManager.getColValue(costProjectDocumentFile.getTableName(), costProjectDocumentFile.getColName(), costProjectDocumentFile.getWhereName(), costProjectDocumentFile.getWhereValue());
-                //获取whereValue字段值
-                costProjectDocumentFile.setDataValue(colValue);
+
             }
 
         });
 
 
-        if (!costDocumentTemplate.getAlias().equals("sdhz")) {
+        if (costDocumentTemplate.getIsWh().equals("0")) {
 
             CostDocumentTemplate templateManagerById = costDocumentTemplateManager.getByAlias("sdhz");
             if (templateManagerById==null) {
@@ -317,19 +330,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             projectDocument.setId(UniqueIdUtil.getSuid());
             projectDocument.setCreateBy(user.getAccount());
             projectDocument.setCreateTime(LocalDateTime.now());
-            /*QueryWrapper<CostDocumentWh> wrapper = new QueryWrapper<>();
-            wrapper.eq("wh_type","187");
-            List<CostDocumentWh> list = costDocumentWhManager.list(wrapper);
-
-            if (list == null || list.isEmpty()) {
-                throw new BaseException("文书文号不存在");
-            }
 
-            CostDocumentWh costDocument = list.get(0);
-            //返回文号
-            String whno = this.getWH(costDocument);*/
 
-            projectDocument.setDocumentNumber(whNo);
+            projectDocument.setDocumentNumber(costProjectDocument.getDocumentNumber());
             projectDocument.setElectronicDocumentUrl(templateManagerById.getFileUrl());
             if(costDocumentWh!=null){
                 projectDocument.setDocumentWhId(costDocumentWh.getId());
@@ -353,14 +356,16 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                 costProjectDocumentFile.setProjectDocumentId(projectDocument.getId());
                 //costProjectDocumentFile.setProjectId(costProjectDocument.getProjectId());
                 switch (f.getPinyin()) {
-                    case "JiaGeZhuGuanBuMenHuoChengBenDiaoChaJiGou":
-                        costProjectDocumentFile.setDataValue(costProjectApproval.getOrgName());
+                    case "JiaGeZhuGuanBuMenHuoChengBenJianShenJiGou":
+                        costProjectDocumentFile.setDataValue(org.getName());
                         break;
                     case "SongDaWenShuMingCheng":
-                        costProjectDocumentFile.setDataValue(costDocumentWh.getWhName());
+                        if (costDocumentWh!=null) {
+                            costProjectDocumentFile.setDataValue(costDocumentWh.getWhName());
+                        }
                         break;
                     case "SongDaWenShuWenHao":
-                        costProjectDocumentFile.setDataValue(projectDocument.getDocumentNumber());
+                        costProjectDocumentFile.setDataValue(costProjectDocument.getDocumentNumber());
                         break;
                     case "ShouSongDaRen":
                         costProjectDocumentFile.setDataValue(auditedUnit.getContactName());
@@ -369,7 +374,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                         costProjectDocumentFile.setDataValue(auditedUnit.getAddress());
                         break;
                     case "TongZhiSongDaShiJian":
-                        costProjectDocumentFile.setDataValue(DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+                        costProjectDocumentFile.setDataValue(DateUtils.format(new Date(),"yyyy-MM-dd"));
                         break;
                     case "BeiJianShenDanWeiLianXiRenDianHua":
                         costProjectDocumentFile.setDataValue(auditedUnit.getContactMobile());
@@ -378,18 +383,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                         costProjectDocumentFile.setDataValue("");
                         break;
                 }
-                /*if (StringUtils.isNotBlank(f.getTableName())){
-                    if(StringUtil.isEmpty(costProjectDocumentFile.getWhereValue())){
-                        costProjectDocumentFile.setWhereValue(costProjectApproval.getProjectId());
-                    }else {
-                        String whereValue1 = costProjectDocumentFile.getWhereValue();
-                        String replace = whereValue1.replace("?", "'" + costProjectApproval.getProjectId() + "'");
-                        costProjectDocumentFile.setWhereValue(replace);
-                    }
-                    String colValue = costTemplateFileManager.getColValue(costProjectDocumentFile.getTableName(), costProjectDocumentFile.getColName(), costProjectDocumentFile.getWhereName(), costProjectDocumentFile.getWhereValue());
-                    //获取whereValue字段值
-                    costProjectDocumentFile.setDataValue(colValue);
-                }*/
+
                 arrayList.add(costProjectDocumentFile);
             });
             costProjectDocumentFileManager.saveBatch(arrayList);
@@ -454,9 +448,8 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         if (ObjectUtil.isEmpty(req.getProjectId())) {
             throw new BaseException("请选择项目");
         }
-        if (ObjectUtil.isEmpty(req.getDocumentNumber())) {
-            throw new BaseException("请填写通知文号");
-        }
+
+
         if (ObjectUtil.isEmpty(req.getEnterpriseId())) {
             throw new BaseException("请选择监审单位");
         }
@@ -468,19 +461,24 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         req.setIsPushed("1");
 
         CostDocumentTemplate costDocumentTemplate = this.costDocumentTemplateManager.get(req.getDocumentId());
+
         if (costDocumentTemplate == null || BaseConstant.DELETE_FLAG.equals(costDocumentTemplate.getIsDeleted())) {
             throw new BaseException("文书模板不存在");
         }
+        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 (costDocumentWh == null || BaseConstant.DELETE_FLAG.equals(costDocumentWh.getIsDeleted())) {
-            throw new BaseException("文书文号不存在");
+        if(costDocumentTemplate.getIsWh().equals("1")){
+            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());
@@ -496,16 +494,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
 //        类型转换
          BeanUtil.copyProperties(req,selectCostProjectDocument);
         super.update(selectCostProjectDocument);
-        /*costProjectDocumentFileManager.remove(new LambdaQueryWrapper<CostProjectDocumentFile>().eq(CostProjectDocumentFile::getProjectId,selectCostProjectDocument.getProjectId()));
-        List<CostProjectDocumentFile> costProjectDocumentFiles = req.getCostProjectDocumentFiles();
-        if (costProjectDocumentFiles != null){
-            for (CostProjectDocumentFile costProjectDocumentFile : costProjectDocumentFiles) {
-                costProjectDocumentFile.setDocumentId(selectCostProjectDocument.getDocumentId());
-                costProjectDocumentFile.setProjectId(selectCostProjectDocument.getProjectId());
-                //costProjectDocumentFile.setProjectDocumentId(selectCostProjectDocument.);
-            }
 
-        }*/
         req.getCostProjectDocumentFiles().forEach(f->{
             f.setProjectDocumentId(selectCostProjectDocument.getId());
         });
@@ -565,42 +554,56 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
              XWPFDocument document = new XWPFDocument(fis);
              FileOutputStream fos = FileUtils.createFileOutputStream(outputPath);) {
 
-            //FileOutputStream fos = new FileOutputStream(outputPath);
-            //SimpleStylePreserver.smartReplaceKeepStyle(document,map);
-            //BestPracticeReplacer.replaceTextBestPractice(document,map);
-            //BestPracticeReplacer.applySmartStyles(document);
-            if (!costProjectDocument.getDocumentAlias().equals("cbjstqzldjb")) {
-                SmartTemplateWriter.writeToTemplate(document,map);
-            }else {
-               List<CostProjectTaskEvidence> costProjectTaskEvidences= costProjectTaskEvidenceManager.findEvidenceListByTaskIds(costProjectDocument.getProjectId(),costProjectDocument.getEnterpriseId());
+
+            if (costProjectDocument.getDocumentAlias().equals("cbjstqzldjb")) {
+                List<CostProjectTaskEvidence> costProjectTaskEvidences= costProjectTaskEvidenceManager.findEvidenceListByTaskIds(costProjectDocument.getProjectId(),costProjectDocument.getEnterpriseId());
                 if (!costProjectTaskEvidences.isEmpty()) {
                     List<CompleteTemplateProcessor.TableRowData> mapList = costProjectTaskEvidences.stream().map(c -> {
                         CompleteTemplateProcessor.TableRowData tableRowData = new CompleteTemplateProcessor.TableRowData();
-                        /*Map<String, Object> hashMap = new HashMap<>();
-                        hashMap.put("pageCount",c.getPageCount());
-                        hashMap.put("remark",c.getRemark());
-                        hashMap.put("documentName",c.getMaterialName());*/
+
                         tableRowData.setDocumentName(c.getMaterialName());
                         tableRowData.setRemark(c.getRemark());
                         tableRowData.setPageCount(c.getPageCount());
                         return tableRowData;
                     }).collect(Collectors.toList());
-                    //int sum = costProjectTaskEvidences.stream().mapToInt(CostProjectTaskEvidence::getPageCount).sum();
-                    //SimpleTableFiller.fillTableSimple(document,null,mapList,costProjectTaskEvidences.size(),sum,DateUtils.format(new Date(),ISO8601_DATE_PATTERN));
                     AuditedUnit auditedUnit = auditedUnitManager.get(costProjectDocument.getEnterpriseId());
 
                     CompleteTemplateProcessor.processTemplateComplete(document,auditedUnit.getUnitName(),mapList,DateUtils.format(new Date(),ISO8601_DATE_PATTERN));
                 }
+            } else if (costProjectDocument.getDocumentAlias().equals("zfdjcbjsjlbg")) {
+                CostProjectApproval costProjectApproval = costProjectApprovalManager.get(costProjectDocument.getProjectId());
+
+                List<CostProjectTask> taskByProjectId = costProjectTaskManager.findTaskByProjectId(costProjectApproval.getProjectId(), costProjectDocument.getEnterpriseId());
+
+                List<Map<String,Object>> maps= costTemplateFileManager.getSurveyTemplate(taskByProjectId.get(0).getId());
+
+                CostDataUtil costDataUtil = new CostDataUtil();
+                Map<String, Object> map1 = costDataUtil.convertToCostFormat(maps);
+                @SuppressWarnings("unchecked")
+                List<String> years = (List<String>)map1.get("years");
+                @SuppressWarnings("unchecked")
+                List<Map<String, Object>> costItems = (List<Map<String, Object>>) map1.get("costItems");
+
+                // 处理文档
+                RobustComplexDocumentProcessor.processDocumentWithMaps(
+                        document,
+                        map,
+                        years,
+                        costItems
+                );
+
+            } else {
+                SmartTemplateWriter.writeToTemplate(document,map);
             }
             document.write(fos);
         } catch (IOException e) {
             throw new RuntimeException("处理Word文档时出错", e);
         }
 
-       // DocumentProcessor.processWordDocument(templatePath,outputPath,map,new LinkedHashMap<>());
         return EipConfig.getImgUrl()+FileUploadUtil.getPathFileName(outputPath,fileName);
     }
 
+
     @Override
     public void feedbackDocumentUrl(CostProjectDocumentReq req) {
         if (ObjectUtil.isEmpty(req.getId())) {

assistMg/src/main/java/com/hotent/util/CostDataUtil.java

@@ -0,0 +1,351 @@
+package com.hotent.util;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+/**
+ *@author: zhao yue yue
+ *@create: 2025-12-08 10:05
+ */
+public class CostDataUtil {
+
+
+
+    /**
+     * 将查询结果转换为目标格式
+     * @param maps 查询结果：包含序号(xuhao)、项目名称(xiangmu)、年份(nianfen)、数值(shuzhi)和rowid
+     * @return 转换后的数据结构
+     */
+    public Map<String, Object> convertToCostFormat(List<Map<String, Object>> maps) {
+        if (maps == null || maps.isEmpty()) {
+            return createEmptyResult();
+        }
+
+        // 1. 提取所有年份（从nianfen字段中提取年份数字）
+        Set<String> years = extractYearsFromData(maps);
+
+        // 2. 按序号和项目名称分组
+        Map<String, Map<String, String>> groupedData = groupBySerialAndProject(maps, years);
+
+        // 3. 构建costItems列表（按序号排序）
+        List<Map<String, Object>> costItems = buildCostItems(groupedData, years);
+
+        // 4. 添加合计行（可选）
+        addTotalItem(costItems, groupedData, years);
+
+        // 5. 返回最终结果
+        return buildResult(years, costItems);
+    }
+
+    /**
+     * 从数据中提取所有年份
+     */
+    private Set<String> extractYearsFromData(List<Map<String, Object>> maps) {
+        return maps.stream()
+                .map(row -> {
+                    String nianfen = (String) row.get("nianfen");
+                    if (nianfen != null) {
+                        // 提取年份数字，如从"2024年核定值"中提取"2024"
+                        return extractYearNumber(nianfen);
+                    }
+                    return null;
+                })
+                .filter(Objects::nonNull)
+                .filter(year -> !year.isEmpty())
+                .collect(Collectors.toCollection(TreeSet::new)); // 自动排序
+    }
+
+    /**
+     * 按序号和项目名称分组
+     */
+    private Map<String, Map<String, String>> groupBySerialAndProject(
+            List<Map<String, Object>> maps,
+            Set<String> years) {
+
+        // 使用LinkedHashMap保持插入顺序
+        Map<String, Map<String, String>> result = new LinkedHashMap<>();
+
+        for (Map<String, Object> row : maps) {
+            try {
+                String xuhao = (String) row.get("xuhao");
+                String xiangmu = (String) row.get("xiangmu");
+                String nianfen = (String) row.get("nianfen");
+                Object shuzhiObj = row.get("shuzhi");
+
+                if (xuhao == null || xiangmu == null || nianfen == null) {
+                    continue;
+                }
+
+                // 生成唯一键：序号 + "|" + 项目名称
+                String key = xuhao + "|" + xiangmu;
+
+                // 初始化项目数据
+                if (!result.containsKey(key)) {
+                    result.put(key, new HashMap<>());
+                }
+
+                // 提取年份
+                String year = extractYearNumber(nianfen);
+                if (year != null && years.contains(year)) {
+                    // 转换值为字符串
+                    String value = "";
+                    if (shuzhiObj != null) {
+                        String strValue = shuzhiObj.toString().trim();
+                        if (!strValue.isEmpty()) {
+                            value = strValue;
+                        }
+                    }
+                    result.get(key).put(year, value);
+                }
+
+            } catch (Exception e) {
+                // 跳过错误数据
+                continue;
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 构建costItems列表，按序号排序
+     */
+    private List<Map<String, Object>> buildCostItems(
+            Map<String, Map<String, String>> groupedData,
+            Set<String> years) {
+
+        List<Map<String, Object>> costItems = new ArrayList<>();
+
+        // 按序号排序（先按中文序号，再按数字序号）
+        List<String> sortedKeys = groupedData.keySet().stream()
+                .sorted((key1, key2) -> {
+                    // 分割键：序号|项目名称
+                    String[] parts1 = key1.split("\\|");
+                    String[] parts2 = key2.split("\\|");
+                    String xuhao1 = parts1[0];
+                    String xuhao2 = parts2[0];
+
+                    // 自定义排序：先中文序号，后数字序号
+                    return compareChineseAndNumber(xuhao1, xuhao2);
+                })
+                .collect(Collectors.toList());
+
+        for (String key : sortedKeys) {
+            String[] parts = key.split("\\|");
+            String xuhao = parts[0];
+            String xiangmu = parts[1];
+
+            Map<String, Object> item = new HashMap<>();
+
+            // 使用项目名称作为costItemName
+            item.put("costItemName", xiangmu);
+            // 如果需要，也可以添加序号字段
+            item.put("serialNumber", xuhao);
+
+            // 添加年份数据
+            Map<String, String> yearValues = new HashMap<>();
+            Map<String, String> projectYearData = groupedData.get(key);
+
+            for (String year : years) {
+                String value = projectYearData != null ?
+                        projectYearData.getOrDefault(year, "") : "";
+                yearValues.put(year, value);
+            }
+            item.put("yearValues", yearValues);
+
+            costItems.add(item);
+        }
+
+        return costItems;
+    }
+
+    /**
+     * 添加合计行
+     */
+    private void addTotalItem(
+            List<Map<String, Object>> costItems,
+            Map<String, Map<String, String>> groupedData,
+            Set<String> years) {
+
+        Map<String, Object> totalItem = new HashMap<>();
+        totalItem.put("costItemName", "合计");
+
+        Map<String, String> totalValues = new HashMap<>();
+
+        for (String year : years) {
+            BigDecimal total = BigDecimal.ZERO;
+
+            for (Map<String, String> projectYearData : groupedData.values()) {
+                String valueStr = projectYearData.get(year);
+                if (valueStr != null && !valueStr.trim().isEmpty()) {
+                    try {
+                        // 移除逗号等分隔符
+                        String cleanValue = valueStr.replaceAll("[^\\d.-]", "");
+                        if (!cleanValue.isEmpty()) {
+                            BigDecimal value = new BigDecimal(cleanValue);
+                            total = total.add(value);
+                        }
+                    } catch (NumberFormatException e) {
+                        // 忽略转换错误
+                    }
+                }
+            }
+
+            // 格式化合计值（添加千分位）
+            String totalStr = total.compareTo(BigDecimal.ZERO) > 0 ?
+                    formatNumberWithCommas(total) : "";
+            totalValues.put(year, totalStr);
+        }
+
+        totalItem.put("yearValues", totalValues);
+        costItems.add(totalItem);
+    }
+
+    /**
+     * 构建最终结果
+     */
+    private Map<String, Object> buildResult(Set<String> years, List<Map<String, Object>> costItems) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("years", new ArrayList<>(years));
+        result.put("costItems", costItems);
+        return result;
+    }
+
+    /**
+     * 提取年份数字
+     */
+    private String extractYearNumber(String nianfen) {
+        if (nianfen == null) return null;
+
+        // 匹配4位数字年份
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\\d{4}");
+        java.util.regex.Matcher matcher = pattern.matcher(nianfen);
+        if (matcher.find()) {
+            return matcher.group();
+        }
+        return null;
+    }
+
+    /**
+     * 比较中文序号和数字序号
+     */
+    private int compareChineseAndNumber(String xuhao1, String xuhao2) {
+        // 中文序号映射
+        Map<String, Integer> chineseMap = new HashMap<>();
+        chineseMap.put("一", 1);
+        chineseMap.put("二", 2);
+        chineseMap.put("三", 3);
+        chineseMap.put("四", 4);
+        chineseMap.put("五", 5);
+        chineseMap.put("六", 6);
+        chineseMap.put("七", 7);
+        chineseMap.put("八", 8);
+        chineseMap.put("九", 9);
+        chineseMap.put("十", 10);
+
+        // 尝试将字符串转换为数字
+        Integer num1 = chineseMap.get(xuhao1);
+        Integer num2 = chineseMap.get(xuhao2);
+
+        if (num1 == null) {
+            try {
+                num1 = Integer.parseInt(xuhao1);
+            } catch (NumberFormatException e) {
+                num1 = Integer.MAX_VALUE; // 无法转换的排到最后
+            }
+        }
+
+        if (num2 == null) {
+            try {
+                num2 = Integer.parseInt(xuhao2);
+            } catch (NumberFormatException e) {
+                num2 = Integer.MAX_VALUE; // 无法转换的排到最后
+            }
+        }
+
+        return Integer.compare(num1, num2);
+    }
+
+    /**
+     * 格式化数字（添加千分位）
+     */
+    private String formatNumberWithCommas(BigDecimal number) {
+        DecimalFormat formatter = new DecimalFormat("#,##0");
+        return formatter.format(number);
+    }
+
+    /**
+     * 创建空结果
+     */
+    private Map<String, Object> createEmptyResult() {
+        Map<String, Object> result = new HashMap<>();
+        result.put("years", new ArrayList<String>());
+        result.put("costItems", new ArrayList<Map<String, Object>>());
+        return result;
+    }
+
+    /**
+     * 使用示例
+     */
+    public static void main(String[] args) {
+        // 模拟你的查询数据
+        List<Map<String, Object>> maps = new ArrayList<>();
+
+        // 添加测试数据（根据你提供的数据）
+        addRow(maps, "一", "人数", "2024年核定值", "");
+        addRow(maps, "一", "人数", "2025年核定值", "");
+        addRow(maps, "1", "1班", "2024年核定值", "");
+        addRow(maps, "1", "1班", "2025年核定值", "");
+        addRow(maps, "2", "2班", "2024年核定值", "");
+        addRow(maps, "2", "2班", "2025年核定值", "");
+        addRow(maps, "二", "1班费用", "2024年核定值", "");
+        addRow(maps, "二", "1班费用", "2025年核定值", "");
+        addRow(maps, "1", "押金", "2024年核定值", "");
+        addRow(maps, "1", "押金", "2025年核定值", "");
+        addRow(maps, "2", "缴纳", "2024年核定值", "");
+        addRow(maps, "2", "缴纳", "2025年核定值", "");
+        addRow(maps, "三", "班级乘法", "2024年核定值", "556");
+        addRow(maps, "三", "班级乘法", "2025年核定值", "85");
+        addRow(maps, "四", "人均费用", "2024年核定值", "223");
+        addRow(maps, "四", "人均费用", "2025年核定值", "225");
+
+        CostDataUtil converter = new CostDataUtil();
+        Map<String, Object> result = converter.convertToCostFormat(maps);
+
+        // 输出结果
+        System.out.println("Years: " + result.get("years"));
+
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> costItems = (List<Map<String, Object>>) result.get("costItems");
+
+        System.out.println("\nCost Items:");
+        for (Map<String, Object> item : costItems) {
+            String costItemName = (String) item.get("costItemName");
+            System.out.println("\n项目: " + costItemName);
+
+            @SuppressWarnings("unchecked")
+            Map<String, String> yearValues = (Map<String, String>) item.get("yearValues");
+
+            @SuppressWarnings("unchecked")
+            List<String> years = (List<String>) result.get("years");
+
+            for (String year : years) {
+                String value = yearValues.get(year);
+                System.out.println("  " + year + "年: " + (value != null && !value.isEmpty() ? value : ""));
+            }
+        }
+    }
+
+    private static void addRow(List<Map<String, Object>> list,
+                               String xuhao, String xiangmu,
+                               String nianfen, String shuzhi) {
+        Map<String, Object> row = new HashMap<>();
+        row.put("xuhao", xuhao);
+        row.put("xiangmu", xiangmu);
+        row.put("nianfen", nianfen);
+        row.put("shuzhi", shuzhi);
+        list.add(row);
+    }
+
+}

assistMg/src/main/java/com/hotent/util/wordexcelutils/RobustComplexDocumentProcessor.java

@@ -6,6 +6,10 @@ package com.hotent.util.wordexcelutils;/**
  */
 
 import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBorder;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblBorders;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblPr;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
 
 import java.math.BigInteger;
 import java.util.HashMap;
@@ -30,10 +34,12 @@ public class RobustComplexDocumentProcessor {
 
         try {
             // 1. 替换所有文本占位符
-            replaceAllTextPlaceholders(document, textReplacements);
+            SmartTemplateWriter.writeToTemplate(document,textReplacements);
+            //replaceAllTextPlaceholders(document, textReplacements);
 
             // 2. 处理定价成本核定表
             processCostTableWithMaps(document, years, costItems);
+            List<XWPFTable> tables = document.getTables();
 
             System.out.println("文档处理完成！");
 
@@ -194,8 +200,10 @@ public class RobustComplexDocumentProcessor {
         XWPFTable costTable = tables.get(tables.size() - 1);
         System.out.println("找到表格，当前行数: " + costTable.getRows().size());
 
+        //CompleteTableStyleFixer.fixTableComplete(costTable,years,costItems);
         // 重建表格
         rebuildCostTableWithMaps(costTable, years, costItems);
+        TableWidthEnforcer.enforceTableWidth(costTable,100);
     }
 
     /**
@@ -219,10 +227,10 @@ public class RobustComplexDocumentProcessor {
             addCostTableDataRows(table, years, costItems, headerRowIndex);
 
             // 5. 添加说明行
-            addCostTableFooter(table);
-
+            //addCostTableFooter(table);
+            applyTableBorders(table);
             System.out.println("表格处理完成，最终行数: " + table.getRows().size());
-
+            System.out.println("表格宽度："+table.getWidth());
         } catch (Exception e) {
             System.err.println("表格处理失败: " + e.getMessage());
             e.printStackTrace();
@@ -292,6 +300,7 @@ public class RobustComplexDocumentProcessor {
         // 各年份列
         for (int i = 0; i < years.size(); i++) {
             setCellText(cells.get(2 + i), years.get(i) + "年度");
+
         }
 
         System.out.println("表头重建完成，列数: " + cells.size());
@@ -323,9 +332,9 @@ public class RobustComplexDocumentProcessor {
             // 设置成本项目
             String costItemName = (String) item.get("costItemName");
             setCellText(cells.get(0), costItemName != null ? costItemName : "");
-
+            String serialNumber = (String)item.get("serialNumber");
             // 设置行次
-            setCellText(cells.get(1), String.valueOf(i + 1));
+            setCellText(cells.get(1), serialNumber != null ? serialNumber : "");
 
             // 设置各年份数据
             for (int j = 0; j < years.size(); j++) {
@@ -388,7 +397,7 @@ public class RobustComplexDocumentProcessor {
         addCostTableDataRows(newTable, years, costItems, 1);
 
         // 添加说明行
-        addCostTableFooter(newTable);
+        //addCostTableFooter(newTable);
 
         System.out.println("新表格创建完成");
     }
@@ -408,6 +417,7 @@ public class RobustComplexDocumentProcessor {
         XWPFParagraph paragraph = cell.addParagraph();
         paragraph.setAlignment(ParagraphAlignment.CENTER);
         XWPFRun run = paragraph.createRun();
+        //cell.setWidth("2000");
         run.setText(text != null ? text : "");
     }
 
@@ -444,4 +454,63 @@ public class RobustComplexDocumentProcessor {
         }
         return sb.toString();
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * 应用表格边框
+     */
+    private static void applyTableBorders(XWPFTable table) {
+        try {
+            //table.setWidth(1000);
+            CTTblPr tblPr = table.getCTTbl().getTblPr();
+            if (tblPr == null) {
+                tblPr = table.getCTTbl().addNewTblPr();
+            }
+
+            // 创建或获取边框设置
+            CTTblBorders borders = tblPr.getTblBorders();
+            if (borders == null) {
+                borders = tblPr.addNewTblBorders();
+            }
+
+            // 设置外部边框（粗）
+            setBorder(borders.addNewTop(), "single", 8, "000000");
+            setBorder(borders.addNewLeft(), "single", 8, "000000");
+            setBorder(borders.addNewBottom(), "single", 8, "000000");
+            setBorder(borders.addNewRight(), "single", 8, "000000");
+
+            // 设置内部边框（细）
+            setBorder(borders.addNewInsideH(), "single", 4, "000000");
+            setBorder(borders.addNewInsideV(), "single", 4, "000000");
+
+            System.out.println("✅ 表格边框设置完成");
+
+        } catch (Exception e) {
+            System.err.println("设置表格边框失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 设置边框样式
+     */
+    private static void setBorder(CTBorder border, String style, int size, String color) {
+        border.setVal(STBorder.Enum.forString(style));
+        border.setSz(BigInteger.valueOf(size));
+        border.setColor(color);
+    }
+
+
+
+
 }

assistMg/src/main/java/com/hotent/util/wordexcelutils/TableWidthEnforcer.java

@@ -0,0 +1,246 @@
+package com.hotent.util.wordexcelutils;/**
+ * @program: cbjs-mvue-master
+ * @description:
+ * @author: zhao yue yue
+ * @create: 2025-12-03 18:01
+ */
+import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
+import javax.xml.namespace.QName;
+import java.util.*;
+import java.io.*;
+import java.math.BigInteger;
+/**
+ *@author: zhao yue yue
+ *@create: 2025-12-03 18:01
+ */
+public class TableWidthEnforcer {
+
+    /**
+     * 强制表格宽度生效（最可靠的方法）
+     */
+    public static void enforceTableWidth(XWPFTable table, int totalWidthPercent) {
+        if (table == null) return;
+
+        System.out.println("强制表格宽度生效: " + totalWidthPercent + "%");
+
+        try {
+            // 1. 设置表格整体宽度
+            setTableWidthDirectly(table, totalWidthPercent);
+
+            // 2. 设置表格布局为固定
+            setTableLayoutFixed(table);
+
+            // 3. 设置表格样式
+            setTableGridStyle(table);
+
+            // 4. 设置列宽
+            distributeColumnWidths(table, totalWidthPercent);
+
+            // 5. 验证宽度设置
+            verifyWidthSettings(table);
+
+            System.out.println("✅ 表格宽度强制生效完成");
+
+        } catch (Exception e) {
+            System.err.println("强制宽度失败: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 直接设置表格宽度（XML级别）
+     */
+    private static void setTableWidthDirectly(XWPFTable table, int percent) {
+        try {
+            CTTbl ctTbl = table.getCTTbl();
+            CTTblPr tblPr = ctTbl.getTblPr();
+            if (tblPr == null) {
+                tblPr = ctTbl.addNewTblPr();
+            }
+
+            // 清除现有的宽度设置
+            if (tblPr.isSetTblW()) {
+                tblPr.unsetTblW();
+            }
+
+            // 创建新的宽度设置
+            CTTblWidth tblWidth = tblPr.addNewTblW();
+            tblWidth.setType(STTblWidth.PCT);  // 使用百分比
+            tblWidth.setW(BigInteger.valueOf(percent * 50)); // 百分比值 * 50
+
+            System.out.println("表格宽度设置为: " + percent + "% (" + (percent * 50) + "单位)");
+
+        } catch (Exception e) {
+            throw new RuntimeException("设置表格宽度失败", e);
+        }
+    }
+
+    /**
+     * 设置表格布局为固定
+     */
+    private static void setTableLayoutFixed(XWPFTable table) {
+        try {
+            CTTbl ctTbl = table.getCTTbl();
+            CTTblPr tblPr = ctTbl.getTblPr();
+            if (tblPr == null) {
+                tblPr = ctTbl.addNewTblPr();
+            }
+
+            // 设置布局类型为固定
+            CTTblLayoutType layoutType = tblPr.isSetTblLayout() ?
+                    tblPr.getTblLayout() : tblPr.addNewTblLayout();
+            layoutType.setType(STTblLayoutType.FIXED);  // 关键：FIXED
+
+            System.out.println("表格布局设置为: FIXED");
+
+        } catch (Exception e) {
+            System.err.println("设置表格布局失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 设置表格样式为TableGrid
+     */
+    private static void setTableGridStyle(XWPFTable table) {
+        try {
+            CTTbl ctTbl = table.getCTTbl();
+            CTTblPr tblPr = ctTbl.getTblPr();
+            if (tblPr == null) {
+                tblPr = ctTbl.addNewTblPr();
+            }
+
+            // 设置表格样式
+            CTString style = tblPr.isSetTblStyle() ?
+                    tblPr.getTblStyle() : tblPr.addNewTblStyle();
+            style.setVal("TableGrid");
+
+            System.out.println("表格样式设置为: TableGrid");
+
+        } catch (Exception e) {
+            System.err.println("设置表格样式失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 分配列宽
+     */
+    private static void distributeColumnWidths(XWPFTable table, int totalWidthPercent) {
+        if (table.getRows().isEmpty()) return;
+
+        XWPFTableRow firstRow = table.getRow(0);
+        int columnCount = firstRow.getTableCells().size();
+
+        System.out.println("分配 " + columnCount + " 列的宽度");
+
+        // 为成本核定表设计的列宽比例
+        int[] columnPercentages = getCostTableColumnPercentages(columnCount);
+
+        // 应用到所有行
+        for (XWPFTableRow row : table.getRows()) {
+            for (int i = 0; i < Math.min(row.getTableCells().size(), columnCount); i++) {
+                setColumnWidth(row.getTableCells().get(i), columnPercentages[i]);
+            }
+        }
+    }
+
+    /**
+     * 获取成本核定表的列宽比例
+     */
+    private static int[] getCostTableColumnPercentages(int columnCount) {
+        if (columnCount == 5) { // 成本项目 + 行次 + 3个年份
+            return new int[]{30, 10, 20, 20, 20}; // 百分比
+        } else if (columnCount == 6) { // 成本项目 + 行次 + 4个年份
+            return new int[]{25, 10, 16, 16, 16, 16};
+        } else if (columnCount == 4) { // 成本项目 + 行次 + 2个年份
+            return new int[]{35, 10, 27, 27};
+        } else {
+            // 默认均匀分配
+            int[] percentages = new int[columnCount];
+            int base = 100 / columnCount;
+            for (int i = 0; i < columnCount; i++) {
+                percentages[i] = base;
+            }
+            return percentages;
+        }
+    }
+
+    /**
+     * 设置列宽（XML级别）
+     */
+    private static void setColumnWidth(XWPFTableCell cell, int percentage) {
+        try {
+            CTTc ctTc = cell.getCTTc();
+            CTTcPr tcPr = ctTc.getTcPr();
+            if (tcPr == null) {
+                tcPr = ctTc.addNewTcPr();
+            }
+
+            // 清除现有的宽度设置
+            if (tcPr.isSetTcW()) {
+                tcPr.unsetTcW();
+            }
+
+            // 设置新的宽度
+            CTTblWidth tcWidth = tcPr.addNewTcW();
+            tcWidth.setType(STTblWidth.PCT);  // 百分比
+            tcWidth.setW(BigInteger.valueOf(percentage * 50)); // 百分比 * 50
+
+            // 设置单元格无自动换行
+            CTOnOff noWrap = tcPr.isSetNoWrap() ? tcPr.getNoWrap() : tcPr.addNewNoWrap();
+            noWrap.setVal(STOnOff.ON);
+
+        } catch (Exception e) {
+            System.err.println("设置列宽失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 验证宽度设置
+     */
+    private static void verifyWidthSettings(XWPFTable table) {
+        try {
+            CTTbl ctTbl = table.getCTTbl();
+            CTTblPr tblPr = ctTbl.getTblPr();
+
+            System.out.println("\n=== 宽度设置验证 ===");
+
+            // 验证表格宽度
+            if (tblPr != null && tblPr.getTblW() != null) {
+                CTTblWidth tblWidth = tblPr.getTblW();
+                System.out.println("表格宽度类型: " + tblWidth.getType());
+                System.out.println("表格宽度值: " + tblWidth.getW());
+            } else {
+                System.out.println("❌ 表格无宽度设置");
+            }
+
+            CTTblLayoutType layout = tblPr.isSetTblLayout() ? tblPr.getTblLayout() : tblPr.addNewTblLayout();
+            layout.setType(STTblLayoutType.AUTOFIT);
+            // 验证表格布局
+            if (tblPr != null && tblPr.getTblLayout() != null) {
+                System.out.println("表格布局: " + tblPr.getTblLayout().getType());
+            }
+
+            // 验证第一行单元格宽度
+            if (!table.getRows().isEmpty()) {
+                XWPFTableRow firstRow = table.getRow(0);
+                System.out.println("第一行列数: " + firstRow.getTableCells().size());
+
+                for (int i = 0; i < firstRow.getTableCells().size(); i++) {
+                    XWPFTableCell cell = firstRow.getTableCells().get(i);
+                    CTTc ctTc = cell.getCTTc();
+                    if (ctTc.getTcPr() != null && ctTc.getTcPr().getTcW() != null) {
+                        CTTblWidth cellWidth = ctTc.getTcPr().getTcW();
+                        System.out.println("  列" + (i+1) + "宽度: " + cellWidth.getW() + " (" + cellWidth.getType() + ")");
+                    } else {
+                        System.out.println("  列" + (i+1) + ": 无宽度设置");
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            System.err.println("验证失败: " + e.getMessage());
+        }
+    }
+
+}

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

@@ -65,4 +65,34 @@
 		where
 			${whereName} = ${whereValue}
 	</select>
+
+
+	<select id="getColValue2" resultType="java.lang.String">
+
+			${tableName}
+
+	</select>
+
+	<select id="getSurveyTemplate" resultType="java.util.HashMap">
+		WITH ranked_data AS (
+			SELECT
+				*,
+				ROW_NUMBER() OVER (PARTITION BY rowid ORDER BY id ASC) as position
+		FROM cost_survey_template_upload_data
+		WHERE task_id = #{id}
+			)
+		SELECT DISTINCT
+				(SELECT rvalue FROM ranked_data WHERE rowid = r.rowid AND position = 1) as xuhao,
+				(SELECT rvalue FROM ranked_data WHERE rowid = r.rowid AND position = 3) as xiangmu,
+				r.rkey as nianfen,
+				r.rvalue as shuzhi,
+				r.rowid,
+				r.order_num
+		FROM ranked_data r
+		WHERE r.rkey LIKE CONCAT('%', '核定值', '%')
+		ORDER BY r.order_num,
+				 (SELECT rvalue FROM ranked_data WHERE rowid = r.rowid AND position = 1),
+				 (SELECT rvalue FROM ranked_data WHERE rowid = r.rowid AND position = 3),
+				 r.rkey
+	</select>
 </mapper>

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

@@ -461,7 +461,6 @@ public class OrgManagerImpl extends BaseManagerImpl<OrgDao, Org> implements OrgM
 			}
 		}
 		o.setDataScope(orgVo.getDataScope());
-		o.setCorporateRepresentative(orgVo.getCorporateRepresentative());
 		o.setProvinceCode(orgVo.getProvinceCode());
 		o.setCityCode(orgVo.getCityCode());
 		o.setCountyCode(orgVo.getCountyCode());

uc/src/main/java/com/hotent/uc/model/Org.java

@@ -100,12 +100,7 @@ public class Org extends UcBaseModel<Org>  implements IGroup{
 	@TableField(exist=false)
 	@ApiModelProperty(name="parentOrgName",notes="上级组织名称")
 	protected  String parentOrgName;
-	/**
-	 * 法人代表
-	 */
-	@TableField("CORPORATE_REPRESENTATIVE")
-	@ApiModelProperty(name="corporateRepresentative",notes="法人代表")
-	protected  String corporateRepresentative;
+
 
 	@TableField("SUPERIOR_ORG_ID_")
 	@ApiModelProperty(name="superiorOrgId",notes="所属组织id")
@@ -271,13 +266,7 @@ public class Org extends UcBaseModel<Org>  implements IGroup{
 	}
 
 
-	public String getCorporateRepresentative() {
-		return corporateRepresentative;
-	}
 
-	public void setCorporateRepresentative(String corporateRepresentative) {
-		this.corporateRepresentative = corporateRepresentative;
-	}
 
 	public Integer getIsInherit() {
 		return isInherit;