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 1323c101..ec192cf0 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 @@ -63,7 +63,7 @@ public class IExportServiceImpl implements IExportService { tsUsers.forEach(tsUser -> { tsUserMap.put(tsUser.getAccount(),tsUser.getUname()); }); - List res= ExcelImportUtilByWk.readExcelpublic(importExcelDTO.class,file); + List res= ExcelImportUtilByWk.readExcelpublic(importExcelDTO.class,file,stringBuilder); if (null!=res) { DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i = 1; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java index c0375857..be89c953 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelImportUtilByWk.java @@ -34,7 +34,7 @@ public class ExcelImportUtilByWk { * @param file 上传的Excel文件 * @return 读取结果列表，读取失败时返回null */ - public static List readExcelpublic(Class tClass,MultipartFile file) { + public static List readExcelpublic(Class tClass,MultipartFile file,StringBuilder stringBuilder) { Workbook workbook = null; @@ -105,7 +105,10 @@ public class ExcelImportUtilByWk { String value = convertCellValueToString(cell); Date date= DateUtils.stringToDate(TrainFormDate.dealWithTimeZoneyyyy(value,mapExcel.get(a).exportFormat()),mapExcel.get(a).exportFormat()); // Date date= DateUtils.stringToDate(value,mapExcel.get(a).exportFormat()); - if (null==date){ + if (null!=value && !"".equals(value) && null==date){ + stringBuilder.append("第"+rowNum+"行第"+a+"列，日期格式存在问题请检查；"); + } + if (null==date && null!=value){ nums++; } map.get(a).set(o, date); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 8ff706e4..aa757296 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -39,6 +39,8 @@ public interface SarBussionessStandDao extends BaseMapper { List getBussionessStandInfoPage(SarBussionessStandEOPage page); + List getBussionessStandInfoByNum(SarBussionessStandEOPage page); + List getBussionessStandInfoPageByRole(SarBussionessStandEOPage page); //企标复审使用 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index a55d325a..dd0d909f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -4,12 +4,18 @@ package com.adc.da.slrs.sarLawsDetailedList.controller; import com.adc.da.att.controller.AttFileEOController; import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.web.BaseController; +import com.adc.da.excel.poi.excel.entity.ExportParams; +import com.adc.da.excel.poi.excel.entity.enums.ExcelType; 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.processModel.utils.ExcelExportUtilByWk; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsDetailedList.Util.BeanConverUtil; import com.adc.da.slrs.sarLawsDetailedList.entity.*; import com.adc.da.slrs.sarLawsDetailedList.service.impl.SarLawsDetailedListServiceImpl; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,10 +25,17 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.util.IOUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +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.Arrays; import java.util.List; @@ -170,4 +183,45 @@ public class SarLawsDetailedListController extends BaseController datas=new ArrayList<>(); + workbook = ExcelExportUtilByWk.exportWithData(exportParams,ExportEmptyModel.class,datas); + os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + throw new AdcDaBaseException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + } + return Result.success("200",null); + } + + + @ApiOperation(value = "导入标准数据") + @PostMapping("/importData") + public ResponseMessage importData( @RequestParam(value = "file", required = false) MultipartFile file){ + StringBuilder stringBuilder=new StringBuilder(); + List res=sarLawsDetailedListService.importData(file,stringBuilder); + if (stringBuilder.toString().length()>0){ + return Result.error("-1","",stringBuilder.toString()); + }else { + return Result.success(res); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java new file mode 100644 index 00000000..344896dc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.sarLawsDetailedList.entity; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class ExportEmptyModel { + + @Excel(name = "标准编号（必填）",orderNum = "0" ,width = 20.0) + private String standNumber; + + @Excel(name = "适用认证（必填，可多选）",orderNum = "1" ,width = 40.0) + private String syrz; + + @Excel(name = "标准实施日期",orderNum = "2" ,width = 20.0,exportFormat = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date bzssrq; + + @Excel(name = "新车型实施日期",orderNum = "3" ,width = 20.0,exportFormat = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date xcxssrq; + + @Excel(name = "在产车实施日期",orderNum = "4" ,width = 20.0,exportFormat = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date zccssrq; + + private String standId; + + private String compareFlag; + + private String syrzCode; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java index acf4c53c..dc744106 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/ISarLawsDetailedListService.java @@ -1,12 +1,10 @@ package com.adc.da.slrs.sarLawsDetailedList.service; -import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; -import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -31,6 +29,10 @@ public interface ISarLawsDetailedListService extends IService importData(MultipartFile file , StringBuilder stringBuilder); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 56f79f77..326eadd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -1,25 +1,35 @@ package com.adc.da.slrs.sarLawsDetailedList.service.impl; import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService; import com.adc.da.slrs.sarLawsAttrDetailedList.service.impl.SarLawsAttrDetailedListServiceImpl; import com.adc.da.slrs.sarLawsDetailedList.dao.SarLawsDetailedListDao; -import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; -import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; -import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; +import com.adc.da.slrs.sarLawsDetailedList.entity.*; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; +import com.adc.da.slrs.sarLawsStandInfo.dao.SarLawsStandInfoDao; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; import com.adc.da.sys.service.IDicTypeEOService; +import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -27,8 +37,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import java.lang.reflect.Array; import java.util.*; @@ -64,6 +76,16 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { @@ -733,4 +755,114 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl importData(MultipartFile file, StringBuilder stringBuilder) { + List res= ExcelImportUtilByWk.readExcelpublic(ExportEmptyModel.class,file,stringBuilder); + //数据字典数据组装 + Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); + Map dict=new HashMap<>(); + List> arr = (List>) dicTypeEO.get("SYRZCLASS"); + arr.forEach(stringStringMap -> { + dict.put(stringStringMap.get("label"),stringStringMap.get("value")); + }); + + //数据校验 先做重复交验+再做是否存在校验 + if (null != res && "".equals(stringBuilder.toString())) { + for (int i = 0; i infos=standardsInfoDao.getSarStandardsInfoByNum(infoEOPage ,"0"); + if (null!= infos && infos.size()>0){ + exportEmptyModel.setStandId(infos.get(0).getId()); + } + if (null==exportEmptyModel.getStandId()) { + //判断是否在政策里 + SarBussionessStandEOPage page = new SarBussionessStandEOPage(); + page.setPage(1); + page.setPageSize(999); + page.setValidFlag("0"); + page.setUserId(LoginUserUtil.getUserId()); + page.setStandCode(exportEmptyModel.getStandNumber()); + List sarBussionessStands = sarBussionessStandDao.getBussionessStandInfoByNum(page); + if (null != sarBussionessStands && sarBussionessStands.size() > 0) { + exportEmptyModel.setStandId(sarBussionessStands.get(0).getId()); + } + } + if (null==exportEmptyModel.getStandId()) { + //判断是否在企标里 List getSarStandardsInfoPage(SarLawsStandInfoPage page); + SarLawsStandInfoPage lawsStandInfoPage = new SarLawsStandInfoPage(); + lawsStandInfoPage.setPage(1); + lawsStandInfoPage.setPageSize(999); + lawsStandInfoPage.setValidFlag("0"); + lawsStandInfoPage.setLawsNumber(exportEmptyModel.getStandNumber()); + lawsStandInfoPage.setUserId(LoginUserUtil.getUserId()); + List sarLawsStandInfos = sarLawsStandInfoDao.getSarStandardsInfoByNum(lawsStandInfoPage); + if (null != sarLawsStandInfos && sarLawsStandInfos.size() > 0) { + exportEmptyModel.setStandId(sarLawsStandInfos.get(0).getId()); + } + } + if (null==exportEmptyModel.getStandId() || exportEmptyModel.getStandId().isEmpty()){ + stringBuilder.append("第"+i+"行标准号不存在，请检查标准号是否正确；"); + } + //验证完标准号 再来验证适用认证 写的是否合理 字典编码 SYRZCLASS0 + exportEmptyModel.setSyrz(exportEmptyModel.getSyrz().trim().replaceAll("，",",")); + if (exportEmptyModel.getSyrz().contains(",") || null != dict.get(exportEmptyModel.getSyrz())){ + if (exportEmptyModel.getSyrz().contains(",")){ + StringBuilder syrz=new StringBuilder(); + StringBuilder sy=new StringBuilder(); + List syrzs=new ArrayList<>(Arrays.asList(exportEmptyModel.getSyrz().split(","))); + syrzs.forEach(s -> { + if (null!=dict.get(s.trim())){ + syrz.append(dict.get(s.trim())+","); + }else { + syrz.append("-1"+","); + } + sy.append(s.trim()+","); + }); + if (syrz.toString().contains("-1")){ + stringBuilder.append("第"+i+"行适用认证填写错误，请检查；"); + }else { + exportEmptyModel.setSyrzCode(syrz.toString().substring(0,syrz.toString().length()-1)); + exportEmptyModel.setSyrz(sy.toString().substring(0,sy.toString().length()-1)); + } + }else { + if (null!=dict.get(exportEmptyModel.getSyrz())) { + exportEmptyModel.setSyrzCode(dict.get(exportEmptyModel.getSyrz())); + }else { + stringBuilder.append("第"+i+"行适用认证填写错误，请检查；"); + } + } + }else { + stringBuilder.append("第"+i+"行适用认证填写错误，请检查；"); + } + i++; + + } + } + return res; + }else { + return null; + } + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java index 12f498f7..a8226dc6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/dao/SarLawsStandInfoDao.java @@ -20,6 +20,7 @@ import java.util.List; public interface SarLawsStandInfoDao extends BaseMapper { List getSarStandardsInfoPage(SarLawsStandInfoPage page); + List getSarStandardsInfoByNum(SarLawsStandInfoPage page); int getSarStandardsInfoCount(SarLawsStandInfoPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 66846da9..d22c404d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -132,12 +132,12 @@ public class SarStandUnqualified extends BaseEntity { @TableField("RESPONSIBLE_UNIT") private String responsibleUnit; -// @ExcelProperty("质量工程师") + @ExcelIgnore @ApiModelProperty(value = "质量工程师") @TableField("QA_ENGINEER") private String qaEngineer; -// @ExcelProperty("认证工程师") + @ExcelIgnore @ApiModelProperty(value = "认证工程师") @TableField("AUTH_ENGINEER") private String authEngineer; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 163a05e8..8b1a30a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -23,6 +23,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List getSarStandardsInfoPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark); + List getSarStandardsInfoByNum(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark); + List selectHighLawsPage(@Param("page") SarStandardsInfoEOPage page,@Param("mark")String mark,@Param("list") List lawsIds); int getSarStandardsInfoCount(@Param("page") SarStandardsInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java index 1fbaaafa..ccc103b8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -75,7 +75,7 @@ public class WgdCgfyServiceImpl extends ServiceImpl impleme @Override public List importCgfy(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file); + List res= ExcelImportUtilByWk.readExcelpublic(WgdCgfy.class,file,stringBuilder); if (res != null){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(WgdCgfy.class, info -> !info.getColumn().equals("id")); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java index 98e78df1..036c2dbf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java @@ -74,8 +74,8 @@ public class WgdFyfyServiceImpl extends ServiceImpl impleme @Override public List importFyfy(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdFyfy.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(WgdFyfy.class, info -> !info.getColumn().equals("id")); List wgdFyfy=iWgdFyfyService.list(queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java index 264a756e..57f167c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java @@ -79,8 +79,8 @@ public class WgdSrbServiceImpl extends ServiceImpl implements @Override public List importSrb(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdSrb.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (WgdSrb wgdSrb: res) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java index a511c686..233f82cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -76,8 +76,8 @@ public class WgdWbtjServiceImpl extends ServiceImpl impleme @Override public List importWbtj(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (WgdWbtj wgdWbtj: res) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java index 87c2e827..0ce11f1a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java @@ -78,8 +78,8 @@ public class WgdWbxdServiceImpl extends ServiceImpl impleme public List importWbxd(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdWbxd.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (WgdWbxd wgdWbxd: res) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java index c5ae5934..324ee63c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java @@ -74,8 +74,8 @@ public class WgdZcbServiceImpl extends ServiceImpl implements @Override public List importZcb(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdZcb.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdZcb.class,file,stringBuilder); + if (res != null ){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(WgdZcb.class, info -> !info.getColumn().equals("id")); List wgdZcb=iWgdZcbService.list(queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java index 86b0b49a..1b985e15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java @@ -89,7 +89,7 @@ public class WgdAssocCostServiceImpl extends ServiceImpl importAssocCosts(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file); + List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocCost.class,file,stringBuilder); if (res != null){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java index 2067b505..fe4b2ddd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -78,8 +78,8 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl delWithWkData(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdAssocInfo.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (WgdAssocInfo importExcelDTO: res) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java index e1251a7e..f81074fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java @@ -80,8 +80,8 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl importCommiInfo(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (WgdCommiInfo wgdCommiInfo: res) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java index 28f45ddf..e3f11aa3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java @@ -75,7 +75,7 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl importExReviseCost(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file); + List res= ExcelImportUtilByWk.readExcelpublic(WgdExReviseCost.class,file,stringBuilder); if (res != null){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select(WgdExReviseCost.class, info -> !info.getColumn().equals("id")); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java index 90f4364f..22bd6f71 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java @@ -77,8 +77,8 @@ public class WgdMeetCostServiceImpl extends ServiceImpl importMeetCost(MultipartFile file, StringBuilder stringBuilder) { - List res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file); - if (res != null){ + List res= ExcelImportUtilByWk.readExcelpublic(WgdMeetCost.class,file,stringBuilder); + if (res != null && "".equals(stringBuilder.toString())){ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); int i=1; for (WgdMeetCost wgdCommiInfo: res) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index aca88967..7f87fdb3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -616,6 +616,94 @@ + + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + + + + + + + + left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id + left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_BUSSIONESS_STAND.text_status_buss + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + where 1=1 + + + and (SAR_BUSSIONESS_STAND.STAND_CODE = #{standCode} + or REPLACE( SAR_BUSSIONESS_STAND.STAND_CODE,' ','') = REPLACE( #{standCode},' ','')) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -736,6 +824,20 @@ limit ${pager.startIndex-1},${pageSize}) a + + + + + + + +