参数项收集清单--参考列

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -13,7 +13,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.api.vo.Result;
-import com.jero.common.constant.enums.*;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.MessageType2Enum;
+import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.constant.enums.ModuleEnum;
+import com.jero.common.constant.enums.MsgColorEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.query.QueryRuleEnum;
@@ -21,15 +26,42 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.oss.CosBootUtil;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
-import com.jero.modules.cert.collect.entity.*;
+import com.jero.modules.cert.collect.entity.ParamsCollectExport;
-import com.jero.modules.cert.collect.enums.*;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
+import com.jero.modules.cert.collect.entity.ParamsCollectManifestLogEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
+import com.jero.modules.cert.collect.entity.ParamsConfigEO;
+import com.jero.modules.cert.collect.entity.ParamsManifestEO;
+import com.jero.modules.cert.collect.enums.CollectManifestChangeFlagEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestRoleIdEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
+import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
+import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
+import com.jero.modules.cert.collect.enums.ConfigLockEnum;
+import com.jero.modules.cert.collect.enums.ExportStateEnum;
+import com.jero.modules.cert.collect.enums.ManifestStateEnum;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
-import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.service.IParamsCollectExportService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestLogEOService;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
-import com.jero.modules.cert.report.entity.*;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
-import com.jero.modules.cert.report.service.*;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.entity.ParamsReportEO;
+import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
+import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
+import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
+import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
+import com.jero.modules.cert.report.service.IParamsReportEOService;
+import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
 import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
@@ -61,22 +93,34 @@ import com.jero.modules.split.common.ReadExcel;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.entity.SysUserRole;
+import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysAnnouncementService;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysUserRoleService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
-import com.jero.modules.system.service.*;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDataFormat;
 import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.SecurityUtils;
 import org.aspectj.util.FileUtil;
 import org.springframework.beans.BeanUtils;
@@ -92,15 +136,33 @@ import org.yaml.snakeyaml.util.UriEncoder;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.text.Collator;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull;
@@ -1525,7 +1587,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
                         String[] references = projectName.split("-");
                         // map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
-                        map.put("db_field_txt", paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
+//                        map.put("db_field_txt", paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
+                        map.put("db_field_txt", onlCgformField.getDbFieldTxt()+projectName+" "+paramsManifestEO.getReferencesColName());//字段中文名
                         map.put("db_field_id", paramsManifestEO.getReferencesColId());
                         map.put("references_col", true);
                     } else {
@@ -1543,7 +1606,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
                         String[] references = projectName.split("-");
                         // map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
-                        map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
+//                        map.put("db_field_txt", projectName + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
+                        map.put("db_field_txt", onlCgformField.getDbFieldEnName()+" "+projectName + " " + paramsManifestEO.getReferencesColName());//字段英文名
                         map.put("db_field_id", paramsManifestEO.getReferencesColId());
                         map.put("references_col", true);