rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/gongfu-20260126' into develop

This commit is contained in:
曹鹏飞 2026-01-27 16:34:57 +08:00
parent 32ee948087 e0571e24b3
commit e9b3a581ab
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionMeasuresVO.java
View File

@ -20,4 +20,9 @@ public class SolutionMeasuresVO {
// 是否审核通过，默认为null，表示未审核；false：不通过，true：通过
private Boolean approved;
/**
* 部件列表
*/
private List<ComponentInfo> components;
}

1
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceComponentController.java
View File

@ -108,6 +108,7 @@ public class DeviceComponentController extends ControllerBase {
.findFirst()
.orElseGet(() -> {
GongFuDeviceTypeVO v = new GongFuDeviceTypeVO()
.setId(p.getId())
.setProductLine(p.getProductLine());
datas.add(v);
return v;

2
nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/vo/GongFuDeviceTypeVO.java
View File

@ -11,6 +11,8 @@ import java.util.List;
@Accessors(chain = true)
public class GongFuDeviceTypeVO {
private Long id;
/**
* 产品线
*/

1
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.mobilebroken.common.constant.Constant;
import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery;
import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest;
import com.nflg.mobilebroken.common.pojo.vo.ComponentInfo;
import com.nflg.mobilebroken.common.pojo.vo.DeviceAgentVO;
import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO;
import com.nflg.mobilebroken.common.pojo.vo.DeviceVO;

10
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.nflg.mobilebroken.common.constant.Constant;
import com.nflg.mobilebroken.common.constant.TicketState;
import com.nflg.mobilebroken.common.pojo.dto.TicketDTO;
import com.nflg.mobilebroken.common.pojo.request.SolutionMeasuresSaveRequest;
import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO;
import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresDataItemVO;
import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresItemVO;
import com.nflg.mobilebroken.common.pojo.vo.SolutionMeasuresVO;
@ -56,6 +57,9 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
@Resource
private IFileUploadRecordService fileUploadRecordService;
@Resource
private IDeviceService deviceService;
@Override
public SolutionMeasuresVO getSolutionMeasures(Long ticketId) {
TicketDTO ticket = ticketService.getDto(ticketId);
@ -129,6 +133,12 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
}
}
vo.setMeasures(items);
if (Objects.equals(ticket.getType(), 1)) {
DeviceInfoVO deviceInfoVO = deviceService.getByDeviceNo(ticket.getDeviceNo());
if (Objects.nonNull(deviceInfoVO)) {
vo.setComponents(deviceInfoVO.getComponents());
}
}
return vo;
}