diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index fd1bcab8..a87b0954 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -1,7 +1,7 @@ package com.bonus.sgzb.base.controller; import com.alibaba.fastjson.JSONObject; -import com.bonus.sgzb.base.api.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.domain.*; import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.service.RepairService; diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java similarity index 97% rename from sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTaskDetails.java rename to sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java index 756d071d..27d41014 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.base.api.domain; +package com.bonus.sgzb.base.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index b3be58d5..42604b9c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -3,7 +3,7 @@ package com.bonus.sgzb.base.mapper; import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; -import com.bonus.sgzb.base.api.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.system.api.domain.SysUser; import org.apache.ibatis.annotations.Mapper; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java index e70e0c20..53e3679f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -2,7 +2,7 @@ package com.bonus.sgzb.base.service; import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairTask; -import com.bonus.sgzb.base.api.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.system.api.domain.SysUser; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index b6b9bccb..9ebc86a6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -3,7 +3,7 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; -import com.bonus.sgzb.base.api.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.service.RepairService; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index fafdaa5a..8d20b447 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -178,7 +178,7 @@ tt.create_time DESC - select rad.id as id, rad.task_id as taskId, rad.ma_id as maId, @@ -213,7 +213,7 @@ order by rad.create_time desc - select rad.id as id, rad.repair_num as repairNum, rad.repaired_num as repairedNum, @@ -248,7 +248,7 @@ left join sys_dic s2 on s2.p_id = s1.id where s1.value = #{value} and s2.status = 0 - select id, ma_id as maId, type_id as typeId, diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java index e95f2f19..64a33e3c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapAudit.java @@ -18,7 +18,7 @@ public class ScrapAudit { @ApiModelProperty(value = "不通过原因") private String remark; - @ApiModelProperty(value = "审核任务明细id") + @ApiModelProperty(value = "审核任务明细") private List auditDetailList; }