Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreAttrMapping.java
@@ -35,18 +35,21 @@ */ @ApiModelProperty(value = "源系统的属性oid") private String metaListId; /** * 源分类id */ @ApiModelProperty(value = "源系统的分类oid") @TableField(value = "sourceClsfId") private String sourceClassifyId; /** * 源分类名称 */ @ApiModelProperty(value = "源系统的分类名称") @TableField(value = "sourceClsfName") private String sourceClassifyName; /** * 源属性oid */ @@ -90,22 +93,23 @@ @ApiModelProperty(value = "源系统属性名称") private String sourceAttrName; /*** * 视图名称 */ @ApiModelProperty(value = "模型视图名称") private String viewModelName; /*** * 视图名称 */ @ApiModelProperty(value = "模型视图名称") private String viewName; /*** * 目标属性名称 */ @ApiModelProperty(value = "目标属性名称") @TableField(value = "targetClsfName") private String targetClassifyName; } Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreMetaAttr.java
@@ -19,11 +19,13 @@ */ @ApiModelProperty(value = "中文名称") private String chineseName; /*** * 英文名称 */ @ApiModelProperty(value = "集团分类主键") private String englishName; /*** * 属性字段类型 */ @@ -38,6 +40,7 @@ */ @ApiModelProperty(value = "取值范围") private String range; /*** * 父属性 */ @@ -50,12 +53,14 @@ @ApiModelProperty(value = "集团分类主键") @TableField(value = "sourceClsfId") private String sourceClassifyId; /** * 视图模型id */ @ApiModelProperty(value = "视图模型主键") @TableField(value = "viewModeId") private String viewModelId; /*** * 默认值 */ Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -41,8 +41,8 @@ @Slf4j public class MdmInterJtClient implements IMdmInterJtClient { @Value("${docking.apply.partCoe:10}") public String partCoe; @Value("${docking.apply.partCode:10}") public String partCode; /** * 集团申请单服务 @@ -318,8 +318,8 @@ try { String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId(); Map<String, DockingPreViewModel> jviewmodelMap = new HashMap<String, DockingPreViewModel>(); //Map<String, String> condtionMa = new HashMap<String, String>(); // condtionMa.put("jsourceclsfid", jclassId); // Map<String, String> condtionMa = new HashMap<String, String>(); // condtionMa.put("jsourceclsfid", jclassId); List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,false));// 根据分类查询模型视图对象 for (DockingPreViewModel dockingPreViewModel : dockingPreViewModelList) { jviewmodelMap.put(dockingPreViewModel.getViewName(),dockingPreViewModel); Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/mapper/DockingPreMetaAttrMapper.java
@@ -3,5 +3,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreMetaAttr; public interface DockingPreMetaAttrMapper extends BaseMapper<DockingPreMetaAttr> { public interface DockingPreMetaAttrMapper extends BaseMapper<DockingPreMetaAttr> { } Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java
@@ -14,17 +14,18 @@ */ public interface IDockingPreMetaAttrService extends IService<DockingPreMetaAttr> { /*** * 构造器查询方式 * @param wrapper 查询封装器 * @return */ public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper); /*** * 根据viewModel查询模型视图属性 * @param viewModelId * @return */ List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId); } Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -43,6 +43,7 @@ */ @Autowired(required = false) private DockingPreAttrMappingMapper dockingPreAttrMappingMapper; /*** * 主数据分类服务 */ @@ -60,18 +61,17 @@ */ @Autowired(required = false) private IDockingPreMetaAttrService dockingPreMetaAttrService; /*** * 属性取值范围服务 */ @Autowired(required = false) private IDockingPreAttrRangeService dockingPreAttrRangeService; /*** * 集团分类视图模型服务 */ @Autowired(required = false) private IDockingPreViewModelService dockingPreViewModelService; /*** @@ -235,7 +235,6 @@ public R search(DokingAttributeSerchVO dokingAttributeSerchVO) { return null; } /*** * 对象转换 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreMetaAttrServiceImpl.java
@@ -38,7 +38,7 @@ */ @Override public List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId) { log.info("根据模型视图oid"+viewModelId+"查询数据 star"); log.info("根据模型视图oid"+viewModelId+"查询数据 start"); List<DockingPreMetaAttr> dockingPreMetaAttrList= selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,viewModelId)); List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList= DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList); log.info("根据模型视图oid"+viewModelId+"查询数据 end"); Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -19,6 +19,7 @@ import com.vci.ubcs.starter.web.util.VciBaseUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; @@ -182,6 +183,7 @@ writeValueAsString = mp.writeValueAsString(dataObject); dockingPreApplyForm.setContent(writeValueAsString); } catch (JsonProcessingException e) { throw new ServiceException("修改申请单数据时转换出错，原因"+e.getMessage()); } Date date = new Date(); dockingPreApplyForm.setLastModifyTime(date); @@ -202,6 +204,7 @@ writeValueAsString = mp.writeValueAsString(dataObject); dockingPreApplyForm.setContent(writeValueAsString); } catch (JsonProcessingException e) { throw new ServiceException("新增申请单数据时数据转换出错，原因"+e.getMessage()); } Date date = new Date(); dockingPreApplyForm.setCreateTime(date); @@ -402,12 +405,12 @@ } }); } else { Date date = new Date(); editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> { dockingPreApplyForm.setCode("2"); dockingPreApplyForm.setMsg("修改：" + msg); dockingPreApplyForm.setContent(""); dockingPreApplyForm.setGroupCode(""); Date date = new Date(); dockingPreApplyForm.setLastModifyTime(date); dockingPreApplyForm.setTs(date); dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount()); @@ -418,7 +421,6 @@ dockingPreApplyForm.setMsg("修改：" + msg); dockingPreApplyForm.setContent(""); dockingPreApplyForm.setGroupCode(""); Date date = new Date(); dockingPreApplyForm.setCreateTime(date); dockingPreApplyForm.setLastModifyTime(date); dockingPreApplyForm.setTs(date); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -85,7 +85,7 @@ @Service @Slf4j @VciWebservice(path = "/universalInterface") public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI { public class UniversalInterfaceImpl implements UniversalInterfaceI { /*** * 操作类型
