diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java index c001cec47..7fe1e2c2e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java @@ -77,6 +77,14 @@ public interface IDummyInventoryBaseEOService extends IService getPageInfo(Page page,QueryWrapper queryWrapper); + /** + * 法规清单调取虚拟请打数据 + * @param page + * @param queryWrapper + * @return + */ + IPage getPageInfoDummy(Page page,QueryWrapper queryWrapper); + /** * 订阅 * @param dummyId diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 4326bc24c..19d0aa1ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -165,6 +165,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl getPageInfoDummy(Page page, QueryWrapper queryWrapper) { + queryWrapper.and(query->{ + query.in("state",InventoryStateEnum.ISSUE.getValue()); + }); + IPage pageList = this.page(page, queryWrapper); + return pageList; + } + @Override public void read(String dummyId) { DummyReadEO dummyReadEO = new DummyReadEO(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 11e9d1344..c727f731c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -1,30 +1,41 @@ package com.jero.modules.project.controller; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.alibaba.fastjson.JSONObject; -import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; -import com.jero.modules.document.entity.BussDocumentLibraryEO; -import com.jero.modules.document.service.IBussDocumentLibraryEOService; -import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.dummy.entity.DummyInventoryBaseEO; +import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** @@ -42,6 +53,8 @@ public class ProjectLawsInventoryEOController extends JeroController copyInfoByIds(@RequestParam(name="ids",required=true) String ids, + @RequestParam(name="cut",required=true) String cut) { + try { + projectLawsInventoryEOService.copyInfoByIds(ids); + } catch (Exception e) { + if(CutEnum.CN.getValue().equals(cut)){ + return Result.error("复制失败"); + }else{ + return Result.error("Copy the failure"); + } + } + if(CutEnum.CN.getValue().equals(cut)){ + return Result.OK("复制成功"); + }else{ + return Result.OK("Copy success"); + } + } + + + /** + * 批量设置 + * + * @param projectLawsInventoryEO + * @return + */ + @AutoLog(value = "批量设置") + @ApiOperation(value="批量设置", notes="批量设置") + @PostMapping(value = "/setBatch") + public Result setBatch(@RequestBody ProjectLawsInventoryEO projectLawsInventoryEO) { + String cut = projectLawsInventoryEO.getCut(); + try { + projectLawsInventoryEOService.setBatch(projectLawsInventoryEO); + } catch (Exception e) { + if(CutEnum.CN.getValue().equals(cut)){ + return Result.error("批量设置失败！"); + }else{ + return Result.error("Batch set success"); + } + } + if(CutEnum.CN.getValue().equals(cut)){ + return Result.OK("批量设置成功"); + }else{ + return Result.OK("Batch set success"); + } + } + + /** + * 调取虚拟清单数据 + * + * @param dummyInventoryBaseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "调取虚拟清单数据") + @ApiOperation(value="调取虚拟清单数据", notes="调取虚拟清单数据") + @PostMapping(value = "/getPageInfoDummy") + public Result getPageInfoDummy(DummyInventoryBaseEO dummyInventoryBaseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { +// dummyInventoryBaseEO.setName("*发*"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); + Page page = new Page(pageNo, pageSize); + IPage pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper); + return Result.OK(dummyInventoryBaseEO.getCut(),pageList); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index d91a25ee8..b31ace150 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -363,4 +363,8 @@ public class ProjectLawsInventoryEO implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "中英文切换标识") private String cut; + + @TableField(exist = false) + @ApiModelProperty(value = "虚拟清单iD") + private String dummyInventoryBaseId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 059c8587e..c401bafc3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -1,9 +1,9 @@ package com.jero.modules.project.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectLawsInventoryEO; -import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -88,4 +88,13 @@ public interface IProjectLawsInventoryEOService extends IService processCall(JSONObject jsonObject); JSONObject queryProjectLawsInventoryInfoById(Map params); + + + void copyInfoByIds(String ids); + + /** + * 批量设置 + * @param projectLawsInventoryEO + */ + void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 971c1d865..b9bb0f724 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -14,6 +14,8 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; @@ -35,6 +37,7 @@ import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -88,6 +91,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLawsInventoryEO.getProjectLibraryId().split(","))); - List projectLawsInventoryEOS = this.list(lambdaQueryWrapper); - List serialNumberList = new ArrayList<>(); - if(projectLawsInventoryEOS.size() != 0){ - List collect = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); - serialNumberList.addAll(collect); - } - //2.文档库数据 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(ids.split(","))); - List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); - if(bussDocumentLibraryEOList.size() != 0){ - List serialNumberBussList = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); - if(serialNumberList.size() != 0){ - List collect = serialNumberList.stream().filter(e -> serialNumberBussList.contains(e)).collect(Collectors.toList()); - if(collect.size() != 0){ - if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ - throw new JeroBootException(org.apache.commons.lang3.StringUtils.join(collect,",") + "已存在不能重复添加,请重新选择"); - }else{ - throw new JeroBootException(org.apache.commons.lang3.StringUtils.join(collect,",") + "Already exists and cannot be added again"); + //法规清单所有的数据 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEO.getProjectLibraryId()); + List projectLawsInventoryEOList = this.list(wrapperTemp); + //调取 + String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId(); + if(StringUtils.isNotBlank(dummyInventoryBaseId)){ + //查询虚拟清单对应清单维护中的数据 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,projectLawsInventoryEO.getDummyInventoryBaseId()); + List dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper); + if(dummyInventoryInfoEOList.size() != 0){ + List projectLawsInventoryEOS = new ArrayList<>(); + if(projectLawsInventoryEOList.size() ==0){ + //此时法规清单中没有数据,直接将维护清单中的数据添加即可 + for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) { + ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); + projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); + BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp); + projectLawsInventoryEOS.add(projectLawsInventoryEOTemp); } + }else{ + //此时法规清单中有数据,再添加虚拟清单数据时,如果法规清单中已有要填加的虚拟清单数据,则数据以法规清单为准 + List projectLawsInventoryEOListTemp = new ArrayList<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) { + List collect = projectLawsInventoryEOList.stream() + .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); + if(collect.size() != 0){ + for (ProjectLawsInventoryEO lawsInventoryEO : collect) { + //数据对比 + ProjectLawsInventoryEO projectLawsInventoryEOTemp = dataCompare(lawsInventoryEO, dummyInventoryInfoEO); + projectLawsInventoryEOListTemp.add(projectLawsInventoryEOTemp); + } + }else{ + ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); + projectLawsInventoryEOTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); + BeanUtils.copyProperties(dummyInventoryInfoEO,projectLawsInventoryEOTemp); + projectLawsInventoryEOS.add(projectLawsInventoryEOTemp); + } + } + if(projectLawsInventoryEOListTemp.size() != 0){ + this.updateBatchById(projectLawsInventoryEOListTemp); + } + } + if(projectLawsInventoryEOS.size() != 0){ + this.saveBatch(projectLawsInventoryEOS); } } } - List list = new ArrayList<>(); - for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { - ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO(); - BeanUtils.copyProperties(bussDocumentLibraryEO,projectLawsInventoryTemp); - String id = UUID.randomUUID().toString().replace("-", ""); - projectLawsInventoryTemp.setId(id); - projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); - projectLawsInventoryTemp.setCreateTime(new Date()); - projectLawsInventoryTemp.setUpdateTime(new Date()); - projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); - projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); - list.add(projectLawsInventoryTemp); + //新增 + String ids = projectLawsInventoryEO.getIds(); + if(org.apache.commons.lang3.StringUtils.isNotBlank(ids)){ + //验重,对于每条法规清单添加文档库数据(之前添加过的就不能再次添加) + //1.已经添加过的文档库数据 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ProjectLawsInventoryEO::getProjectLibraryId, Arrays.asList(projectLawsInventoryEO.getProjectLibraryId().split(","))); + List projectLawsInventoryEOS = this.list(lambdaQueryWrapper); + List serialNumberList = new ArrayList<>(); + if (projectLawsInventoryEOS.size() != 0) { + List collect = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); + serialNumberList.addAll(collect); + } + //2.文档库数据 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(ids.split(","))); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + if (bussDocumentLibraryEOList.size() != 0) { + List serialNumberBussList = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + if (serialNumberList.size() != 0) { + List collect = serialNumberList.stream().filter(e -> serialNumberBussList.contains(e)).collect(Collectors.toList()); + if (collect.size() != 0) { + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + throw new JeroBootException(org.apache.commons.lang3.StringUtils.join(collect, ",") + "已存在不能重复添加,请重新选择"); + } else { + throw new JeroBootException(org.apache.commons.lang3.StringUtils.join(collect, ",") + "Already exists and cannot be added again"); + } + } + } + } + + List list = new ArrayList<>(); + for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { + ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO(); + BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp); + String id = UUID.randomUUID().toString().replace("-", ""); + projectLawsInventoryTemp.setId(id); + projectLawsInventoryTemp.setProjectLibraryId(projectLawsInventoryEO.getProjectLibraryId()); + projectLawsInventoryTemp.setCreateTime(new Date()); + projectLawsInventoryTemp.setUpdateTime(new Date()); + projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue()); + projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue()); + list.add(projectLawsInventoryTemp); + } + super.saveBatch(list); } - super.saveBatch(list); } /** @@ -205,6 +260,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) { QueryWrapper projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); + projectLawsInventoryEOQueryWrapper.orderByDesc("create_time"); String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); if(StringUtils.isEmpty(projectLibraryId)){ @@ -1037,4 +1093,163 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(","))); + List projectLawsInventoryEOList = this.list(wrapper); + for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { + projectLawsInventoryEO.setId(UUID.randomUUID().toString().replace("-", "")); + } + this.saveBatch(projectLawsInventoryEOList); + } + + } + + @Override + public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) { + if(org.apache.commons.lang3.StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){ + List projectLawsInventoryEOList = new ArrayList<>(); + for (String id : projectLawsInventoryEO.getIds().split(",")) { + ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); + projectLawsInventoryEOTemp.setId(id); + //实施类别 implementType + if(StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){ + projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType()); + } + //认证类型 attestationType + if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){ + projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType()); + } + //认证级别 attestationRank + if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){ + projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank()); + } + //责任领域 dutyTerritory + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){ + projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory()); + } + //设计符合性确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){ + projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate()); + } + //preHomo确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ + projectLawsInventoryEOTemp.setPrehomoDueDate(projectLawsInventoryEO.getPrehomoDueDate()); + } + //验证符合性确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){ + projectLawsInventoryEOTemp.setVerifyDueDate(projectLawsInventoryEO.getVerifyDueDate()); + } + projectLawsInventoryEOList.add(projectLawsInventoryEOTemp); + } + this.updateBatchById(projectLawsInventoryEOList); + } + } + + + private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO,DummyInventoryInfoEO dummyInventoryInfoEO){ + //编号 + if(StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())){ + projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber()); + } + //标题 + if(StringUtils.isBlank(projectLawsInventoryEO.getTitle())){ + projectLawsInventoryEO.setTitle(dummyInventoryInfoEO.getTitle()); + } + //子标题 + if(StringUtils.isBlank(projectLawsInventoryEO.getSubtitle())){ + projectLawsInventoryEO.setSubtitle(dummyInventoryInfoEO.getSubtitle()); + } + //WVTA ID + if(StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())){ + projectLawsInventoryEO.setWvtaId(dummyInventoryInfoEO.getWvtaId()); + } + //对应标准 + if(StringUtils.isBlank(projectLawsInventoryEO.getCorrespondingStandard())){ + projectLawsInventoryEO.setCorrespondingStandard(dummyInventoryInfoEO.getCorrespondingStandard()); + } + //实施类别 + if(StringUtils.isBlank(projectLawsInventoryEO.getImplementType())){ + projectLawsInventoryEO.setImplementType(dummyInventoryInfoEO.getImplementType()); + } + //在产车实施日期 + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){ + projectLawsInventoryEO.setImplementTime(dummyInventoryInfoEO.getImplementTime()); + } + //新车型实施日期 + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + } + //认证类型 + if(StringUtils.isBlank(projectLawsInventoryEO.getAttestationType())){ + projectLawsInventoryEO.setAttestationType(dummyInventoryInfoEO.getAttestationType()); + + } + //认证级别 + if(StringUtils.isBlank(projectLawsInventoryEO.getAttestationRank())){ + projectLawsInventoryEO.setAttestationRank(dummyInventoryInfoEO.getAttestationRank()); + } + //责任领域 + if(StringUtils.isBlank(projectLawsInventoryEO.getDutyTerritory())){ + projectLawsInventoryEO.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory()); + } + //备注 + if(StringUtils.isBlank(projectLawsInventoryEO.getRemark())){ + projectLawsInventoryEO.setRemark(dummyInventoryInfoEO.getRemark()); + } + //设计--交付物类型 + if(StringUtils.isBlank(projectLawsInventoryEO.getDesignDeliverableType())){ + projectLawsInventoryEO.setDesignDeliverableType(dummyInventoryInfoEO.getDesignDeliverableType()); + + } + //设计--交付物模板 + if(StringUtils.isBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + projectLawsInventoryEO.setDesignDeliverableTemplate(dummyInventoryInfoEO.getDesignDeliverableTemplate()); + } + //设计--发起人 + if(StringUtils.isBlank(projectLawsInventoryEO.getDesignInitiator())){ + projectLawsInventoryEO.setDesignInitiator(dummyInventoryInfoEO.getDesignInitiator()); + } + //设计--发起人责任人 + if(StringUtils.isBlank(projectLawsInventoryEO.getDesignDuty())){ + projectLawsInventoryEO.setDesignDuty(dummyInventoryInfoEO.getDesignDuty()); + } + //Pre--交付物类型 + if(StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDeliverableType())){ + projectLawsInventoryEO.setPrehomoDeliverableType(dummyInventoryInfoEO.getPrehomoDeliverableType()); + } + //Pre--交付物模板 + if(StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + projectLawsInventoryEO.setPrehomoDeliverableTemplate(dummyInventoryInfoEO.getPrehomoDeliverableTemplate()); + } + //Pre--发起人 + if(StringUtils.isBlank(projectLawsInventoryEO.getPrehomoInitiator())){ + projectLawsInventoryEO.setPrehomoInitiator(dummyInventoryInfoEO.getPrehomoInitiator()); + } + //Pre--发起人责任人 + if(StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDuty())){ + projectLawsInventoryEO.setPrehomoDuty(dummyInventoryInfoEO.getPrehomoDuty()); + } + //验证--交付物类型 + if(StringUtils.isBlank(projectLawsInventoryEO.getVerifyDeliverableType())){ + projectLawsInventoryEO.setVerifyDeliverableType(dummyInventoryInfoEO.getVerifyDeliverableType()); + } + //验证--交付物模板 + if(StringUtils.isBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + projectLawsInventoryEO.setVerifyDeliverableTemplate(dummyInventoryInfoEO.getVerifyDeliverableTemplate()); + } + //验证--发起人 + if(StringUtils.isBlank(projectLawsInventoryEO.getVerifyInitiator())){ + projectLawsInventoryEO.setVerifyInitiator(dummyInventoryInfoEO.getVerifyInitiator()); + } + //验证--发起人责任人 + if(StringUtils.isBlank(projectLawsInventoryEO.getVerifyDuty())){ + projectLawsInventoryEO.setVerifyDuty(dummyInventoryInfoEO.getVerifyDuty()); + } + return projectLawsInventoryEO; + + } }