From c456eb6ce327302253ea674e9b1329450ec1354f Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 16 Nov 2025 14:35:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/back/domain/BackCsDeviceDetails.java | 2 +- .../material/back/service/impl/BackChangeServiceImpl.java | 1 + .../bonus/material/devchange/service/DevChangeServiceImpl.java | 1 + .../main/resources/mapper/material/back/BackChangeMapper.xml | 3 +++ .../resources/mapper/material/devchange/DevChangeMapper.xml | 3 +++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java index be4385f..e7e683f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java @@ -69,7 +69,7 @@ public class BackCsDeviceDetails { private String updateBy; @ApiModelProperty(value = "维修数量") - private BigDecimal realNum; + private BigDecimal realNum = BigDecimal.ZERO; @ApiModelProperty(value = "是否维修 0无需维修 1维修") private String isRepair; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java index 87cbee5..472d95d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java @@ -170,6 +170,7 @@ public class BackChangeServiceImpl implements BackChangeService { String nickName = SecurityUtils.getLoginUser().getSysUser().getNickName(); csDeviceVo.getDevInfo().setUpdateBy(nickName); // 修改主任务 + csDeviceVo.getDevInfo().setTaskStatus("0"); int num = mapper.updateCsDevInfo(csDeviceVo.getDevInfo()); if (num < 1) { throw new RuntimeException("修改主任务失败"); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index df8d487..ea4afd8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -326,6 +326,7 @@ public class DevChangeServiceImpl implements DevChangeService { String nickName = SecurityUtils.getLoginUser().getSysUser().getNickName(); csDeviceVo.getDevInfo().setUpdateBy(nickName); // 修改主任务 + csDeviceVo.getDevInfo().setTaskStatus("0"); int num = mapper.updateCsDevInfo(csDeviceVo.getDevInfo()); if (num < 1) { throw new RuntimeException("修改主任务失败"); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml index 88853bd..586ebc9 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml @@ -56,6 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_user = #{updateBy}, + + review_status = #{taskStatus}, + update_time = NOW() where id = #{id} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index 8583553..95bfd24 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -596,6 +596,9 @@ update_user = #{updateBy}, + + + review_status = #{taskStatus}, update_time = NOW()