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

This commit is contained in:
梁琦涛
2024-09-10 18:38:26 +08:00
parent cd696c36da
commit 8c477df597
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.standardinterpret.service.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
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.QueryWrapper;
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");
}
}
List<ProcessStandardInterpretClause> processStandardInterpretClauseList =
standardInterpretDTO.getProcessStandardInterpretClauseList();
if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){
standardInterpretDTO.setProcessStandardInterpretClauseSublistList(
JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList),
ProcessStandardInterpretClauseSublist.class));
}
List<ProcessStandardInterpretClauseSublist> processStandardInterpretClauseSublistList =
standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
if (list.size() != processStandardInterpretClauseSublistList.size()){
@@ -1403,12 +1411,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
if (i > 0 && exist){
// 条款校验
ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist = clauseSublistList.get(i);
if(processStandardInterpretClauseSublist.getItemNum().equals(itemNum)
&& processStandardInterpretClauseSublist.getItemTitle().equals(itemTitle)){
if(Objects.equals(processStandardInterpretClauseSublist.getItemNum(), itemNum)
&& Objects.equals(StringUtils.isBlank(processStandardInterpretClauseSublist.getItemTitle()) ?
"":processStandardInterpretClauseSublist.getItemTitle(),
(StringUtils.isBlank(itemTitle) ? "":itemTitle))){
data.setClauseId(processStandardInterpretClauseSublist.getClauseId());
data.setItemTitle(processStandardInterpretClauseSublist.getItemTitle());
data.setItemContent(processStandardInterpretClauseSublist.getItemContent());
data.setTranslation(processStandardInterpretClauseSublist.getTranslation());
data.setTitleTranslation(processStandardInterpretClauseSublist.getTitleTranslation());
}else {
errorList.add("该数据在业务分派信息中不存在!");
}