diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java index 6e7f9693e..3972782f9 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java @@ -13,7 +13,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication; * @author lmy */ @BladeCloudApplication -@SeataCloudApplication public class BasicApplication { public static void main(String[] args) { diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index 468f5acd7..bc3652dfc 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -13,7 +13,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication; */ @BladeCloudApplication -@SeataCloudApplication public class BasicDataApplication { public static void main(String[] args) { diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java index e07873f02..59ba9d2a6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java @@ -3456,6 +3456,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl stringObjectMap = BeanUtil.beanToMap(vo); - return Condition.getQueryWrapper(stringObjectMap, classz); + Map stringObjectMap = BeanUtil.beanToMap(vo, new LinkedHashMap<>(), true, false); + Map result = new LinkedHashMap<>(); + for (Map.Entry entry : stringObjectMap.entrySet()) { + String keyWithSuffix = entry.getKey() + "_equal"; + result.put(keyWithSuffix, entry.getValue()); + } + return Condition.getQueryWrapper(result, classz); } /** diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java index 2235cedc9..a8668fb2e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java @@ -27,7 +27,6 @@ import org.springblade.core.transaction.annotation.SeataCloudApplication; * @author Chill */ @BladeCloudApplication -@SeataCloudApplication public class WarehouseApplication { public static void main(String[] args) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/QuestDetailServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/QuestDetailServiceImpl.java index fd71cd44e..d9ab9308f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/QuestDetailServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/QuestDetailServiceImpl.java @@ -22,6 +22,7 @@ import com.logpm.warehouse.vo.QuestDetailVO; import com.logpm.warehouse.excel.QuestDetailExcel; import com.logpm.warehouse.mapper.QuestDetailMapper; import com.logpm.warehouse.service.IQuestDetailService; +import org.springblade.system.cache.DictBizCache; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -49,6 +50,7 @@ public class QuestDetailServiceImpl extends BaseServiceImpl { // questDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, QuestDetail.getType())); //}); + return questDetailList; }