From 3450c2c19eaa02e0f2bfe82e90e1b328dcd49225 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 6 Dec 2024 16:13:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=BC=BA=E5=B0=91=E5=8F=82=E6=95=B0=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/controller/admin/order/OrderController.java | 2 ++ .../system/dal/mysql/setting/PackageConfigMapper.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java index 2d942a686..d59b2cda9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java @@ -106,6 +106,8 @@ public class OrderController { private String errKey = "api数据导入异常"; private String errValue = "当前存在导入情况，请稍后"; + public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; + public static final String ORDER_PLATE_MODEL_COMPRESS = "imes_order_plate_model_compress"; @PutMapping("/update") @Operation(summary = "更新生产单") @PreAuthorize("@ss.hasPermission('production:manager-list:edit')") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java index c0b377b43..a0587a180 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java @@ -5,6 +5,8 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface PackageConfigMapper extends BaseMapperX { @@ -18,6 +20,11 @@ public interface PackageConfigMapper extends BaseMapperX { .eqIfPresent(PackageConfigDO::getType,type)); } + default List selectSettingList(Integer type, Long organId) { + return selectList( new LambdaQueryWrapperX() + .eqIfPresent(PackageConfigDO::getOrganId,organId) + .eqIfPresent(PackageConfigDO::getType,type)); + } default int deleteSetting(Integer type,Long userId, Long organId) { return delete(new LambdaQueryWrapperX()