diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java index 99ef3e91..3156b55c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsEO.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.util.Date; import java.util.List; @@ -12,6 +13,7 @@ import java.util.List; * 日期: 2020-01-03
* 版权所有:版权归北京卡达克数据技术中心所有。
*/ +@Data public class SarFileSplitItemsEO extends BaseEntity { private String id; @@ -66,6 +68,7 @@ public class SarFileSplitItemsEO extends BaseEntity { private String responsibleUnitShow; private String editFlag; + private String workFlowShow; /** * java字段名转换为原始数据库列名。如果不存在则返回null
*

字段列表:

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index c274f36c..91b02664 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -330,6 +330,25 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService return -1; } if(treeList.size()>0 && messageList.size() > 0){ + //判断流程是否需要显示!! + List middle = new ArrayList<>(); + middle=messageList; + for (SarFileSplitItemsEO mis:messageList) { + mis.setWorkFlowShow("1"); + if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){ + mis.setWorkFlowShow("0"); + } + else { + for (SarFileSplitItemsEO itemsEO : middle) { + if (itemsEO.getItemsNum().length() > mis.getItemsNum().length() && itemsEO.getItemsNum().contains(mis.getItemsNum())) { + if (itemsEO.getItemsNum().startsWith(mis.getItemsNum())) { + mis.setWorkFlowShow("0"); + break; + } + } + } + } + } sarFileSplitMenuEODao.insertForeach(treeList); sarFileSplitItemsEODao.insertForeach(messageList); sarFileSplitItemsValEODao.insertForeach(itemValList); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index 2d13da5e..528db8c1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -79,7 +79,7 @@ SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type, SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit, TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as - dutyEngineerShow,tsFo.NAME as foShow, SAR_FILE_SPLIT_ITEMS.edit_flag + dutyEngineerShow,tsFo.NAME as foShow, SAR_FILE_SPLIT_ITEMS.edit_flag ,SAR_FILE_SPLIT_ITEMS.work_flow_show as workFlowShow @@ -487,7 +487,7 @@ insert into SAR_FILE_SPLIT_ITEMS (id, info_id, items_num, items_name, newcar_put_time, product_put_time, menu_id, svpps, apply_arctic, reference_stand, special_request, relevance_file, remarks, valid_flag, creation_user, creation_time, modify_time, - modify_user, iterms_conditions, edit_flag) + modify_user, iterms_conditions, edit_flag , work_flow_show) values ( @@ -500,7 +500,7 @@ #{item.validFlag, jdbcType=INTEGER}, #{item.creationUser, jdbcType=VARCHAR}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}, - #{item.editFlag, jdbcType=VARCHAR} + #{item.editFlag, jdbcType=VARCHAR} ,#{item.workFlowShow, jdbcType=VARCHAR} )