diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java index 70ca433f..bb45f170 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java @@ -5,7 +5,6 @@ import com.adc.da.excel.poi.excel.entity.enums.ExcelType; import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel; import com.adc.da.slrs.processModel.entity.exportExcel; import com.adc.da.slrs.processModel.entity.importExcelDTO; -import com.adc.da.slrs.processModel.service.IExportService; import com.adc.da.slrs.processModel.service.impl.IExportServiceImpl; import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk; import com.adc.da.sys.service.IDicTypeEOService; @@ -24,6 +23,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -66,11 +67,11 @@ public class exportWkExcel { @ApiOperation(value = "|SarFileSplitItemsEO|导入") @PostMapping(value = "/importData") - public ResponseMessage> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { + public ResponseMessage importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { StringBuilder stringBuilder=new StringBuilder(); List res=exportService.delWithWkData(file,stringBuilder); if (stringBuilder.toString().length()>0){ - return Result.error(stringBuilder.toString()); + return Result.error("-1","",stringBuilder.toString()); }else { return Result.success(res); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java index 4d6c44fb..51a3c55a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java @@ -64,46 +64,46 @@ public class IExportServiceImpl implements IExportService { DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (importExcelDTO importExcelDTO: res) { - if (null!=importExcelDTO.getWgLeader()) { + if (null!=importExcelDTO.getWgLeader() && !"".equals(importExcelDTO.getWgLeader())) { importExcelDTO.setWgLeaderName(tsUserMap.get(importExcelDTO.getWgLeader())); if (null == tsUserMap.get(importExcelDTO.getWgLeader())) { stringBuilder.append("第" + i + "行第7列工作组组长填写不符合格式要求请检查;"); } } - if (null!=importExcelDTO.getUnit()){ + if (null!=importExcelDTO.getUnit() && !"".equals(importExcelDTO.getUnit())){ importExcelDTO.setUnitName(tsInstitutionMap.get(importExcelDTO.getUnit())); if (null==tsInstitutionMap.get(importExcelDTO.getUnit())){ stringBuilder.append("第"+i+"行第4列起草责任单位填写不符合格式要求请检查;"); } } - if (null!=importExcelDTO.getDrafter()){ + if (null!=importExcelDTO.getDrafter() && !"".equals(importExcelDTO.getDrafter())){ importExcelDTO.setDrafterName(tsUserMap.get(importExcelDTO.getDrafter())); if ( null==tsUserMap.get(importExcelDTO.getDrafter())){ stringBuilder.append("第"+i+"行第5列起草人填写不符合格式要求请检查;"); } } - if (null!=importExcelDTO.getResPerson()){ + if (null!=importExcelDTO.getResPerson() && !"".equals(importExcelDTO.getResPerson())){ importExcelDTO.setResPersonName(tsUserMap.get(importExcelDTO.getResPerson())); if ( null==tsUserMap.get(importExcelDTO.getResPerson())){ stringBuilder.append("第"+i+"行第6列评审责任人填写不符合格式要求请检查;"); } } try { - if (null!=importExcelDTO.getEndTime()) { + if (null!=importExcelDTO.getEndTime() && !"".equals(importExcelDTO.getEndTime())) { importExcelDTO.setEndTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getEndTime())))); } }catch (Exception e){ stringBuilder.append("第"+i+"行第10列立项完成时间填写不符合格式要求请检查;"); } try { - if (null!=importExcelDTO.getReleaseTime()) { + if (null!=importExcelDTO.getReleaseTime() && !"".equals(importExcelDTO.getReleaseTime())) { importExcelDTO.setReleaseTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getReleaseTime())))); } }catch (Exception e){ stringBuilder.append("第"+i+"行第9列计划标准发布时间填写不符合格式要求请检查;"); } try { - if (null!=importExcelDTO.getDraftTime()) { + if (null!=importExcelDTO.getDraftTime() && !"".equals(importExcelDTO.getDraftTime())) { importExcelDTO.setDraftTime(formater.format(HSSFDateUtil.getJavaDate(Double.valueOf(importExcelDTO.getDraftTime())))); } }catch (Exception e){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java index 4c928259..80bfefba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -1,16 +1,12 @@ package com.adc.da.slrs.wgdCensusZ.controller; -import com.adc.da.excel.poi.excel.ExcelExportUtil; import com.adc.da.excel.poi.excel.entity.ExportParams; import com.adc.da.excel.poi.excel.entity.enums.ExcelType; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel; -import com.adc.da.slrs.msgDynamicInfo.dto.MsgDynamicInfoExportDto; -import com.adc.da.slrs.msgDynamicInfo.page.MsgDynamicInfoEOPage; -import com.adc.da.slrs.processModel.entity.importExcelDTO; import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk; import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; @@ -26,7 +22,6 @@ import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import org.springframework.web.multipart.MultipartFile; -import sun.plugin.util.UIUtil; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java index 2dba6a45..673dd50c 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java @@ -51,6 +51,7 @@ public class SyncUserService { JSONObject responseStr = JSON.parseObject(rs); System.out.println(rs); + log.info(rs); if (responseStr.containsKey("cookie")) { try { JSONArray entries = responseStr.getJSONArray("cookie"); @@ -97,6 +98,7 @@ public class SyncUserService { JSONObject responseStr = JSONObject.parseObject(rs); System.out.println(responseStr); + log.info(rs); if (responseStr.containsKey("cookie")) { try { JSONArray entries = responseStr.getJSONArray("cookie");