WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

法规清单功能开发

Browse Source
This commit is contained in:
zhn
2022-04-27 22:10:52 +08:00
parent e8a4f8f1a6
commit aa6789f030
6 changed files with 396 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
+8
View File
@@ -77,6 +77,14 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
*/
IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page,QueryWrapper<DummyInventoryBaseEO> queryWrapper);
/**
* 法规清单调取虚拟请打数据
* @param page
* @param queryWrapper
* @return
*/
IPage<DummyInventoryBaseEO> getPageInfoDummy(Page<DummyInventoryBaseEO> page,QueryWrapper<DummyInventoryBaseEO> queryWrapper);
/**
* 订阅
* @param dummyId
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+9
View File
@@ -165,6 +165,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
return pageList;
}
@Override
public IPage<DummyInventoryBaseEO> getPageInfoDummy(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
queryWrapper.and(query->{
query.in("state",InventoryStateEnum.ISSUE.getValue());
});
IPage<DummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
return pageList;
}
@Override
public void read(String dummyId) {
DummyReadEO dummyReadEO = new DummyReadEO();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+110 -18
View File
@@ -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<ProjectLaws
private IProjectLawsInventoryEOService projectLawsInventoryEOService;
@Autowired
private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
@Autowired
private IDummyInventoryBaseEOService dummyInventoryBaseEOService;
/**
* 分页列表查询
@@ -234,4 +247,83 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
return Result.OK(pageList);
}
/**
* 复制
*
* @param ids
* @return
*/
@AutoLog(value = "复制")
@ApiOperation(value="复制", notes="复制")
@GetMapping(value = "/copyInfoByIds")
public Result<?> 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<DummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<DummyInventoryBaseEO> page = new Page<DummyInventoryBaseEO>(pageNo, pageSize);
IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper);
return Result.OK(dummyInventoryBaseEO.getCut(),pageList);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+4
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+10 -1
View File
@@ -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<ProjectLawsInve
Result<?> processCall(JSONObject jsonObject);
JSONObject queryProjectLawsInventoryInfoById(Map<String, Object> params);
void copyInfoByIds(String ids);
/**
* 批量设置
* @param projectLawsInventoryEO
*/
void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+255 -40
View File
@@ -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<ProjectLawsIn
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private IDummyInventoryInfoEOService dummyInventoryInfoEOService;
/**
* 保存
@@ -97,52 +102,102 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
*/
@Override
public void add(ProjectLawsInventoryEO projectLawsInventoryEO) {
String ids = projectLawsInventoryEO.getIds();
if(StringUtils.isEmpty(ids)){
throw new JeroBootException("文档库id不能为空，请检查！");
}
//验重,对于每条法规清单添加文档库数据(之前添加过的就不能再次添加)
//1.已经添加过的文档库数据
LambdaQueryWrapper<ProjectLawsInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLawsInventoryEO.getProjectLibraryId().split(",")));
List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.list(lambdaQueryWrapper);
List<String> serialNumberList = new ArrayList<>();
if(projectLawsInventoryEOS.size() != 0){
List<String> collect = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
serialNumberList.addAll(collect);
}
//2.文档库数据
LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(ids.split(",")));
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
if(bussDocumentLibraryEOList.size() != 0){
List<String> serialNumberBussList = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
if(serialNumberList.size() != 0){
List<String> 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<ProjectLawsInventoryEO> wrapperTemp = new LambdaQueryWrapper<>();
wrapperTemp.in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEO.getProjectLibraryId());
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.list(wrapperTemp);
//调取
String dummyInventoryBaseId = projectLawsInventoryEO.getDummyInventoryBaseId();
if(StringUtils.isNotBlank(dummyInventoryBaseId)){
//查询虚拟清单对应清单维护中的数据
LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,projectLawsInventoryEO.getDummyInventoryBaseId());
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = dummyInventoryInfoEOService.list(lambdaQueryWrapper);
if(dummyInventoryInfoEOList.size() != 0){
List<ProjectLawsInventoryEO> 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<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
List<ProjectLawsInventoryEO> 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<ProjectLawsInventoryEO> 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<ProjectLawsInventoryEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(ProjectLawsInventoryEO::getProjectLibraryId, Arrays.asList(projectLawsInventoryEO.getProjectLibraryId().split(",")));
List<ProjectLawsInventoryEO> projectLawsInventoryEOS = this.list(lambdaQueryWrapper);
List<String> serialNumberList = new ArrayList<>();
if (projectLawsInventoryEOS.size() != 0) {
List<String> collect = projectLawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList());
serialNumberList.addAll(collect);
}
//2.文档库数据
LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(ids.split(",")));
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
if (bussDocumentLibraryEOList.size() != 0) {
List<String> serialNumberBussList = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
if (serialNumberList.size() != 0) {
List<String> 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<ProjectLawsInventoryEO> 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<ProjectLawsIn
@Override
public List<ProjectLawsInventoryEO> queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) {
QueryWrapper<ProjectLawsInventoryEO> 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<ProjectLawsIn
sendMessage(msgContentEN,userIdList,id);
}
}
@Override
public void copyInfoByIds(String ids) {
if(org.apache.commons.lang3.StringUtils.isNotBlank(ids)){
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(",")));
List<ProjectLawsInventoryEO> 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<ProjectLawsInventoryEO> 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;
}
}