From a42d08f6d8f40e1814d7a4f7c767d2cc608e14cc Mon Sep 17 00:00:00 2001 From: "SGK\\17962" <1796293269@qq.com> Date: Wed, 24 Sep 2025 16:29:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=A5=E9=94=80=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A1=86=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8C=89=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/market/modules/market-search.vue | 70 ++++++++++++++----- .../src/views/system/dept-transfer/index.vue | 4 +- .../service/impl/MpsMarketServiceImpl.java | 5 +- 3 files changed, 58 insertions(+), 21 deletions(-) diff --git a/cds-fontend-2025.V1/src/views/mps/market/modules/market-search.vue b/cds-fontend-2025.V1/src/views/mps/market/modules/market-search.vue index 4e6c60c..e1285a7 100644 --- a/cds-fontend-2025.V1/src/views/mps/market/modules/market-search.vue +++ b/cds-fontend-2025.V1/src/views/mps/market/modules/market-search.vue @@ -3,6 +3,8 @@ import { ref } from 'vue'; import { useNaiveForm } from '@/hooks/common/form'; import { $t } from '@/locales'; import {useDict} from "@/hooks/business/dict"; +import {fetchGetDeptTree} from "@/service/api/system"; +import {useLoading} from "~/packages/hooks"; defineOptions({ name: 'MarketSearch' @@ -33,9 +35,29 @@ const {options: mpsCheckStatusOptions} = useDict('mps_check_status'); const model = defineModel('model', { required: true }); +const {loading: deptLoading ,startLoading: startDeptLoading, endLoading: endDeptLoading } = useLoading(); +const deptData = ref([]); +async function getDeptData() { + startDeptLoading(); + const { data: tree, error } = await fetchGetDeptTree(); + if (!error) { + deptData.value = tree; + } + endDeptLoading(); +} +getDeptData(); + +const dateRangeCreateTime = ref<[string, string] | null>(null); +function onDateRangeCreateTimeUpdate(value: [string, string] | null) { + if (value?.length) { + model.value.params!.beginTime = `${value[0]} 00:00:00`; + model.value.params!.endTime = `${value[1]} 23:59:59`; + } +} async function reset() { Object.assign(model.value.params!, {}); + dateRangeCreateTime.value = null; await restoreValidation(); emit('reset'); } @@ -52,7 +74,7 @@ async function search() { - + --> - - - + + + - - - - - + + + + + + + - - - @@ -98,9 +132,9 @@ async function search() { - - - + + + diff --git a/cds-fontend-2025.V1/src/views/system/dept-transfer/index.vue b/cds-fontend-2025.V1/src/views/system/dept-transfer/index.vue index 585d5c8..55d28e5 100644 --- a/cds-fontend-2025.V1/src/views/system/dept-transfer/index.vue +++ b/cds-fontend-2025.V1/src/views/system/dept-transfer/index.vue @@ -220,7 +220,7 @@ async function getoperatorIdOptions() { getoperatorIdOptions(); const deptData = ref([]); -async function getTreeData() { +async function getDeptData() { startDeptLoading(); const { data: tree, error } = await fetchGetDeptTree(); if (!error) { @@ -229,7 +229,7 @@ async function getTreeData() { endDeptLoading(); } -getTreeData(); +getDeptData(); const { drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted } = useTableOperate(data, getData); diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java index 75ef2d6..2c151e3 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java @@ -22,6 +22,7 @@ import org.dromara.mps.domain.vo.MpsMagneticcardVo; import org.dromara.mps.domain.vo.MpsTrafficVo; import org.dromara.mps.mapper.MpsMagneticcardMapper; import org.dromara.mps.mapper.MpsTrafficMapper; +import org.dromara.system.domain.SysDeptTransfer; import org.springframework.stereotype.Service; import org.dromara.mps.domain.bo.MpsMarketBo; import org.dromara.mps.domain.vo.MpsMarketVo; @@ -137,7 +138,6 @@ public class MpsMarketServiceImpl implements IMpsMarketService { private LambdaQueryWrapper buildQueryWrapper(MpsMarketBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(MpsMarket::getDataId); lqw.eq(StringUtils.isNotBlank(bo.getSubcategoryId()), MpsMarket::getSubcategoryId, bo.getSubcategoryId()); lqw.like(StringUtils.isNotBlank(bo.getSubcategoryName()), MpsMarket::getSubcategoryName, bo.getSubcategoryName()); lqw.like(StringUtils.isNotBlank(bo.getYxName()), MpsMarket::getYxName, bo.getYxName()); @@ -164,6 +164,9 @@ public class MpsMarketServiceImpl implements IMpsMarketService { lqw.eq(StringUtils.isNotBlank(bo.getCheckUser()), MpsMarket::getCheckUser, bo.getCheckUser()); lqw.eq(StringUtils.isNotBlank(bo.getCheckType()), MpsMarket::getCheckType, bo.getCheckType()); lqw.eq(StringUtils.isNotBlank(bo.getCheckMsg()), MpsMarket::getCheckMsg, bo.getCheckMsg()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + MpsMarket::getDate, params.get("beginTime"), params.get("endTime")); + lqw.orderByDesc( MpsMarket::getDate); return lqw; }