供应商、服务客户、停车费配置

snowy-admin-web/src/views/biz/bizloadpoint/userIndex.vue

@@ -43,7 +43,6 @@
 	// 默认是关闭状态
 	const visible = ref(false)
 	const searchFormState = ref({})
-	const searchFormRef = ref()
 	const tableRef = ref()
 	const userFormRef = ref()
 	const recordData = ref()

snowy-admin-web/src/views/biz/bizprocess/nodeForm.vue

@@ -0,0 +1,80 @@
+<template>
+	<xn-form-container
+		:title="formData.id ? '编辑工序节点' : '增加工序节点'"
+		:width="700"
+		v-model:open="open"
+		:destroy-on-close="true"
+		@close="onClose"
+	>
+		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
+			<a-form-item label="工序id：" name="processId">
+				<a-input v-model:value="formData.processId" placeholder="请输入工序id" allow-clear />
+			</a-form-item>
+			<a-form-item label="节点名称：" name="nodeName">
+				<a-input v-model:value="formData.nodeName" placeholder="请输入节点名称" allow-clear />
+			</a-form-item>
+		</a-form>
+		<template #footer>
+			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
+		</template>
+	</xn-form-container>
+</template>
+
+<script setup name="bizProcessNodeForm">
+	import { cloneDeep } from 'lodash-es'
+	import { required } from '@/utils/formRules'
+	import bizProcessNodeApi from '@/api/biz/bizProcessNodeApi'
+	// 抽屉状态
+	const open = ref(false)
+	const emit = defineEmits({ successful: null })
+	const formRef = ref()
+	// 表单数据
+	const formData = ref({})
+	const submitLoading = ref(false)
+
+	//设置表单样式
+	const labelCol = ref({ span: 4})
+	const wrapperCol = ref({ span: 16})
+
+	// 打开抽屉
+	const onOpen = (record) => {
+		open.value = true
+		if (record) {
+			let recordData = cloneDeep(record)
+			formData.value = Object.assign({}, recordData)
+		}
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		formRef.value.resetFields()
+		formData.value = {}
+		open.value = false
+	}
+	// 默认要校验的
+	const formRules = {
+	}
+	// 验证并提交数据
+	const onSubmit = () => {
+		formRef.value
+			.validate()
+			.then(() => {
+				submitLoading.value = true
+				const formDataParam = cloneDeep(formData.value)
+				bizProcessNodeApi
+					.bizProcessNodeSubmitForm(formDataParam, formDataParam.id)
+					.then(() => {
+						onClose()
+						emit('successful')
+					})
+					.finally(() => {
+						submitLoading.value = false
+					})
+			})
+			.catch(() => {})
+	}
+	// 抛出函数
+	defineExpose({
+		onOpen
+	})
+</script>

snowy-admin-web/src/views/biz/bizprocess/nodeIndex.vue

@@ -0,0 +1,120 @@
+<template>
+	<a-card :bordered="false">
+		<s-table
+			ref="tableRef"
+			:columns="columns"
+			:data="loadData"
+			:alert="options.alert.show"
+			bordered
+			:row-key="(record) => record.id"
+			:tool-config="toolConfig"
+			:row-selection="options.rowSelection"
+		>
+			<template #operator class="table-operator">
+				<a-space>
+					<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizProcessNodeAdd')">
+						<template #icon><plus-outlined /></template>
+						新增
+					</a-button>
+					<xn-batch-button
+						v-if="hasPerm('bizProcessNodeBatchDelete')"
+						buttonName="批量删除"
+                        icon="DeleteOutlined"
+						:selectedRowKeys="selectedRowKeys"
+						@batchCallBack="deleteBatchBizProcessNode"
+					/>
+				</a-space>
+			</template>
+			<template #bodyCell="{ column, record }">
+				<template v-if="column.dataIndex === 'action'">
+					<a-space>
+						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizProcessNodeEdit')">编辑</a>
+						<a-divider type="vertical" v-if="hasPerm(['bizProcessNodeEdit', 'bizProcessNodeDelete'], 'and')" />
+						<a-popconfirm title="确定要删除吗？" @confirm="deleteBizProcessNode(record)">
+							<a-button type="link" danger size="small" v-if="hasPerm('bizProcessNodeDelete')">删除</a-button>
+						</a-popconfirm>
+					</a-space>
+				</template>
+			</template>
+		</s-table>
+	</a-card>
+	<Form ref="formRef" @successful="tableRef.refresh()" />
+</template>
+
+<script setup name="bizprocessnode">
+	import { cloneDeep } from 'lodash-es'
+	import Form from './form.vue'
+	import bizProcessNodeApi from '@/api/biz/bizProcessNodeApi'
+	const tableRef = ref()
+	const formRef = ref()
+	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
+	const columns = [
+		{
+			title: '序号',
+			width: 50,
+			dataIndex: 'serial',
+			align:'center'
+		},
+		{
+			title: '节点名称',
+			dataIndex: 'nodeName'
+		},
+		{
+			title: '创建时间',
+			dataIndex: 'createTime',
+			align: 'center'
+		},
+	]
+	// 操作栏通过权限判断是否显示
+	if (hasPerm(['bizProcessNodeEdit', 'bizProcessNodeDelete'])) {
+		columns.push({
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 150
+		})
+	}
+	const selectedRowKeys = ref([])
+	// 列表选择配置
+	const options = {
+		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
+		alert: {
+			show: true,
+			clear: () => {
+				selectedRowKeys.value = ref([])
+			}
+		},
+		rowSelection: {
+			onChange: (selectedRowKey, selectedRows) => {
+				selectedRowKeys.value = selectedRowKey
+			}
+		}
+	}
+	const loadData = (parameter) => {
+		return bizProcessNodeApi.bizProcessNodePage(parameter).then((data) => {
+			return data
+		})
+	}
+	// 重置
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		tableRef.value.refresh(true)
+	}
+	// 删除
+	const deleteBizProcessNode = (record) => {
+		let params = [
+			{
+				id: record.id
+			}
+		]
+		bizProcessNodeApi.bizProcessNodeDelete(params).then(() => {
+			tableRef.value.refresh(true)
+		})
+	}
+	// 批量删除
+	const deleteBatchBizProcessNode = (params) => {
+		bizProcessNodeApi.bizProcessNodeDelete(params).then(() => {
+			tableRef.value.clearRefreshSelected()
+		})
+	}
+</script>

snowy-admin-web/src/views/biz/bizservicecustomer/accountIndex.vue

@@ -25,7 +25,10 @@
 					/>
 				</a-space>
 			</template>
-			<template #bodyCell="{ column, record }">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizServiceCustomerAccountEdit')">编辑</a>

snowy-admin-web/src/views/biz/bizservicecustomer/flowIndex.vue

@@ -25,7 +25,10 @@
 					/>
 				</a-space>
 			</template>
-			<template #bodyCell="{ column, record }">
+			<template #bodyCell="{ column, record, index }">
+				<template v-if="column.dataIndex === 'serial'">
+					{{ index + 1 }}
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
 						<a @click="formRef.onOpen(record)" v-if="hasPerm('bizServiceCustomerFlowEdit')">编辑</a>

snowy-admin-web/src/views/biz/bizsupplier/accountForm.vue

@@ -35,8 +35,9 @@
 	const wrapperCol = ref({ span: 16})
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, supplierId) => {
 		open.value = true
+		formData.value.supplierId = supplierId
 		if (record) {
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
@@ -50,6 +51,7 @@
 	}
 	// 默认要校验的
 	const formRules = {
+		supplierAccount: [required('请输入供货商账号')],
 	}
 	// 验证并提交数据
 	const onSubmit = () => {

snowy-admin-web/src/views/biz/bizsupplier/accountIndex.vue

@@ -10,15 +10,18 @@
 			>
 				<template #operator class="table-operator">
 					<a-space>
-						<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierAccountAdd')">
+						<a-button type="primary" @click="formRef.onOpen(null, supplierId)" v-if="hasPerm('bizSupplierAccountAdd')">
 							<template #icon><plus-outlined /></template> 新增
 						</a-button>
 					</a-space>
 				</template>
-				<template #bodyCell="{ column, record }">
+				<template #bodyCell="{ column, record, index }">
+					<template v-if="column.dataIndex === 'serial'">
+						{{ index + 1 }}
+					</template>
 					<template v-if="column.dataIndex === 'action'">
 						<a-space>
-							<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierAccountEdit')">编辑</a>
+							<a @click="formRef.onOpen(record, supplierId)" v-if="hasPerm('bizSupplierAccountEdit')">编辑</a>
 							<a-divider type="vertical" v-if="hasPerm(['bizSupplierAccountEdit', 'bizSupplierAccountDelete'], 'and')" />
 							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierAccountDelete')" @click="deleteConfig(record)">删除</a-button>
 						</a-space>
@@ -48,6 +51,7 @@
 	const formRef = ref()
 	const recordData = ref()
 	const title = ref()
+	const supplierId = ref()
 
 	const columns = [
 		{
@@ -83,6 +87,7 @@
 		searchFormState.value = {
 			supplierId: record.id
 		}
+		supplierId.value = record.id
 		visible.value = true
 	}
 	const loadData = (parameter) => {

snowy-admin-web/src/views/biz/bizsupplier/form.vue

@@ -20,7 +20,12 @@
 				<a-input v-model:value="formData.supplierPhone" placeholder="请输入手机号" allow-clear />
 			</a-form-item>
 			<a-form-item label="备注：" name="supplierRemark">
-				<a-input v-model:value="formData.supplierRemark" placeholder="请输入备注" allow-clear />
+				<a-textarea
+					v-model:value="formData.supplierRemark"
+					placeholder="请输入备注"
+					allow-clear 
+					:auto-size="{ minRows: 3, maxRows: 6 }"
+				/>
 			</a-form-item>
 		</a-form>
 		<template #footer>

snowy-admin-web/src/views/biz/bizsupplier/transportForm.vue

@@ -7,8 +7,12 @@
 		@close="onClose"
 	>
 		<a-form ref="formRef" :model="formData" :rules="formRules" :wrapper-col="wrapperCol" :label-col="labelCol">
-			<a-form-item label="运输类型  1：汽运  2：船运：  3通用" name="transportType">
-				<a-input v-model:value="formData.transportType" placeholder="请输入运输类型" allow-clear />
+			<a-form-item label="运输类型：" name="transportType">
+				<a-radio-group button-style="solid" v-model:value="formData.transportType">
+					<a-radio-button v-for="transportItem in transportTypeOptions" :key="transportItem.value" :value="transportItem.value" >
+						{{ transportItem.label }}
+					</a-radio-button>
+				</a-radio-group>
 			</a-form-item>
 			<a-form-item label="运输号：" name="transportNo">
 				<a-input v-model:value="formData.transportNo" placeholder="请输入车牌号或者船舶号" allow-clear />
@@ -25,6 +29,8 @@
 	import { cloneDeep } from 'lodash-es'
 	import { required } from '@/utils/formRules'
 	import bizSupplierTransportApi from '@/api/biz/bizSupplierTransportApi'
+	import tool from '@/utils/tool'
+
 	// 抽屉状态
 	const open = ref(false)
 	const emit = defineEmits({ successful: null })
@@ -36,10 +42,14 @@
 	//设置表单样式
 	const labelCol = ref({ span: 4})
 	const wrapperCol = ref({ span: 16})
+	
+	// 运输方式
+	const transportTypeOptions = tool.dictList('transport_type')
 
 	// 打开抽屉
-	const onOpen = (record) => {
+	const onOpen = (record, supplierId) => {
 		open.value = true
+		formData.value.supplierId = supplierId
 		if (record) {
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
@@ -53,6 +63,8 @@
 	}
 	// 默认要校验的
 	const formRules = {
+		transportType: [required('请选择运输类型')],
+		transportNo: [required('请输入运输号')],
 	}
 	// 验证并提交数据
 	const onSubmit = () => {

snowy-admin-web/src/views/biz/bizsupplier/transportIndex.vue

@@ -10,16 +10,22 @@
 			>
 				<template #operator class="table-operator">
 					<a-space>
-						<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('bizSupplierTransportAdd')">
+						<a-button type="primary" @click="formRef.onOpen(null, supplierId)" v-if="hasPerm('bizSupplierTransportAdd')">
 							<template #icon><plus-outlined /></template>
 							新增
 						</a-button>
 					</a-space>
 				</template>
-				<template #bodyCell="{ column, record }">
+				<template #bodyCell="{ column, record, index }">
+					<template v-if="column.dataIndex === 'serial'">
+						{{ index + 1 }}
+					</template>
+					<template v-if="column.dataIndex === 'transportType'">
+						{{ $TOOL.dictTypeData('transport_type', record.transportType) }}
+					</template>
 					<template v-if="column.dataIndex === 'action'">
 						<a-space>
-							<a @click="formRef.onOpen(record)" v-if="hasPerm('bizSupplierTransportEdit')">编辑</a>
+							<a @click="formRef.onOpen(record, supplierId)" v-if="hasPerm('bizSupplierTransportEdit')">编辑</a>
 							<a-divider type="vertical" v-if="hasPerm(['bizSupplierTransportEdit', 'bizSupplierTransportDelete'], 'and')" />
 							<a-button type="link" danger size="small" v-if="hasPerm('bizSupplierTransportDelete')" @click="deleteConfig(record)">删除</a-button>
 						</a-space>
@@ -48,6 +54,7 @@
 	const formRef = ref()
 	const recordData = ref()
 	const title = ref()
+	const supplierId = ref()
 	
 	const columns = [
 		{
@@ -57,7 +64,7 @@
 			align:'center'
 		},
 		{
-			title: '运输类型  1：汽运  2：船运',
+			title: '运输类型',
 			dataIndex: 'transportType',
 			align: 'center',
 		},
@@ -88,6 +95,7 @@
 		searchFormState.value = {
 			supplierId: record.id
 		}
+		supplierId.value = record.id
 		visible.value = true
 	}
 	const loadData = (parameter) => {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadpoint/controller/BizLoadPointController.java

@@ -127,7 +127,7 @@ public class BizLoadPointController {
      */
     @Operation(summary = "获取装货点位列表")
     @GetMapping("/biz/bizloadpoint/getList")
-    public CommonResult<List<BizLoadPoint>> getList() {
-        return CommonResult.data(bizLoadPointService.getList());
+    public CommonResult<List<BizLoadPoint>> getList(BizLoadPointPageParam bizLoadPointPageParam) {
+        return CommonResult.data(bizLoadPointService.getList(bizLoadPointPageParam));
     }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadpoint/service/BizLoadPointService.java

@@ -81,5 +81,5 @@ public interface BizLoadPointService extends IService<BizLoadPoint> {
     /**
      * 查询所有点位信息
      */
-    List<BizLoadPoint> getList();
+    List<BizLoadPoint> getList(BizLoadPointPageParam bizLoadPointPageParam);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizloadpoint/service/impl/BizLoadPointServiceImpl.java

@@ -50,6 +50,7 @@ public class BizLoadPointServiceImpl extends ServiceImpl<BizLoadPointMapper, Biz
         if(ObjectUtil.isNotEmpty(bizLoadPointPageParam.getLoadPoint())) {
             queryWrapper.lambda().like(BizLoadPoint::getLoadPoint, bizLoadPointPageParam.getLoadPoint());
         }
+        queryWrapper.lambda().eq(BizLoadPoint::getDeleteFlag, "NOT_DELETE");
         if(ObjectUtil.isAllNotEmpty(bizLoadPointPageParam.getSortField(), bizLoadPointPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizLoadPointPageParam.getSortOrder());
             queryWrapper.orderBy(true, bizLoadPointPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
@@ -97,7 +98,13 @@ public class BizLoadPointServiceImpl extends ServiceImpl<BizLoadPointMapper, Biz
     }
 
     @Override
-    public List<BizLoadPoint> getList() {
-        return this.list();
+    public List<BizLoadPoint> getList(BizLoadPointPageParam bizLoadPointPageParam) {
+        QueryWrapper<BizLoadPoint> queryWrapper = new QueryWrapper<BizLoadPoint>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizLoadPointPageParam.getLoadPoint())) {
+            queryWrapper.lambda().like(BizLoadPoint::getLoadPoint, bizLoadPointPageParam.getLoadPoint());
+        }
+        queryWrapper.lambda().eq(BizLoadPoint::getDeleteFlag, "NOT_DELETE");
+        queryWrapper.lambda().orderByDesc(BizLoadPoint::getCreateTime);
+        return this.list(queryWrapper);
     }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizparkconfig/controller/BizParkConfigController.java

@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.biz.modular.bizloadpoint.entity.BizLoadPoint;
+import vip.xiaonuo.biz.modular.bizloadpoint.param.BizLoadPointPageParam;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.biz.modular.bizparkconfig.entity.BizParkConfig;
@@ -56,7 +58,6 @@ public class BizParkConfigController {
      * @date  2025/05/29 15:14
      */
     @Operation(summary = "获取停车费配置分页")
-    @SaCheckPermission("/biz/bizparkconfig/page")
     @GetMapping("/biz/bizparkconfig/page")
     public CommonResult<Page<BizParkConfig>> page(BizParkConfigPageParam bizParkConfigPageParam) {
         return CommonResult.data(bizParkConfigService.page(bizParkConfigPageParam));
@@ -70,6 +71,7 @@ public class BizParkConfigController {
      */
     @Operation(summary = "添加停车费配置")
     @CommonLog("添加停车费配置")
+    @SaCheckPermission("/biz/bizparkconfig/add")
     @PostMapping("/biz/bizparkconfig/add")
     public CommonResult<String> add(@RequestBody @Valid BizParkConfigAddParam bizParkConfigAddParam) {
         bizParkConfigService.add(bizParkConfigAddParam);
@@ -84,6 +86,7 @@ public class BizParkConfigController {
      */
     @Operation(summary = "编辑停车费配置")
     @CommonLog("编辑停车费配置")
+    @SaCheckPermission("/biz/bizparkconfig/edit")
     @PostMapping("/biz/bizparkconfig/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizParkConfigEditParam bizParkConfigEditParam) {
         bizParkConfigService.edit(bizParkConfigEditParam);
@@ -98,6 +101,7 @@ public class BizParkConfigController {
      */
     @Operation(summary = "删除停车费配置")
     @CommonLog("删除停车费配置")
+    @SaCheckPermission("/biz/bizparkconfig/delete")
     @PostMapping("/biz/bizparkconfig/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizParkConfigIdParam> bizParkConfigIdParamList) {
@@ -116,4 +120,16 @@ public class BizParkConfigController {
     public CommonResult<BizParkConfig> detail(@Valid BizParkConfigIdParam bizParkConfigIdParam) {
         return CommonResult.data(bizParkConfigService.detail(bizParkConfigIdParam));
     }
+
+    /**
+     * 获取停车费配置列表
+     *
+     * @author sandy
+     * @date  2025/06/03 15:11
+     */
+    @Operation(summary = "获取停车费配置列表")
+    @GetMapping("/biz/bizparkconfig/getList")
+    public CommonResult<List<BizParkConfig>> getList(BizParkConfigPageParam bizParkConfigPageParam) {
+        return CommonResult.data(bizParkConfigService.getList(bizParkConfigPageParam));
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizparkconfig/param/BizParkConfigPageParam.java

@@ -48,4 +48,8 @@ public class BizParkConfigPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 预约类型 */
+    @Schema(description = "预约类型")
+    private String appointmentType;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizparkconfig/service/BizParkConfigService.java

@@ -14,6 +14,8 @@ package vip.xiaonuo.biz.modular.bizparkconfig.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.biz.modular.bizloadpoint.entity.BizLoadPoint;
+import vip.xiaonuo.biz.modular.bizloadpoint.param.BizLoadPointPageParam;
 import vip.xiaonuo.biz.modular.bizparkconfig.entity.BizParkConfig;
 import vip.xiaonuo.biz.modular.bizparkconfig.param.BizParkConfigAddParam;
 import vip.xiaonuo.biz.modular.bizparkconfig.param.BizParkConfigEditParam;
@@ -77,4 +79,9 @@ public interface BizParkConfigService extends IService<BizParkConfig> {
      * @date  2025/05/29 15:14
      **/
     BizParkConfig queryEntity(String id);
+
+    /**
+     * 获取停车费配置列表
+     */
+    List<BizParkConfig> getList(BizParkConfigPageParam bizParkConfigPageParam);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizparkconfig/service/impl/BizParkConfigServiceImpl.java

@@ -21,6 +21,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.bizloadpoint.entity.BizLoadPoint;
+import vip.xiaonuo.biz.modular.bizloadpoint.param.BizLoadPointPageParam;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplier;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -46,6 +49,10 @@ public class BizParkConfigServiceImpl extends ServiceImpl<BizParkConfigMapper, B
     @Override
     public Page<BizParkConfig> page(BizParkConfigPageParam bizParkConfigPageParam) {
         QueryWrapper<BizParkConfig> queryWrapper = new QueryWrapper<BizParkConfig>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizParkConfigPageParam.getAppointmentType())) {
+            queryWrapper.lambda().like(BizParkConfig::getAppointmentType, bizParkConfigPageParam.getAppointmentType());
+        }
+        queryWrapper.lambda().eq(BizParkConfig::getDeleteFlag, "NOT_DELETE");
         if(ObjectUtil.isAllNotEmpty(bizParkConfigPageParam.getSortField(), bizParkConfigPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizParkConfigPageParam.getSortOrder());
             queryWrapper.orderBy(true, bizParkConfigPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
@@ -91,4 +98,15 @@ public class BizParkConfigServiceImpl extends ServiceImpl<BizParkConfigMapper, B
         }
         return bizParkConfig;
     }
+
+    @Override
+    public List<BizParkConfig> getList(BizParkConfigPageParam bizParkConfigPageParam) {
+        QueryWrapper<BizParkConfig> queryWrapper = new QueryWrapper<BizParkConfig>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizParkConfigPageParam.getAppointmentType())) {
+            queryWrapper.lambda().like(BizParkConfig::getAppointmentType, bizParkConfigPageParam.getAppointmentType());
+        }
+        queryWrapper.lambda().eq(BizParkConfig::getDeleteFlag, "NOT_DELETE");
+        queryWrapper.lambda().orderByAsc(BizParkConfig::getId);
+        return this.list(queryWrapper);
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizprocess/controller/BizProcessController.java

@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.biz.modular.bizparkconfig.entity.BizParkConfig;
+import vip.xiaonuo.biz.modular.bizparkconfig.param.BizParkConfigPageParam;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.biz.modular.bizprocess.entity.BizProcess;
@@ -116,4 +118,16 @@ public class BizProcessController {
     public CommonResult<BizProcess> detail(@Valid BizProcessIdParam bizProcessIdParam) {
         return CommonResult.data(bizProcessService.detail(bizProcessIdParam));
     }
+
+    /**
+     * 获取停车费配置列表
+     *
+     * @author sandy
+     * @date  2025/06/03 15:11
+     */
+    @Operation(summary = "获取生产工序列表")
+    @GetMapping("/biz/bizprocess/getList")
+    public CommonResult<List<BizProcess>> getList(BizProcessPageParam bizProcessPageParam) {
+        return CommonResult.data(bizProcessService.getList(bizProcessPageParam));
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizprocess/param/BizProcessPageParam.java

@@ -48,4 +48,8 @@ public class BizProcessPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 工序名称 */
+    @Schema(description = "工序名称")
+    private String processName;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizprocess/service/BizProcessService.java

@@ -14,6 +14,8 @@ package vip.xiaonuo.biz.modular.bizprocess.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.biz.modular.bizloadpoint.entity.BizLoadPoint;
+import vip.xiaonuo.biz.modular.bizloadpoint.param.BizLoadPointPageParam;
 import vip.xiaonuo.biz.modular.bizprocess.entity.BizProcess;
 import vip.xiaonuo.biz.modular.bizprocess.param.BizProcessAddParam;
 import vip.xiaonuo.biz.modular.bizprocess.param.BizProcessEditParam;
@@ -77,4 +79,9 @@ public interface BizProcessService extends IService<BizProcess> {
      * @date  2025/05/29 15:09
      **/
     BizProcess queryEntity(String id);
+
+    /**
+     * 查询所有点位信息
+     */
+    List<BizProcess> getList(BizProcessPageParam bizProcessPageParam);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizprocess/service/impl/BizProcessServiceImpl.java

@@ -21,6 +21,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.bizloadpoint.entity.BizLoadPoint;
+import vip.xiaonuo.biz.modular.bizparkconfig.entity.BizParkConfig;
+import vip.xiaonuo.biz.modular.bizparkconfig.param.BizParkConfigPageParam;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -46,6 +49,9 @@ public class BizProcessServiceImpl extends ServiceImpl<BizProcessMapper, BizProc
     @Override
     public Page<BizProcess> page(BizProcessPageParam bizProcessPageParam) {
         QueryWrapper<BizProcess> queryWrapper = new QueryWrapper<BizProcess>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizProcessPageParam.getProcessName())) {
+            queryWrapper.lambda().like(BizProcess::getProcessName, bizProcessPageParam.getProcessName());
+        }
         if(ObjectUtil.isAllNotEmpty(bizProcessPageParam.getSortField(), bizProcessPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizProcessPageParam.getSortOrder());
             queryWrapper.orderBy(true, bizProcessPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
@@ -91,4 +97,14 @@ public class BizProcessServiceImpl extends ServiceImpl<BizProcessMapper, BizProc
         }
         return bizProcess;
     }
+
+    @Override
+    public List<BizProcess> getList(BizProcessPageParam bizProcessPageParam) {
+        QueryWrapper<BizProcess> queryWrapper = new QueryWrapper<BizProcess>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizProcessPageParam.getProcessName())) {
+            queryWrapper.lambda().like(BizProcess::getProcessName, bizProcessPageParam.getProcessName());
+        }
+        queryWrapper.lambda().orderByAsc(BizProcess::getId);
+        return this.list(queryWrapper);
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerAccountController.java

@@ -56,7 +56,6 @@ public class BizServiceCustomerAccountController {
      * @date  2025/05/29 14:39
      */
     @Operation(summary = "获取服务客户账号管理分页")
-    @SaCheckPermission("/biz/bizservicecustomeraccount/page")
     @GetMapping("/biz/bizservicecustomeraccount/page")
     public CommonResult<Page<BizServiceCustomerAccount>> page(BizServiceCustomerAccountPageParam bizServiceCustomerAccountPageParam) {
         return CommonResult.data(bizServiceCustomerAccountService.page(bizServiceCustomerAccountPageParam));
@@ -70,6 +69,7 @@ public class BizServiceCustomerAccountController {
      */
     @Operation(summary = "添加服务客户账号管理")
     @CommonLog("添加服务客户账号管理")
+    @SaCheckPermission("/biz/bizservicecustomeraccount/add")
     @PostMapping("/biz/bizservicecustomeraccount/add")
     public CommonResult<String> add(@RequestBody @Valid BizServiceCustomerAccountAddParam bizServiceCustomerAccountAddParam) {
         bizServiceCustomerAccountService.add(bizServiceCustomerAccountAddParam);
@@ -84,6 +84,7 @@ public class BizServiceCustomerAccountController {
      */
     @Operation(summary = "编辑服务客户账号管理")
     @CommonLog("编辑服务客户账号管理")
+    @SaCheckPermission("/biz/bizservicecustomeraccount/edit")
     @PostMapping("/biz/bizservicecustomeraccount/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizServiceCustomerAccountEditParam bizServiceCustomerAccountEditParam) {
         bizServiceCustomerAccountService.edit(bizServiceCustomerAccountEditParam);
@@ -98,6 +99,7 @@ public class BizServiceCustomerAccountController {
      */
     @Operation(summary = "删除服务客户账号管理")
     @CommonLog("删除服务客户账号管理")
+    @SaCheckPermission("/biz/bizservicecustomeraccount/delete")
     @PostMapping("/biz/bizservicecustomeraccount/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizServiceCustomerAccountIdParam> bizServiceCustomerAccountIdParamList) {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerController.java

@@ -56,7 +56,6 @@ public class BizServiceCustomerController {
      * @date  2025/05/29 14:27
      */
     @Operation(summary = "获取服务客户管理分页")
-    @SaCheckPermission("/biz/bizservicecustomer/page")
     @GetMapping("/biz/bizservicecustomer/page")
     public CommonResult<Page<BizServiceCustomer>> page(BizServiceCustomerPageParam bizServiceCustomerPageParam) {
         return CommonResult.data(bizServiceCustomerService.page(bizServiceCustomerPageParam));
@@ -70,6 +69,7 @@ public class BizServiceCustomerController {
      */
     @Operation(summary = "添加服务客户管理")
     @CommonLog("添加服务客户管理")
+    @SaCheckPermission("/biz/bizservicecustomer/add")
     @PostMapping("/biz/bizservicecustomer/add")
     public CommonResult<String> add(@RequestBody @Valid BizServiceCustomerAddParam bizServiceCustomerAddParam) {
         bizServiceCustomerService.add(bizServiceCustomerAddParam);
@@ -84,6 +84,7 @@ public class BizServiceCustomerController {
      */
     @Operation(summary = "编辑服务客户管理")
     @CommonLog("编辑服务客户管理")
+    @SaCheckPermission("/biz/bizservicecustomer/edit")
     @PostMapping("/biz/bizservicecustomer/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizServiceCustomerEditParam bizServiceCustomerEditParam) {
         bizServiceCustomerService.edit(bizServiceCustomerEditParam);
@@ -98,6 +99,7 @@ public class BizServiceCustomerController {
      */
     @Operation(summary = "删除服务客户管理")
     @CommonLog("删除服务客户管理")
+    @SaCheckPermission("/biz/bizservicecustomer/delete")
     @PostMapping("/biz/bizservicecustomer/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizServiceCustomerIdParam> bizServiceCustomerIdParamList) {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizservicecustomer/controller/BizServiceCustomerFlowController.java

@@ -56,7 +56,6 @@ public class BizServiceCustomerFlowController {
      * @date  2025/05/29 14:40
      */
     @Operation(summary = "获取服务客户资金流水分页")
-    @SaCheckPermission("/biz/bizservicecustomerflow/page")
     @GetMapping("/biz/bizservicecustomerflow/page")
     public CommonResult<Page<BizServiceCustomerFlow>> page(BizServiceCustomerFlowPageParam bizServiceCustomerFlowPageParam) {
         return CommonResult.data(bizServiceCustomerFlowService.page(bizServiceCustomerFlowPageParam));
@@ -70,6 +69,7 @@ public class BizServiceCustomerFlowController {
      */
     @Operation(summary = "添加服务客户资金流水")
     @CommonLog("添加服务客户资金流水")
+    @SaCheckPermission("/biz/bizservicecustomerflow/add")
     @PostMapping("/biz/bizservicecustomerflow/add")
     public CommonResult<String> add(@RequestBody @Valid BizServiceCustomerFlowAddParam bizServiceCustomerFlowAddParam) {
         bizServiceCustomerFlowService.add(bizServiceCustomerFlowAddParam);
@@ -84,6 +84,7 @@ public class BizServiceCustomerFlowController {
      */
     @Operation(summary = "编辑服务客户资金流水")
     @CommonLog("编辑服务客户资金流水")
+    @SaCheckPermission("/biz/bizservicecustomerflow/edit")
     @PostMapping("/biz/bizservicecustomerflow/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizServiceCustomerFlowEditParam bizServiceCustomerFlowEditParam) {
         bizServiceCustomerFlowService.edit(bizServiceCustomerFlowEditParam);
@@ -98,6 +99,7 @@ public class BizServiceCustomerFlowController {
      */
     @Operation(summary = "删除服务客户资金流水")
     @CommonLog("删除服务客户资金流水")
+    @SaCheckPermission("/biz/bizservicecustomerflow/delete")
     @PostMapping("/biz/bizservicecustomerflow/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizServiceCustomerFlowIdParam> bizServiceCustomerFlowIdParamList) {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierAccountController.java

@@ -56,7 +56,6 @@ public class BizSupplierAccountController {
      * @date  2025/05/29 14:47
      */
     @Operation(summary = "获取供应商账号信息分页")
-    @SaCheckPermission("/biz/bizsupplieraccount/page")
     @GetMapping("/biz/bizsupplieraccount/page")
     public CommonResult<Page<BizSupplierAccount>> page(BizSupplierAccountPageParam bizSupplierAccountPageParam) {
         return CommonResult.data(bizSupplierAccountService.page(bizSupplierAccountPageParam));
@@ -70,6 +69,7 @@ public class BizSupplierAccountController {
      */
     @Operation(summary = "添加供应商账号信息")
     @CommonLog("添加供应商账号信息")
+    @SaCheckPermission("/biz/bizsupplieraccount/add")
     @PostMapping("/biz/bizsupplieraccount/add")
     public CommonResult<String> add(@RequestBody @Valid BizSupplierAccountAddParam bizSupplierAccountAddParam) {
         bizSupplierAccountService.add(bizSupplierAccountAddParam);
@@ -84,6 +84,7 @@ public class BizSupplierAccountController {
      */
     @Operation(summary = "编辑供应商账号信息")
     @CommonLog("编辑供应商账号信息")
+    @SaCheckPermission("/biz/bizsupplieraccount/edit")
     @PostMapping("/biz/bizsupplieraccount/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizSupplierAccountEditParam bizSupplierAccountEditParam) {
         bizSupplierAccountService.edit(bizSupplierAccountEditParam);
@@ -98,6 +99,7 @@ public class BizSupplierAccountController {
      */
     @Operation(summary = "删除供应商账号信息")
     @CommonLog("删除供应商账号信息")
+    @SaCheckPermission("/biz/bizsupplieraccount/delete")
     @PostMapping("/biz/bizsupplieraccount/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizSupplierAccountIdParam> bizSupplierAccountIdParamList) {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierController.java

@@ -70,6 +70,7 @@ public class BizSupplierController {
      */
     @Operation(summary = "添加供货商")
     @CommonLog("添加供货商")
+    @SaCheckPermission("/biz/bizsupplier/add")
     @PostMapping("/biz/bizsupplier/add")
     public CommonResult<String> add(@RequestBody @Valid BizSupplierAddParam bizSupplierAddParam) {
         bizSupplierService.add(bizSupplierAddParam);
@@ -84,6 +85,7 @@ public class BizSupplierController {
      */
     @Operation(summary = "编辑供货商")
     @CommonLog("编辑供货商")
+    @SaCheckPermission("/biz/bizsupplier/edit")
     @PostMapping("/biz/bizsupplier/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizSupplierEditParam bizSupplierEditParam) {
         bizSupplierService.edit(bizSupplierEditParam);
@@ -98,6 +100,7 @@ public class BizSupplierController {
      */
     @Operation(summary = "删除供货商")
     @CommonLog("删除供货商")
+    @SaCheckPermission("/biz/bizsupplier/delete")
     @PostMapping("/biz/bizsupplier/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizSupplierIdParam> bizSupplierIdParamList) {
@@ -122,7 +125,7 @@ public class BizSupplierController {
      */
     @Operation(summary = "获取供货商列表")
     @GetMapping("/biz/bizsupplier/getList")
-    public CommonResult<List<BizSupplier>> getList() {
-        return CommonResult.data(bizSupplierService.getList());
+    public CommonResult<List<BizSupplier>> getList(BizSupplierPageParam bizSupplierPageParam) {
+        return CommonResult.data(bizSupplierService.getList(bizSupplierPageParam));
     }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/controller/BizSupplierTransportController.java

@@ -56,7 +56,6 @@ public class BizSupplierTransportController {
      * @date  2025/05/29 14:47
      */
     @Operation(summary = "获取供应商运输管理分页")
-    @SaCheckPermission("/biz/bizsuppliertransport/page")
     @GetMapping("/biz/bizsuppliertransport/page")
     public CommonResult<Page<BizSupplierTransport>> page(BizSupplierTransportPageParam bizSupplierTransportPageParam) {
         return CommonResult.data(bizSupplierTransportService.page(bizSupplierTransportPageParam));
@@ -70,6 +69,7 @@ public class BizSupplierTransportController {
      */
     @Operation(summary = "添加供应商运输管理")
     @CommonLog("添加供应商运输管理")
+    @SaCheckPermission("/biz/bizsuppliertransport/add")
     @PostMapping("/biz/bizsuppliertransport/add")
     public CommonResult<String> add(@RequestBody @Valid BizSupplierTransportAddParam bizSupplierTransportAddParam) {
         bizSupplierTransportService.add(bizSupplierTransportAddParam);
@@ -84,6 +84,7 @@ public class BizSupplierTransportController {
      */
     @Operation(summary = "编辑供应商运输管理")
     @CommonLog("编辑供应商运输管理")
+    @SaCheckPermission("/biz/bizsuppliertransport/edit")
     @PostMapping("/biz/bizsuppliertransport/edit")
     public CommonResult<String> edit(@RequestBody @Valid BizSupplierTransportEditParam bizSupplierTransportEditParam) {
         bizSupplierTransportService.edit(bizSupplierTransportEditParam);
@@ -98,6 +99,7 @@ public class BizSupplierTransportController {
      */
     @Operation(summary = "删除供应商运输管理")
     @CommonLog("删除供应商运输管理")
+    @SaCheckPermission("/biz/bizsuppliertransport/delete")
     @PostMapping("/biz/bizsuppliertransport/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    List<BizSupplierTransportIdParam> bizSupplierTransportIdParamList) {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierAccountPageParam.java

@@ -46,4 +46,8 @@ public class BizSupplierAccountPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 供应商ID */
+    @Schema(description = "供应商ID")
+    private String supplierId;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/param/BizSupplierTransportPageParam.java

@@ -46,4 +46,8 @@ public class BizSupplierTransportPageParam {
     @Schema(description = "关键词")
     private String searchKey;
 
+    /** 供应商ID */
+    @Schema(description = "供应商ID")
+    private String supplierId;
+
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/BizSupplierService.java

@@ -81,5 +81,5 @@ public interface BizSupplierService extends IService<BizSupplier> {
     /**
      * 获取供应商列表
      */
-    List<BizSupplier> getList();
+    List<BizSupplier> getList(BizSupplierPageParam bizSupplierPageParam);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierAccountServiceImpl.java

@@ -21,6 +21,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.bizloadpoint.entity.BizLoadPoint;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplier;
+import vip.xiaonuo.biz.modular.customer.entity.BizCustomer;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -46,12 +49,16 @@ public class BizSupplierAccountServiceImpl extends ServiceImpl<BizSupplierAccoun
     @Override
     public Page<BizSupplierAccount> page(BizSupplierAccountPageParam bizSupplierAccountPageParam) {
         QueryWrapper<BizSupplierAccount> queryWrapper = new QueryWrapper<BizSupplierAccount>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizSupplierAccountPageParam.getSupplierId())){
+            queryWrapper.lambda().like(BizSupplierAccount::getSupplierId,bizSupplierAccountPageParam.getSupplierId());
+        }
+        queryWrapper.lambda().eq(BizSupplierAccount::getDeleteFlag, "NOT_DELETE");
         if(ObjectUtil.isAllNotEmpty(bizSupplierAccountPageParam.getSortField(), bizSupplierAccountPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizSupplierAccountPageParam.getSortOrder());
             queryWrapper.orderBy(true, bizSupplierAccountPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(bizSupplierAccountPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(BizSupplierAccount::getId);
+            queryWrapper.lambda().orderByDesc(BizSupplierAccount::getCreateTime);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -59,6 +66,11 @@ public class BizSupplierAccountServiceImpl extends ServiceImpl<BizSupplierAccoun
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(BizSupplierAccountAddParam bizSupplierAccountAddParam) {
+        //查询名称是否添加过
+        long countName = this.count(new QueryWrapper<BizSupplierAccount>().lambda().eq(BizSupplierAccount::getSupplierAccount, bizSupplierAccountAddParam.getSupplierAccount()));
+        if(countName>0){
+            throw new CommonException("供应商账号已存在！");
+        }
         BizSupplierAccount bizSupplierAccount = BeanUtil.toBean(bizSupplierAccountAddParam, BizSupplierAccount.class);
         this.save(bizSupplierAccount);
     }
@@ -66,6 +78,12 @@ public class BizSupplierAccountServiceImpl extends ServiceImpl<BizSupplierAccoun
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(BizSupplierAccountEditParam bizSupplierAccountEditParam) {
+        //查询名称是否添加过
+        long countName = this.count(new QueryWrapper<BizSupplierAccount>().lambda().eq(BizSupplierAccount::getSupplierAccount, bizSupplierAccountEditParam.getSupplierAccount())
+                                                                                    .ne(BizSupplierAccount::getId, bizSupplierAccountEditParam.getId()));
+        if(countName>0){
+            throw new CommonException("供应商账号已存在！");
+        }
         BizSupplierAccount bizSupplierAccount = this.queryEntity(bizSupplierAccountEditParam.getId());
         BeanUtil.copyProperties(bizSupplierAccountEditParam, bizSupplierAccount);
         this.updateById(bizSupplierAccount);

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierTransport;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplier;
@@ -52,6 +53,7 @@ public class BizSupplierServiceImpl extends ServiceImpl<BizSupplierMapper, BizSu
         if(ObjectUtil.isNotEmpty(bizSupplierPageParam.getSupplierContactName())){
             queryWrapper.lambda().like(BizSupplier::getSupplierContactName,bizSupplierPageParam.getSupplierContactName());
         }
+        queryWrapper.lambda().eq(BizSupplier::getDeleteFlag, "NOT_DELETE");
         queryWrapper.lambda().orderByDesc(BizSupplier::getCreateTime);
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -117,7 +119,16 @@ public class BizSupplierServiceImpl extends ServiceImpl<BizSupplierMapper, BizSu
     }
 
     @Override
-    public List<BizSupplier> getList() {
-        return this.list();
+    public List<BizSupplier> getList(BizSupplierPageParam bizSupplierPageParam) {
+        QueryWrapper<BizSupplier> queryWrapper = new QueryWrapper<BizSupplier>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizSupplierPageParam.getSupplierName())){
+            queryWrapper.lambda().like(BizSupplier::getSupplierName,bizSupplierPageParam.getSupplierName());
+        }
+        if(ObjectUtil.isNotEmpty(bizSupplierPageParam.getSupplierContactName())){
+            queryWrapper.lambda().like(BizSupplier::getSupplierContactName,bizSupplierPageParam.getSupplierContactName());
+        }
+        queryWrapper.lambda().eq(BizSupplier::getDeleteFlag, "NOT_DELETE");
+        queryWrapper.lambda().orderByDesc(BizSupplier::getCreateTime);
+        return this.list(queryWrapper);
     }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsupplier/service/impl/BizSupplierTransportServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.biz.modular.bizsupplier.entity.BizSupplierAccount;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
@@ -46,12 +47,16 @@ public class BizSupplierTransportServiceImpl extends ServiceImpl<BizSupplierTran
     @Override
     public Page<BizSupplierTransport> page(BizSupplierTransportPageParam bizSupplierTransportPageParam) {
         QueryWrapper<BizSupplierTransport> queryWrapper = new QueryWrapper<BizSupplierTransport>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizSupplierTransportPageParam.getSupplierId())){
+            queryWrapper.lambda().like(BizSupplierTransport::getSupplierId,bizSupplierTransportPageParam.getSupplierId());
+        }
+        queryWrapper.lambda().eq(BizSupplierTransport::getDeleteFlag, "NOT_DELETE");
         if(ObjectUtil.isAllNotEmpty(bizSupplierTransportPageParam.getSortField(), bizSupplierTransportPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(bizSupplierTransportPageParam.getSortOrder());
             queryWrapper.orderBy(true, bizSupplierTransportPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(bizSupplierTransportPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(BizSupplierTransport::getId);
+            queryWrapper.lambda().orderByDesc(BizSupplierTransport::getCreateTime);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -59,6 +64,12 @@ public class BizSupplierTransportServiceImpl extends ServiceImpl<BizSupplierTran
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(BizSupplierTransportAddParam bizSupplierTransportAddParam) {
+        //查询名称是否添加过
+        long countName = this.count(new QueryWrapper<BizSupplierTransport>().lambda().eq(BizSupplierTransport::getTransportNo, bizSupplierTransportAddParam.getTransportNo())
+                                                                                    .eq(BizSupplierTransport::getSupplierId, bizSupplierTransportAddParam.getSupplierId()));
+        if(countName>0){
+            throw new CommonException("供应商账号已存在！");
+        }
         BizSupplierTransport bizSupplierTransport = BeanUtil.toBean(bizSupplierTransportAddParam, BizSupplierTransport.class);
         this.save(bizSupplierTransport);
     }
@@ -66,6 +77,13 @@ public class BizSupplierTransportServiceImpl extends ServiceImpl<BizSupplierTran
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(BizSupplierTransportEditParam bizSupplierTransportEditParam) {
+        //查询名称是否添加过
+        long countName = this.count(new QueryWrapper<BizSupplierTransport>().lambda().eq(BizSupplierTransport::getTransportNo, bizSupplierTransportEditParam.getTransportNo())
+                .eq(BizSupplierTransport::getSupplierId, bizSupplierTransportEditParam.getSupplierId())
+                .ne(BizSupplierTransport::getId, bizSupplierTransportEditParam.getId()));
+        if(countName>0){
+            throw new CommonException("供应商账号已存在！");
+        }
         BizSupplierTransport bizSupplierTransport = this.queryEntity(bizSupplierTransportEditParam.getId());
         BeanUtil.copyProperties(bizSupplierTransportEditParam, bizSupplierTransport);
         this.updateById(bizSupplierTransport);