From e5736f78659eec06b0514f43178a411293145da7 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Fri, 13 Mar 2026 17:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E9=95=80=E7=A7=8D=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B=20=E5=A4=96=E5=8D=8F=E8=AE=A2=E5=8D=95=E6=94=B6?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=EF=BC=8C=E7=89=B9=E6=AE=8A=E5=A4=96=E5=8D=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/excel/PlatingTypeRulesImport.java | 9 ++++--- .../desk/oem/pojo/vo/PlatingTypeRulesVO.java | 3 +++ .../PlatingTypeRulesController.java | 4 +++ .../oem/service/IPlatingTypeRulesService.java | 2 +- .../impl/PlatingTypeRulesServiceImpl.java | 23 ++++++++++++++++-- .../oem/wrapper/PlatingTypeRulesWrapper.java | 6 +++-- .../service/impl/WorkOrderRunServiceImpl.java | 6 ++--- .../Excel/oem/外协镀种规则.xls | Bin 19968 -> 19968 bytes 8 files changed, 41 insertions(+), 12 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/PlatingTypeRulesImport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/PlatingTypeRulesImport.java index 110da7ce..426bee7f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/PlatingTypeRulesImport.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/PlatingTypeRulesImport.java @@ -16,14 +16,15 @@ import org.springblade.core.mp.base.BaseEntity; public class PlatingTypeRulesImport extends BaseEntity { /** - * 订单镀种 + * 报价单镀种 */ @ExcelProperty(index = 0) - private String orderPlat; + private String quotationPlat; + /** - * 报价单镀种 + * 订单镀种 */ @ExcelProperty(index = 1) - private String quotationPlat; + private String orderPlat; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PlatingTypeRulesVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PlatingTypeRulesVO.java index 382cd274..da9ce27d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PlatingTypeRulesVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/PlatingTypeRulesVO.java @@ -1,5 +1,6 @@ package org.springblade.desk.oem.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import org.springblade.desk.oem.pojo.entity.PlatingTypeRulesEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,4 +19,6 @@ public class PlatingTypeRulesVO extends PlatingTypeRulesEntity { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "创建人") + private String createUserName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java index 189e0105..df7bdbdc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java @@ -32,6 +32,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; +import java.util.Date; import java.util.Map; import java.util.List; @@ -81,6 +82,7 @@ public class PlatingTypeRulesController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入mesPlatingTypeRules") public R save(@Valid @RequestBody PlatingTypeRulesEntity mesPlatingTypeRules) { + mesPlatingTypeRules.setCreateTime(new Date()); mesPlatingTypeRules.setCreateUser(AuthUtil.getUserId()); return R.status(mesPlatingTypeRulesService.save(mesPlatingTypeRules)); } @@ -92,6 +94,7 @@ public class PlatingTypeRulesController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入mesPlatingTypeRules") public R update(@Valid @RequestBody PlatingTypeRulesEntity mesPlatingTypeRules) { + mesPlatingTypeRules.setCreateTime(new Date()); return R.status(mesPlatingTypeRulesService.updateById(mesPlatingTypeRules)); } @@ -103,6 +106,7 @@ public class PlatingTypeRulesController extends BladeController { @Operation(summary = "新增或修改", description = "传入mesPlatingTypeRules") public R submit(@Valid @RequestBody PlatingTypeRulesEntity mesPlatingTypeRules) { mesPlatingTypeRules.setCreateUser(AuthUtil.getUserId()); + mesPlatingTypeRules.setCreateTime(new Date()); return R.status(mesPlatingTypeRulesService.saveOrUpdate(mesPlatingTypeRules)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IPlatingTypeRulesService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IPlatingTypeRulesService.java index 1e54864d..2bfac05d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IPlatingTypeRulesService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IPlatingTypeRulesService.java @@ -25,7 +25,7 @@ public interface IPlatingTypeRulesService extends BaseService */ - IPage selectPlatingTypeRulesPage(IPage page, PlatingTypeRulesVO mesPlatingTypeRules); + IPage selectPlatingTypeRulesPage(IPage page, PlatingTypeRulesVO mesPlatingTypeRules); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/PlatingTypeRulesServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/PlatingTypeRulesServiceImpl.java index 02a03bf2..10a6bfb7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/PlatingTypeRulesServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/PlatingTypeRulesServiceImpl.java @@ -1,7 +1,11 @@ package org.springblade.desk.oem.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.desk.device.pojo.entity.MeasurementRecordsEntity; +import org.springblade.desk.device.wrapper.MeasurementRecordsWrapper; import org.springblade.desk.oem.pojo.entity.OemProcessEntity; import org.springblade.desk.oem.pojo.entity.PlatingTypeRulesEntity; import org.springblade.desk.oem.pojo.excel.PlatingTypeRulesExcel; @@ -9,6 +13,7 @@ import org.springblade.desk.oem.pojo.excel.PlatingTypeRulesImport; import org.springblade.desk.oem.pojo.vo.PlatingTypeRulesVO; import org.springblade.desk.oem.mapper.PlatingTypeRulesMapper; import org.springblade.desk.oem.service.IPlatingTypeRulesService; +import org.springblade.desk.oem.wrapper.PlatingTypeRulesWrapper; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -18,6 +23,9 @@ import org.springblade.core.mp.base.BaseServiceImpl; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; + +import static com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils.like; /** * 外协镀种规则 服务实现类 @@ -29,8 +37,19 @@ import java.util.List; public class PlatingTypeRulesServiceImpl extends BaseServiceImpl implements IPlatingTypeRulesService { @Override - public IPage selectPlatingTypeRulesPage(IPage page, PlatingTypeRulesVO mesPlatingTypeRules) { - return page.setRecords(baseMapper.selectPlatingTypeRulesPage(page, mesPlatingTypeRules)); + public IPage selectPlatingTypeRulesPage(IPage page, PlatingTypeRulesVO mesPlatingTypeRules) { + // 1. 创建条件构造器 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + + // 2. 动态添加条件（核心！） + // 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件 + wrapper.like(Objects.nonNull(mesPlatingTypeRules.getOrderPlat()), PlatingTypeRulesEntity::getOrderPlat, mesPlatingTypeRules.getOrderPlat()) + .like(Objects.nonNull(mesPlatingTypeRules.getQuotationPlat()), PlatingTypeRulesEntity::getQuotationPlat, mesPlatingTypeRules.getQuotationPlat()); + + // 3. 执行分页查询 + IPage platingTypeRulesEntityIPage = baseMapper.selectPage(page, wrapper); + + return PlatingTypeRulesWrapper.build().pageVO(platingTypeRulesEntityIPage); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/wrapper/PlatingTypeRulesWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/wrapper/PlatingTypeRulesWrapper.java index 73208789..b625239e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/wrapper/PlatingTypeRulesWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/wrapper/PlatingTypeRulesWrapper.java @@ -4,6 +4,8 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.oem.pojo.entity.PlatingTypeRulesEntity; import org.springblade.desk.oem.pojo.vo.PlatingTypeRulesVO; +import org.springblade.system.cache.UserCache; +import org.springblade.system.pojo.entity.User; import java.util.Objects; @@ -23,9 +25,9 @@ public class PlatingTypeRulesWrapper extends BaseEntityWrapperyP^;y}_5MoLyOF?L4>`x`QdFl=F9VEA7@fe}bCv{g;6;}r+VdRFhR1IgY2igGf* zW!Is~>M$}gm@({Og6h48Dtm_kMV5~b&14n^9Vb5GLng%5oxP=b_6o zFmNHHe9FwK3bnSc?K;8#o zRt8o9AmuRiY^5&4qVCXOMxX~-8O%YU0|so!3YI2)_X`c)++_8Ko3+H6fx&5Wvs*nQ oKPVpl0-etQ3_K?WhRK2+IeeTzHi*v&gp7=vyFCgS7kRM&03~mEwEzGB delta 517 zcmZpe!`Lu~aYGIZ+XdHH{)?+77qPT4?%Mp5rJ0Shq5U)8#Z`A0nI|9gu-<%tJC>1g z+GIIiaUkgjBPFLXF?L4>`x`QdFl=F9VEA7@fe}bCv`w2_$14t!^{n1s2a>%56y;=q z%dSI})nR00Fk{%m1l4;FRrU@8iYy-=n#n8-JYbUAWY7~l;uRo&O?`F zVBkWy`5dOK4MO%GrmP)8R*xSPZon`Bl5rsR<}&^|Eyk$HUoBM`Std(c=~{U(fV>aF zEDWpyKx$EUXt2Z7vz3fM@3AtNgTe+3SRv9&lfL^w6l`v@`oqmyV9mf_x4GS|o{=A< q>@U#i48VYMVqlys>XF08!N3gWa{z;bnR#=+M