From fbf72c2f891b6f32da46f072cdb7e2020916aed0 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 20 Dec 2024 16:39:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=94=A8=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/domain/repair}/RePairDto.java | 2 +- .../common/biz/domain/repair}/RepairInputDetails.java | 4 +--- .../controller/RepairInputDetailsController.java | 3 +-- .../repair/mapper/RepairInputDetailsMapper.java | 3 +-- .../repair/service/IRepairInputDetailsService.java | 2 +- .../bonus/material/repair/service/RepairService.java | 3 +-- .../service/impl/RepairAuditDetailsServiceImpl.java | 1 + .../service/impl/RepairInputDetailsServiceImpl.java | 6 ++---- .../material/repair/RepairInputDetailsMapper.xml | 10 +++++----- 9 files changed, 14 insertions(+), 20 deletions(-) rename {bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain => bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair}/RePairDto.java (88%) rename {bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain => bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair}/RepairInputDetails.java (97%) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RePairDto.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RePairDto.java similarity index 88% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RePairDto.java rename to bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RePairDto.java index 64cbef52..d3fde524 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RePairDto.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RePairDto.java @@ -1,4 +1,4 @@ -package com.bonus.material.repair.domain; +package com.bonus.common.biz.domain.repair; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java similarity index 97% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java rename to bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java index 2dc9d6f4..0b7c36c5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java @@ -1,10 +1,8 @@ -package com.bonus.material.repair.domain; +package com.bonus.common.biz.domain.repair; import com.bonus.common.core.annotation.Excel; -import com.bonus.material.back.domain.MaCode; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java index 8a4857b4..e4e6f220 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java @@ -4,7 +4,6 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.biz.annotation.StoreLog; -import com.bonus.common.biz.domain.purchase.PurchaseDto; import com.bonus.common.log.enums.OperaType; import com.bonus.material.back.domain.vo.MaCodeVo; import com.bonus.material.common.annotation.PreventRepeatSubmit; @@ -21,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.material.repair.domain.RepairInputDetails; +import com.bonus.common.biz.domain.repair.RepairInputDetails; import com.bonus.material.repair.service.IRepairInputDetailsService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java index 976b906a..24c7dcac 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java @@ -2,9 +2,8 @@ package com.bonus.material.repair.mapper; import java.util.List; -import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.back.domain.vo.MaCodeVo; -import com.bonus.material.repair.domain.RepairInputDetails; +import com.bonus.common.biz.domain.repair.RepairInputDetails; import com.bonus.material.repair.domain.RepairInputInfo; import org.apache.ibatis.annotations.Param; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairInputDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairInputDetailsService.java index f8aee710..746f8740 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairInputDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairInputDetailsService.java @@ -4,7 +4,7 @@ import java.util.List; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.back.domain.vo.MaCodeVo; -import com.bonus.material.repair.domain.RepairInputDetails; +import com.bonus.common.biz.domain.repair.RepairInputDetails; import com.bonus.material.repair.domain.RepairInputInfo; /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java index 56304b4c..c5d3df3e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java @@ -3,14 +3,13 @@ package com.bonus.material.repair.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.repair.domain.RepairApplyRecord; -import com.bonus.material.repair.domain.RepairInputDetails; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.domain.vo.RepairInputDetailsVo; import com.bonus.system.api.domain.SysUser; -import javax.validation.constraints.NotBlank; + import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 421b687d..a6a6cf82 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.material.repair.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.bonus.common.biz.constant.MaterialConstants; +import com.bonus.common.biz.domain.repair.RepairInputDetails; import com.bonus.common.biz.domain.vo.KeyValueVO; import com.bonus.common.biz.enums.RepairInputStatusEnum; import com.bonus.common.biz.enums.RepairTaskStatusEnum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java index 666ad57b..9c89504a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java @@ -1,7 +1,6 @@ package com.bonus.material.repair.service.impl; import java.math.BigDecimal; -import java.math.BigInteger; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -15,16 +14,15 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.back.domain.vo.MaCodeVo; -import com.bonus.material.repair.domain.RePairDto; +import com.bonus.common.biz.domain.repair.RePairDto; import com.bonus.material.repair.domain.RepairInputInfo; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairInputDetailsMapper; -import com.bonus.material.repair.domain.RepairInputDetails; +import com.bonus.common.biz.domain.repair.RepairInputDetails; import com.bonus.material.repair.service.IRepairInputDetailsService; import org.springframework.transaction.annotation.Transactional; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml index 337d601f..907d651d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT rd.task_id AS taskId, tt1.CODE AS repairCode, @@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rid.task_id = #{taskId} - + insert into repair_input_details (task_id, audit_id, repair_id, ma_id, type_id, repair_num, input_num, create_by, create_time, status, remark, company_id) @@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into repair_input_details task_id, @@ -295,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + UPDATE repair_input_details SET input_num = IFNULL(input_num, 0) + #{inputNum},