Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
@@ -1,16 +1,19 @@ package com.vci.ubcs.starter.util; import com.alibaba.cloud.commons.lang.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.vci.ubcs.starter.web.util.VciBaseUtil; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; import java.util.HashMap; import java.util.Map; /** Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -248,8 +248,52 @@ }); } } public static MPJLambdaWrapper buildConditionByMapString(Map<String, String> query) { MPJLambdaWrapper<?>qw=new MPJLambdaWrapper<>(); if (!Func.isEmpty(query)) { query.forEach((k, v) -> { if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) { if (k.endsWith("_like")) { qw.like(getColumn(k, "_like"), v); } else if (k.endsWith("_notequal")) { qw.ne(getColumn(k, "_notequal"), v); } else if (k.endsWith("_likeleft")) { qw.likeLeft(getColumn(k, "_likeleft"), v); } else if (k.endsWith("_likeright")) { qw.likeRight(getColumn(k, "_likeright"), v); } else if (k.endsWith("_notlike")) { qw.notLike(getColumn(k, "_notlike"), v); } else if (k.endsWith("_ge")) { qw.ge(getColumn(k, "_ge"), v); } else if (k.endsWith("_le")) { qw.le(getColumn(k, "_le"), v); } else if (k.endsWith("_gt")) { qw.gt(getColumn(k, "_gt"), v); } else if (k.endsWith("_lt")) { qw.lt(getColumn(k, "_lt"), v); } else if (k.endsWith("_datege")) { qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss")); } else if (k.endsWith("_dategt")) { qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss")); } else if (k.endsWith("_dateequal")) { qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss")); } else if (k.endsWith("_datele")) { qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss")); } else if (k.endsWith("_datelt")) { qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss")); } else if (k.endsWith("_null")) { qw.isNull(getColumn(k, "_null")); } else if (k.endsWith("_notnull")) { qw.isNotNull(getColumn(k, "_notnull")); } else { qw.eq(getColumn(k, "_equal"), v); } } }); }; return qw; } public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) { if (!Func.isEmpty(query)) { query.forEach((k, v) -> { Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -240,12 +241,16 @@ /** * 集团/企业码段判断 * @param parameter 传入数据 ,classifyGroupCode:配置的中的分类顶节点,oid:选择节点的oid--,nowApplyCode:当前申请编码的分类 * @param classifyGroupCode 传入数据 ,classifyGroupCode:配置的中的分类顶节点 * @param oid 传入数据 ,选择节点的oid--,nowApplyCode:当前申请编码的分类 * @return 执行结果 */ @GetMapping("/checkGroupCode") @VciBusinessLog(operateName = "集团/企业码段判断") public R checkGroupCode(Map<String,String> parameter) throws Exception { return R.data(mdmEngineService.checkGroupCode(parameter)); public R checkGroupCode(String oid,String classifyGroupCode) throws Exception { Map<String,String> codtionMap=new HashMap<>(); codtionMap.put("oid",oid); codtionMap.put("classifyGroupCode",classifyGroupCode); return R.data(mdmEngineService.checkGroupCode(codtionMap)); } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -3697,7 +3697,7 @@ //使用业务类型查询 R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType()); if (!allAttributeByBtmId.isSuccess()) { throw new ServiceException("业务类型feign接口调用错误!"); throw new ServiceException("业务类型feign接口调用错误;"+allAttributeByBtmId.getMsg()); } if (Func.isEmpty(allAttributeByBtmId.getData())) { throw new VciBaseException("传入业务类型未查询到相应表单,请检查!");