From 9dd653ba4ce51d53348a3ddd3440b9968d43e2b4 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Mon, 8 Sep 2025 18:21:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/ma/controller/MachineController.java | 8 ++++++++ .../java/com/bonus/material/ma/domain/Machine.java | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index fa319793..2bdebb46 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONObject; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.log.enums.OperaType; import com.bonus.material.basic.domain.BmQrcodeInfo; +import com.bonus.material.codeCollection.domain.WsMaInfo; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.ma.domain.MachineSynch; import com.bonus.material.ma.domain.Type; @@ -407,4 +408,11 @@ public class MachineController extends BaseController { return error("查询失败,请联系管理员"); } } + + @ApiOperation(value = "批量更新检验时间") + @SysLog(title = "批量更新检验时间", businessType = OperaType.UPDATE, logType = 1, module = "设备管理->批量更新检验时间") + @PostMapping("/updateDate") + public AjaxResult updateDate(@RequestBody Machine info) { + return machineService.updateDate(info); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java index 26744c15..17de8be7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java @@ -35,6 +35,8 @@ public class Machine extends BaseEntity { */ private Long maId; + private Long[] maIds; + private Long userId; /** @@ -335,4 +337,12 @@ public class Machine extends BaseEntity { private String repairMan; private Integer manageType; + + + @ApiModelProperty(value = "模块") + private String modelTitle; + + @ApiModelProperty(value = "当前状态") + private String oldStatus; + }