QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标准解读流程分发导入bug修改

Browse Source
This commit is contained in:
梁琦涛
2024-09-10 18:38:26 +08:00
parent cd696c36da
commit 8c477df597
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+13 -2
View File
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.standardinterpret.service.impl;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -960,6 +961,13 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
throw new JeroBootException("The list cannot import data！"); throw new JeroBootException("The list cannot import data！");
} }
} }
List<ProcessStandardInterpretClause> processStandardInterpretClauseList =
standardInterpretDTO.getProcessStandardInterpretClauseList();
if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){
standardInterpretDTO.setProcessStandardInterpretClauseSublistList(
JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList),
ProcessStandardInterpretClauseSublist.class));
}
List<ProcessStandardInterpretClauseSublist> processStandardInterpretClauseSublistList = List<ProcessStandardInterpretClauseSublist> processStandardInterpretClauseSublistList =
standardInterpretDTO.getProcessStandardInterpretClauseSublistList(); standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
if (list.size() != processStandardInterpretClauseSublistList.size()){ if (list.size() != processStandardInterpretClauseSublistList.size()){
@@ -1403,12 +1411,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
if (i > 0 && exist){ if (i > 0 && exist){
// 条款校验 // 条款校验
ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist = clauseSublistList.get(i); ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist = clauseSublistList.get(i);
if(processStandardInterpretClauseSublist.getItemNum().equals(itemNum) if(Objects.equals(processStandardInterpretClauseSublist.getItemNum(), itemNum)
&& processStandardInterpretClauseSublist.getItemTitle().equals(itemTitle)){ && Objects.equals(StringUtils.isBlank(processStandardInterpretClauseSublist.getItemTitle()) ?
"":processStandardInterpretClauseSublist.getItemTitle(),
(StringUtils.isBlank(itemTitle) ? "":itemTitle))){
data.setClauseId(processStandardInterpretClauseSublist.getClauseId()); data.setClauseId(processStandardInterpretClauseSublist.getClauseId());
data.setItemTitle(processStandardInterpretClauseSublist.getItemTitle()); data.setItemTitle(processStandardInterpretClauseSublist.getItemTitle());
data.setItemContent(processStandardInterpretClauseSublist.getItemContent()); data.setItemContent(processStandardInterpretClauseSublist.getItemContent());
data.setTranslation(processStandardInterpretClauseSublist.getTranslation()); data.setTranslation(processStandardInterpretClauseSublist.getTranslation());
data.setTitleTranslation(processStandardInterpretClauseSublist.getTitleTranslation());
}else { }else {
errorList.add("该数据在业务分派信息中不存在！"); errorList.add("该数据在业务分派信息中不存在！");
} }