|
@@ -3,7 +3,10 @@ package cn.cslg.pas.service.business;
|
|
|
import cn.cslg.pas.common.dto.DomainFieldDTO;
|
|
|
import cn.cslg.pas.common.dto.business.InvalidStatutesDTO;
|
|
|
import cn.cslg.pas.common.dto.invalidDTO.UpdateMessageDTO;
|
|
|
+import cn.cslg.pas.common.model.cronModel.PersonnelVO;
|
|
|
+import cn.cslg.pas.common.utils.CacheUtils;
|
|
|
import cn.cslg.pas.common.utils.GenerateObjectUtil;
|
|
|
+import cn.cslg.pas.common.utils.LoginUtils;
|
|
|
import cn.cslg.pas.common.vo.invalidVO.InvalidStatutesVO;
|
|
|
import cn.cslg.pas.domain.business.*;
|
|
|
import cn.cslg.pas.exception.XiaoShiException;
|
|
@@ -25,6 +28,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 无效发条Service
|
|
|
+ *
|
|
|
* @Author xiexiang
|
|
|
* @Date 2023/12/22
|
|
|
*/
|
|
@@ -41,12 +45,19 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
@Lazy
|
|
|
private ProofGroupService proofGroupService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private CacheUtils cacheUtils;
|
|
|
+ @Autowired
|
|
|
+ private LoginUtils loginUtils;
|
|
|
+
|
|
|
/**
|
|
|
* 添加无效法条
|
|
|
+ *
|
|
|
* @param invalidStatutesDTO
|
|
|
* @return
|
|
|
*/
|
|
|
public List<Integer> addInvalidStatutes(InvalidStatutesDTO invalidStatutesDTO) {
|
|
|
+ Integer projectId =invalidStatutesDTO.getProjectId();
|
|
|
List<Integer> ids = new ArrayList<>();
|
|
|
if (invalidStatutesDTO != null) {
|
|
|
if (invalidStatutesDTO.getProjectId() != null) {
|
|
@@ -71,11 +82,21 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
//涉及内容为说明书或者附图
|
|
|
InvalidStatutes invalidStatutes = new InvalidStatutes();
|
|
|
BeanUtils.copyProperties(invalidStatutesDTO, invalidStatutes);
|
|
|
+ if (invalidStatutesDTO.getRelatedContent().equals(2)) {
|
|
|
+ PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
|
|
|
+ PatentClaim patentClaim = new PatentClaim();
|
|
|
+ patentClaim.setCreateId(personnelVO.getId());
|
|
|
+ patentClaim.setContentType(1);
|
|
|
+ patentClaim.setProjectId(projectId);
|
|
|
+ patentClaim.insert();
|
|
|
+ invalidStatutes.setClaimId(patentClaim.getId());
|
|
|
+ }
|
|
|
+
|
|
|
invalidStatutes.insert();
|
|
|
Integer id = invalidStatutes.getId();
|
|
|
ids.add(id);
|
|
|
- }
|
|
|
- else {
|
|
|
+
|
|
|
+ } else {
|
|
|
throw new XiaoShiException("涉及内容不能为空");
|
|
|
}
|
|
|
return ids;
|
|
@@ -88,10 +109,11 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
|
|
|
/**
|
|
|
* 查询无效法条
|
|
|
+ *
|
|
|
* @param projectId
|
|
|
* @return
|
|
|
*/
|
|
|
- public List<InvalidStatutesVO> queryInvalidStatutes(Integer projectId){
|
|
|
+ public List<InvalidStatutesVO> queryInvalidStatutes(Integer projectId) {
|
|
|
List<InvalidStatutesVO> invalidStatutesVOS = new ArrayList<>();
|
|
|
if (projectId != null) {
|
|
|
//根据报告id查询所有无效法条
|
|
@@ -116,9 +138,10 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
|
|
|
/**
|
|
|
* 装载法条
|
|
|
+ *
|
|
|
* @param invalidStatutesVOS
|
|
|
*/
|
|
|
- public void loadStatutes(List<InvalidStatutesVO> invalidStatutesVOS){
|
|
|
+ public void loadStatutes(List<InvalidStatutesVO> invalidStatutesVOS) {
|
|
|
List<Integer> invalidStatutesIds = invalidStatutesVOS.stream().map(InvalidStatutesVO::getStatutesId).collect(Collectors.toList());
|
|
|
if (!invalidStatutesIds.isEmpty()) {
|
|
|
LambdaQueryWrapper<SystemDict> queryWrapper = new LambdaQueryWrapper<>();
|
|
@@ -147,9 +170,10 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
|
|
|
/**
|
|
|
* 装载权要
|
|
|
+ *
|
|
|
* @param invalidStatutesVOS
|
|
|
*/
|
|
|
- public void loadClaims(Integer projectId, List<InvalidStatutesVO> invalidStatutesVOS){
|
|
|
+ public void loadClaims(Integer projectId, List<InvalidStatutesVO> invalidStatutesVOS) {
|
|
|
List<Integer> claimIds = invalidStatutesVOS.stream().filter(item -> item.getClaimId() != null).map(InvalidStatutesVO::getClaimId).collect(Collectors.toList());
|
|
|
if (!claimIds.isEmpty()) {
|
|
|
LambdaQueryWrapper<PatentClaim> queryWrapper = new LambdaQueryWrapper<>();
|
|
@@ -164,6 +188,7 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
.findFirst()
|
|
|
.orElse(null);
|
|
|
if (patentClaim != null) {
|
|
|
+ invalidStatutesVO.setClaimId(patentClaim.getId());
|
|
|
invalidStatutesVO.setClaimSort(patentClaim.getSysOrder());
|
|
|
invalidStatutesVO.setClaimText(patentClaim.getContent());
|
|
|
invalidStatutesVO.setRbDecision(patentClaim.getRbDecision());
|
|
@@ -180,7 +205,6 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 更新信息
|
|
|
*
|
|
@@ -214,27 +238,26 @@ public class InvalidStatutesService extends ServiceImpl<InvalidStatutesMapper, I
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public Integer removeInvalidStatutes(Integer id){
|
|
|
- if(id==null){
|
|
|
+ public Integer removeInvalidStatutes(Integer id) {
|
|
|
+ if (id == null) {
|
|
|
throw new XiaoShiException("请输入无效法条");
|
|
|
}
|
|
|
- InvalidStatutes invalidStatutes =this.getById(id);
|
|
|
- if(invalidStatutes==null){
|
|
|
+ InvalidStatutes invalidStatutes = this.getById(id);
|
|
|
+ if (invalidStatutes == null) {
|
|
|
throw new XiaoShiException("无效法条不存在");
|
|
|
}
|
|
|
- //根据无效法条id 查询是否有证据组合
|
|
|
- LambdaQueryWrapper<ProofGroup> queryWrapper =new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(ProofGroup::getInvalidStatutesId,id);
|
|
|
- List<ProofGroup> proofGroups =proofGroupService.list(queryWrapper);
|
|
|
- if(proofGroups.size()>0){
|
|
|
- throw new XiaoShiException("请先删除该法条的证据组合");
|
|
|
- }
|
|
|
- this.removeById(id);
|
|
|
- return id;
|
|
|
+ //根据无效法条id 查询是否有证据组合
|
|
|
+ LambdaQueryWrapper<ProofGroup> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(ProofGroup::getInvalidStatutesId, id);
|
|
|
+ List<ProofGroup> proofGroups = proofGroupService.list(queryWrapper);
|
|
|
+ if (proofGroups.size() > 0) {
|
|
|
+ throw new XiaoShiException("请先删除该法条的证据组合");
|
|
|
+ }
|
|
|
+ this.removeById(id);
|
|
|
+ return id;
|
|
|
}
|
|
|
}
|