bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修修改

This commit is contained in:
1539530615@qq.com 2024-01-24 14:19:18 +08:00
parent 367ad3f33e
commit 7370cab29a
9 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java → sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/RepairTaskDetails.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.base.domain; package com.bonus.sgzb.base.api.domain;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.base.controller; package com.bonus.sgzb.base.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
import com.bonus.sgzb.base.domain.*; import com.bonus.sgzb.base.domain.*;
import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.domain.vo.DictVo;
import com.bonus.sgzb.base.service.RepairService; import com.bonus.sgzb.base.service.RepairService;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java
View File

@ -3,7 +3,7 @@ package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairApplyRecord;
import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairPartDetails;
import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTask;
import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.domain.vo.DictVo;
import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.domain.SysUser;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java
View File

@ -2,7 +2,7 @@ package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairApplyRecord;
import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTask;
import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.domain.vo.DictVo;
import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.domain.SysUser;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairApplyRecord;
import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairPartDetails;
import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTask;
import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
import com.bonus.sgzb.base.domain.vo.DictVo; import com.bonus.sgzb.base.domain.vo.DictVo;
import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.mapper.RepairMapper;
import com.bonus.sgzb.base.service.RepairService; import com.bonus.sgzb.base.service.RepairService;

6
sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml
View File

@ -178,7 +178,7 @@
tt.create_time DESC tt.create_time DESC
</select> </select>
<select id="getRepairMaTypeList" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails"> <select id="getRepairMaTypeList" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
select rad.id as id, select rad.id as id,
rad.task_id as taskId, rad.task_id as taskId,
rad.ma_id as maId, rad.ma_id as maId,
@ -213,7 +213,7 @@
order by rad.create_time desc order by rad.create_time desc
</select> </select>
<select id="getById" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails"> <select id="getById" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
select rad.id as id, select rad.id as id,
rad.repair_num as repairNum, rad.repair_num as repairNum,
rad.repaired_num as repairedNum, rad.repaired_num as repairedNum,
@ -248,7 +248,7 @@
left join sys_dic s2 on s2.p_id = s1.id left join sys_dic s2 on s2.p_id = s1.id
where s1.value = #{value} and s2.status = 0 where s1.value = #{value} and s2.status = 0
</select> </select>
<select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails"> <select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.api.domain.RepairTaskDetails">
select id, select id,
ma_id as maId, ma_id as maId,
type_id as typeId, type_id as typeId,

7
sgzb-modules/sgzb-material/pom.xml
View File

@ -107,13 +107,6 @@
<version>5.8.16</version> <version>5.8.16</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.bonus.sgzb</groupId>
<artifactId>sgzb-modules-base</artifactId>
<version>3.6.3</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<properties> <properties>

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.material.mapper; package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
import com.bonus.sgzb.material.domain.RepairAuditDetails; import com.bonus.sgzb.material.domain.RepairAuditDetails;
import com.bonus.sgzb.material.vo.RepairAuditDetailsVO; import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO; import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.api.domain.RepairTaskDetails;
import com.bonus.sgzb.common.core.exception.ServiceException; import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils;