参数上报库清单--历史记录

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -25,11 +25,23 @@ import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
 import com.jero.modules.cert.collect.enums.ExportStateEnum;
 import com.jero.modules.cert.collect.service.IParamsCollectExportService;
 import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
-import com.jero.modules.cert.report.entity.*;
+import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
+import com.jero.modules.cert.report.entity.ParamsReportDetailLogEO;
+import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
 import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
 import com.jero.modules.cert.report.enums.ExportTypeEnum;
 import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper;
-import com.jero.modules.cert.report.service.*;
+import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
+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.IParamsReportDetailLogEOService;
+import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
+import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
 import com.jero.modules.cert.template.enums.ParamsIsMustEnum;
@@ -50,7 +62,13 @@ import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 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.docx4j.Docx4J;
@@ -68,14 +86,32 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+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.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 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.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -1824,6 +1860,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		List<ParamsReportConfigDataEO> paramsReportConfigDataEOList = paramsReportConfigDataEOService.queryListByConfigIdList(paramsReportConfigIdList); // 查询所有配置数据
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
+//		List<String> idList = configDataList.stream().map(e -> e.get("id").toString()).collect(Collectors.toList());
+//		List<ParamsReportDetailEO> paramsReportDetailEOS = this.listByIds(idList);
 		// 处理数据
 		for (Map<String, Object> map : configDataList) {
 
@@ -2041,10 +2079,28 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				this.paramsReportConfigDataEOService.remove(removeConfigDataWrap);
 			}
 			ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
+
 			String ramarks = "";
 			if(map.get("remarks") != null){
 				ramarks = map.get("remarks").toString();
 			}
+			boolean remarkFlag = false;
+//			List<ParamsReportDetailEO> collect = paramsReportDetailEOS.stream().filter(e -> paramsCollectManifestId.equals(e.getId())).collect(Collectors.toList());
+//			if(ObjectUtils.isNotEmpty(collect)){
+//				String remark = collect.get(0).getRemarks();
+//				if(StringUtils.isNotBlank(remark)
+//						&& StringUtils.isNotBlank(ramarks)
+//						&& !ramarks.equals(remark)){
+//					remarkFlag = true;
+//				}
+//				if(StringUtils.isBlank(remark) && StringUtils.isNotBlank(ramarks)){
+//					remarkFlag = true;
+//				}
+//				if(StringUtils.isNotBlank(remark) && StringUtils.isBlank(ramarks)){
+//					remarkFlag = true;
+//				}
+//			}
+
 			if(!loginUser.getUsername().equals(logCnContent.toString()) && !loginUser.getUsername().equals(logEnContent.toString())){
 				insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.length()-1));
 				insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logCnContent.length()-1));