bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

公用实体类移动

This commit is contained in:
mashuai 2024-12-20 16:39:22 +08:00
parent 224b71336d
commit fbf72c2f89
9 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RePairDto.java → bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RePairDto.java
View File

@ -1,4 +1,4 @@
package com.bonus.material.repair.domain; package com.bonus.common.biz.domain.repair;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputDetails.java → bonus-common-biz/src/main/java/com/bonus/common/biz/domain/repair/RepairInputDetails.java
View File

@ -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.common.core.annotation.Excel;
import com.bonus.material.back.domain.MaCode;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairInputDetailsController.java
View File

@ -4,7 +4,6 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.bonus.common.biz.annotation.StoreLog; 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.common.log.enums.OperaType;
import com.bonus.material.back.domain.vo.MaCodeVo; import com.bonus.material.back.domain.vo.MaCodeVo;
import com.bonus.material.common.annotation.PreventRepeatSubmit; 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 org.springframework.web.bind.annotation.RestController;
import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions; 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.material.repair.service.IRepairInputDetailsService;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairInputDetailsMapper.java
View File

@ -2,9 +2,8 @@ package com.bonus.material.repair.mapper;
import java.util.List; import java.util.List;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.back.domain.vo.MaCodeVo; 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 com.bonus.material.repair.domain.RepairInputInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairInputDetailsService.java
View File

@ -4,7 +4,7 @@ import java.util.List;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.back.domain.vo.MaCodeVo; 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 com.bonus.material.repair.domain.RepairInputInfo;
/** /**

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java
View File

@ -3,14 +3,13 @@ package com.bonus.material.repair.service;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.repair.domain.RepairApplyRecord; 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.RepairTask;
import com.bonus.material.repair.domain.RepairTaskDetails; import com.bonus.material.repair.domain.RepairTaskDetails;
import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo; import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo;
import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.domain.vo.RepairDeviceVO;
import com.bonus.material.repair.domain.vo.RepairInputDetailsVo; import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.domain.SysUser;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.bonus.material.repair.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.bonus.common.biz.constant.MaterialConstants; 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.domain.vo.KeyValueVO;
import com.bonus.common.biz.enums.RepairInputStatusEnum; import com.bonus.common.biz.enums.RepairInputStatusEnum;
import com.bonus.common.biz.enums.RepairTaskStatusEnum; import com.bonus.common.biz.enums.RepairTaskStatusEnum;

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.bonus.material.repair.service.impl; package com.bonus.material.repair.service.impl;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; 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.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.back.domain.vo.MaCodeVo; 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.repair.domain.RepairInputInfo;
import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.domain.TmTaskAgreement;
import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskAgreementMapper;
import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.material.task.mapper.TmTaskMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.material.repair.mapper.RepairInputDetailsMapper; 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 com.bonus.material.repair.service.IRepairInputDetailsService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

10
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.material.repair.mapper.RepairInputDetailsMapper"> <mapper namespace="com.bonus.material.repair.mapper.RepairInputDetailsMapper">
<resultMap type="com.bonus.material.repair.domain.RepairInputDetails" id="RepairInputDetailsResult"> <resultMap type="com.bonus.common.biz.domain.repair.RepairInputDetails" id="RepairInputDetailsResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="taskId" column="task_id" /> <result property="taskId" column="task_id" />
<result property="auditId" column="audit_id" /> <result property="auditId" column="audit_id" />
@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectRepairInputDetailsList" resultType="com.bonus.material.repair.domain.RepairInputDetails"> <select id="selectRepairInputDetailsList" resultType="com.bonus.common.biz.domain.repair.RepairInputDetails">
SELECT SELECT
rd.task_id AS taskId, rd.task_id AS taskId,
tt1.CODE AS repairCode, tt1.CODE AS repairCode,
@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
rid.task_id = #{taskId} rid.task_id = #{taskId}
</select> </select>
<insert id="batchInsertRepairInputDetails" parameterType="com.bonus.material.repair.domain.RepairInputDetails"> <insert id="batchInsertRepairInputDetails" parameterType="com.bonus.common.biz.domain.repair.RepairInputDetails">
insert into repair_input_details insert into repair_input_details
(task_id, audit_id, repair_id, ma_id, type_id, repair_num, input_num, create_by, create_time, (task_id, audit_id, repair_id, ma_id, type_id, repair_num, input_num, create_by, create_time,
status, remark, company_id) status, remark, company_id)
@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</insert> </insert>
<insert id="insertRepairInputDetails" parameterType="com.bonus.material.repair.domain.RepairInputDetails" useGeneratedKeys="true" keyProperty="id"> <insert id="insertRepairInputDetails" parameterType="com.bonus.common.biz.domain.repair.RepairInputDetails" useGeneratedKeys="true" keyProperty="id">
insert into repair_input_details insert into repair_input_details
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskId != null">task_id,</if> <if test="taskId != null">task_id,</if>
@ -295,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</insert> </insert>
<update id="updateRepairInputDetails" parameterType="com.bonus.material.repair.domain.RepairInputDetails"> <update id="updateRepairInputDetails" parameterType="com.bonus.common.biz.domain.repair.RepairInputDetails">
UPDATE repair_input_details UPDATE repair_input_details
SET SET
<if test="inputNum != null">input_num = IFNULL(input_num, 0) + #{inputNum},</if> <if test="inputNum != null">input_num = IFNULL(input_num, 0) + #{inputNum},</if>