lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

机械安全模块

Browse Source
This commit is contained in:
lg
2025-12-04 18:15:49 +08:00
parent 7b91443532
commit a80c38f87f
18 changed files with 91 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxaqgl/service/impl/JxAqjcglServiceImpl.java
View File

@ -26,6 +26,8 @@ import org.dromara.mechanical.jxzgbh.domain.bo.JxZgxxBo;
import org.dromara.mechanical.jxzgbh.service.IJxYhzgbhService;
import org.dromara.mechanical.jxzgbh.service.IJxZgxxService;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.dromara.mechanical.jxaqgl.domain.bo.JxAqjcglBo;
import org.dromara.mechanical.jxaqgl.domain.vo.JxAqjcglVo;
@ -53,10 +55,13 @@ public class JxAqjcglServiceImpl extends ServiceImpl<JxAqjcglMapper, JxAqjcgl> i
private final IJxAqjcglWtxqService jxAqjcglWtxqService;
private final IJxYhzgbhService jxYhzgbhService;
private final SysOssServiceImpl sysOssService;
@Lazy
@Autowired
private IJxYhzgbhService jxYhzgbhService;
/**
* 查询机械安全检查记录
@ -235,6 +240,8 @@ public class JxAqjcglServiceImpl extends ServiceImpl<JxAqjcglMapper, JxAqjcgl> i
List<Long> deleteIds = new ArrayList<>();
for (Long id : ids) {
JxYhzgbh jxYhzgbh = jxYhzgbhService.getBaseMapper().selectOne(new LambdaQueryWrapper<JxYhzgbh>().eq(JxYhzgbh::getMasterId, id));
if (jxYhzgbh != null) throw new ServiceException("隐患整改编号为"+jxYhzgbh.getInspectionOrderNo()+"已存在整改数据,无法删除");
JxAqjcglVo vo = baseMapper.selectVoById(id);
if (vo != null){
//删除附件

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/controller/JxWhjlController.java
View File

@ -45,11 +45,6 @@ public class JxWhjlController extends BaseController {
private final IJxWhjhService jxWhjhService;
/**
* 查询机械维护计划列表
*/

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxJlServiceImpl.java
View File

@ -160,7 +160,7 @@ public class JxGzwxJlServiceImpl extends ServiceImpl<JxGzwxJlMapper, JxGzwxJl> i
@Override
public JxGzwxHeadVo jxgzwx() {
JxGzwxHeadVo jxGzwxHeadVo = new JxGzwxHeadVo();
List<JxGzwxJl> jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper<JxGzwxJl>().ge(JxGzwxJl::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
List<JxGzwxJl> jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper<JxGzwxJl>().le(JxGzwxJl::getCreateTime, LocalDate.now().plusDays(1)).ge(JxGzwxJl::getCreateTime, LocalDate.now().minusDays(29)));
if (jxGzwxes != null && jxGzwxes.size() > 0) {
long wxz = jxGzwxes.stream().filter(jxGzwx -> "1".equals(jxGzwx.getStatus())).count();
long hf = jxGzwxes.stream().filter(jxGzwx -> "2".equals(jxGzwx.getStatus())).count();

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxGzwxServiceImpl.java
View File

@ -172,7 +172,7 @@ public class JxGzwxServiceImpl extends ServiceImpl<JxGzwxMapper, JxGzwx> impleme
public JxGzwxHeadVo jxgzwx() {
JxGzwxHeadVo jxGzwxHeadVo = new JxGzwxHeadVo();
List<JxGzwx> jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper<JxGzwx>().ge(JxGzwx::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
List<JxGzwx> jxGzwxes = this.baseMapper.selectList(new LambdaQueryWrapper<JxGzwx>().le(JxGzwx::getCreateTime, LocalDate.now().plusDays(1)).ge(JxGzwx::getCreateTime, LocalDate.now().minusDays(29)));
if (jxGzwxes != null && jxGzwxes.size() > 0) {
long wxz = jxGzwxes.stream().filter(jxGzwx -> "1".equals(jxGzwx.getStatus())).count();
long hf = jxGzwxes.stream().filter(jxGzwx -> "2".equals(jxGzwx.getStatus())).count();

33
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjhServiceImpl.java
View File

@ -1,6 +1,8 @@
package org.dromara.mechanical.jxgl.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -9,6 +11,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.device.domain.DeviceInfo;
import org.dromara.device.domain.vo.DeviceInfoVo;
import org.dromara.device.service.IDeviceInfoService;
import org.dromara.mechanical.jxgl.domain.JxWhjl;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhHeadVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlVo;
@ -23,6 +28,7 @@ import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
import org.dromara.mechanical.jxgl.domain.JxWhjh;
import org.dromara.mechanical.jxgl.mapper.JxWhjhMapper;
import org.dromara.mechanical.jxgl.service.IJxWhjhService;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
@ -44,6 +50,10 @@ public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> impleme
@Autowired
private IJxWhjlService jxWhjlService;
private final IDeviceInfoService deviceInfoService;
private final SysOssServiceImpl sysOssService;
@ -111,9 +121,17 @@ public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> impleme
* @return 是否新增成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(JxWhjhBo bo) {
JxWhjh add = MapstructUtils.convert(bo, JxWhjh.class);
validEntityBeforeSave(add);
//反查数据判断是都被添加过
JxWhjhVo jxWhjhVo = baseMapper.selectVoOne(new LambdaQueryWrapper<JxWhjh>().eq(JxWhjh::getEquipmentId, bo.getEquipmentId()));
if (jxWhjhVo != null) throw new ServiceException("该设备已添加到维护计划");
// 修改设备状态
deviceInfoService.getBaseMapper().update(new LambdaUpdateWrapper<DeviceInfo>().set(DeviceInfo::getStatus,"2").eq(DeviceInfo::getId,bo.getEquipmentId()));
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
@ -131,6 +149,16 @@ public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> impleme
public Boolean updateByBo(JxWhjhBo bo) {
JxWhjh update = MapstructUtils.convert(bo, JxWhjh.class);
validEntityBeforeSave(update);
Long l = jxWhjlService.getBaseMapper().selectCount(new LambdaQueryWrapper<JxWhjl>().eq(JxWhjl::getWhjhId, bo.getId()));
if (l > 0) throw new ServiceException("该计划已添加保养记录,无法修改");
// //反查数据判断是都被添加过
// JxWhjhVo jxWhjhVo = baseMapper.selectVoOne(new LambdaQueryWrapper<JxWhjh>().eq(JxWhjh::getEquipmentId, bo.getEquipmentId()));
// if (jxWhjhVo != null) throw new ServiceException("该设备已添加到维护计划");
//
// // 修改设备状态
// deviceInfoService.getBaseMapper().update(new LambdaUpdateWrapper<DeviceInfo>().set(DeviceInfo::getStatus,"2").eq(DeviceInfo::getId,bo.getEquipmentId()));
//
return baseMapper.updateById(update) > 0;
}
@ -156,6 +184,9 @@ public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> impleme
List<Long> deleteIds = new ArrayList<>();
for (Long id : ids) {
JxWhjhVo vo = baseMapper.selectVoById(id);
// 判断计划是否被引用
Long l = jxWhjlService.getBaseMapper().selectCount(new LambdaQueryWrapper<JxWhjl>().eq(JxWhjl::getWhjhId, id));
if (l > 0) throw new ServiceException("该计划被引用，请先删除计划下的记录");
if (vo != null){
//删除附件
if (vo.getFileId()!= null && !vo.getFileId().isEmpty()){
@ -173,7 +204,7 @@ public class JxWhjhServiceImpl extends ServiceImpl<JxWhjhMapper, JxWhjh> impleme
@Override
public JxWhjhHeadVo jxwhHead() {
JxWhjhHeadVo jxWhjhHeadVo = new JxWhjhHeadVo();
List<JxWhjh> jxWhjhs = this.baseMapper.selectList(new LambdaQueryWrapper<JxWhjh>().ge(JxWhjh::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
List<JxWhjh> jxWhjhs = this.baseMapper.selectList(new LambdaQueryWrapper<JxWhjh>().le(JxWhjh::getCreateTime, LocalDate.now().plusDays(1)).ge(JxWhjh::getCreateTime, LocalDate.now().minusDays(29)));
if (jxWhjhs != null && jxWhjhs.size() > 0) {
long countwwc = jxWhjhs.stream().filter(jxwhjh -> "1".equals(jxwhjh.getStatus()) || "2".equals(jxwhjh.getStatus())).count();
long countywc = jxWhjhs.stream().filter(jxwhjh -> "3".equals(jxwhjh.getStatus())).count();

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxgl/service/impl/JxWhjlServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.dromara.mechanical.jxgl.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
@ -10,6 +11,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.device.domain.DeviceInfo;
import org.dromara.device.service.IDeviceInfoService;
import org.dromara.mechanical.jxaqgl.domain.JxAqjcgl;
import org.dromara.mechanical.jxgl.domain.JxWhjh;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjhVo;
import org.dromara.mechanical.jxgl.domain.vo.JxWhjlHeadVo;
@ -43,6 +47,8 @@ public class JxWhjlServiceImpl extends ServiceImpl<JxWhjlMapper, JxWhjl> impleme
private final SysOssServiceImpl sysOssService;
private final IDeviceInfoService deviceInfoService;
/**
* 查询机械维护记录
@ -112,11 +118,16 @@ public class JxWhjlServiceImpl extends ServiceImpl<JxWhjlMapper, JxWhjl> impleme
boolean flag = baseMapper.insert(add) > 0;
if (bo != null){
if ("1".equals(bo.getMaintenanceResult())){
// 修改设备状态
deviceInfoService.getBaseMapper().update(new LambdaUpdateWrapper<DeviceInfo>().set(DeviceInfo::getStatus,"1").eq(DeviceInfo::getId,bo.getEquipmentId()));
jxWhjhService.getBaseMapper().update(new UpdateWrapper<JxWhjh>().eq("id",bo.getWhjhId()).set("status","3"));
}else {
jxWhjhService.getBaseMapper().update(new UpdateWrapper<JxWhjh>().eq("id",bo.getWhjhId()).set("status","2"));
}
}
if (flag) {
bo.setId(add.getId());
@ -185,7 +196,7 @@ public class JxWhjlServiceImpl extends ServiceImpl<JxWhjlMapper, JxWhjl> impleme
public JxWhjlHeadVo jxwhHead() {
JxWhjlHeadVo jxWhjlHeadVo = new JxWhjlHeadVo();
List<JxWhjl> jxWhjls = this.baseMapper.selectList(new LambdaQueryWrapper<JxWhjl>().ge(JxWhjl::getCreateTime, LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())));
List<JxWhjl> jxWhjls = this.baseMapper.selectList(new LambdaQueryWrapper<JxWhjl>().le(JxWhjl::getCreateTime, LocalDate.now().plusDays(1)).ge(JxWhjl::getCreateTime, LocalDate.now().minusDays(29)));
if (jxWhjls != null && jxWhjls.size() > 0) {
long zc = jxWhjls.stream().filter(jxwhjl -> "1".equals(jxwhjl.getMaintenanceResult())).count();
long yc = jxWhjls.stream().filter(jxwhjl -> "2".equals(jxwhjl.getMaintenanceResult())).count();

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxsgjl/domain/JxSgxxjlb.java
View File

@ -53,7 +53,7 @@ public class JxSgxxjlb extends BaseEntity {
/**
* 设备台账id
*/
private String equipmentId;
private Long equipmentId;
/**
* 发生时间

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxsgjl/domain/bo/JxSgxxjlbBo.java
View File

@ -56,7 +56,7 @@ public class JxSgxxjlbBo extends BaseEntity {
* 设备台账id
*/
@NotBlank(message = "设备台账id不能为空", groups = { AddGroup.class, EditGroup.class })
private String equipmentId;
private Long equipmentId;
/**
* 发生时间

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxsgjl/domain/vo/JxSgxxjlbVo.java
View File

@ -69,7 +69,7 @@ public class JxSgxxjlbVo implements Serializable {
* 设备台账id
*/
@ExcelProperty(value = "设备台账id")
private String equipmentId;
private Long equipmentId;
/**
* 发生时间

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxsgjl/service/impl/JxSgxxjlbServiceImpl.java
View File

@ -81,7 +81,6 @@ public class JxSgxxjlbServiceImpl extends ServiceImpl<JxSgxxjlbMapper, JxSgxxjlb
lqw.eq(StringUtils.isNotBlank(bo.getAccidentLevel()), JxSgxxjlb::getAccidentLevel, bo.getAccidentLevel());
lqw.eq(StringUtils.isNotBlank(bo.getAccidentType()), JxSgxxjlb::getAccidentType, bo.getAccidentType());
lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), JxSgxxjlb::getEquipmentName, bo.getEquipmentName());
lqw.eq(StringUtils.isNotBlank(bo.getEquipmentId()), JxSgxxjlb::getEquipmentId, bo.getEquipmentId());
lqw.eq(bo.getOccurrenceTime() != null, JxSgxxjlb::getOccurrenceTime, bo.getOccurrenceTime());
lqw.eq(StringUtils.isNotBlank(bo.getOccurrencePlace()), JxSgxxjlb::getOccurrencePlace, bo.getOccurrencePlace());
lqw.eq(StringUtils.isNotBlank(bo.getAccidentDescription()), JxSgxxjlb::getAccidentDescription, bo.getAccidentDescription());

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/controller/JxYhzgbhController.java
View File

@ -67,7 +67,7 @@ public class JxYhzgbhController extends BaseController {
*/
@SaCheckPermission("jxzgbh:yhzgbh:edit")
@PutMapping("/zgxxorfcxx/{type}/{id}")
@GetMapping("/zgxxorfcxx/{type}/{id}")
public R<JxZgxxOrFcxxVo> zgxxorfcxx(@PathVariable String type, @PathVariable Long id) {
return R.ok(jxYhzgbhService.zgxxorfcxx(type,id));
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxFcxx.java
View File

@ -44,7 +44,7 @@ public class JxFcxx extends BaseEntity {
private LocalDate reviewDate;
/**
* 复查意见
* 复查状态
*/
private String reviewOpinion;

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/JxYhzgbh.java
View File

@ -96,6 +96,11 @@ public class JxYhzgbh extends BaseEntity {
*/
private String auditStatus;
/**
* 复查状态
*/
private String reviewOpinion;
/**
* 文件id （多个文件逗号分隔）
*/

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxFcxxBo.java
View File

@ -49,7 +49,7 @@ public class JxFcxxBo extends BaseEntity {
/**
* 复查意见
*/
@NotBlank(message = "复查意见不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "复查状态不能为空", groups = { AddGroup.class, EditGroup.class })
private String reviewOpinion;
/**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/bo/JxYhzgbhBo.java
View File

@ -43,6 +43,11 @@ public class JxYhzgbhBo extends BaseEntity {
*/
private Long inspector;
/**
* 复查状态
*/
private String reviewOpinion;
/**
* 整改人
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java
View File

@ -57,6 +57,11 @@ public class JxYhzgbhVo implements Serializable {
@ExcelProperty(value = "检查人")
private Long inspector;
/**
* 复查状态
*/
private String reviewOpinion;
/**
* 检查人
*/

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxZgxxOrFcxxVo.java
View File

@ -2,9 +2,12 @@ package org.dromara.mechanical.jxzgbh.domain.vo;
import lombok.Data;
import org.dromara.mechanical.jxaqgl.domain.JxAqjcglWtxq;
import org.dromara.mechanical.jxzgbh.domain.JxFcxx;
import org.dromara.mechanical.jxzgbh.domain.JxZgxx;
import java.util.List;
@Data
public class JxZgxxOrFcxxVo {
@ -25,5 +28,11 @@ public class JxZgxxOrFcxxVo {
private JxZgxx zgxxVo;
/**
* 问题详情
*/
private List<JxAqjcglWtxq> wtxqList;
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/service/impl/JxYhzgbhServiceImpl.java
View File

@ -81,7 +81,7 @@ public class JxYhzgbhServiceImpl extends ServiceImpl<JxYhzgbhMapper, JxYhzgbh> i
jxYhzgbhVo.setFcxxList(jxFcxxes);
}
// 问题详情
List<JxAqjcglWtxq> jxAqjcglWtxqs = jxAqjcglWtxqService.getBaseMapper().selectList(new LambdaQueryWrapper<JxAqjcglWtxq>().eq(JxAqjcglWtxq::getMasterId, jxYhzgbhVo.getId()));
List<JxAqjcglWtxq> jxAqjcglWtxqs = jxAqjcglWtxqService.getBaseMapper().selectList(new LambdaQueryWrapper<JxAqjcglWtxq>().eq(JxAqjcglWtxq::getMasterId, jxYhzgbhVo.getMasterId()));
if (jxAqjcglWtxqs != null){
jxYhzgbhVo.setWtxqList(jxAqjcglWtxqs);
}
@ -123,6 +123,9 @@ public class JxYhzgbhServiceImpl extends ServiceImpl<JxYhzgbhMapper, JxYhzgbh> i
lqw.eq(bo.getMasterId() != null, JxYhzgbh::getMasterId, bo.getMasterId());
lqw.eq(StringUtils.isNotBlank(bo.getRiskGrade()), JxYhzgbh::getRiskGrade, bo.getRiskGrade());
lqw.eq(StringUtils.isNotBlank(bo.getYhly()), JxYhzgbh::getYhly, bo.getYhly());
lqw.eq(StringUtils.isNotBlank(bo.getReviewOpinion()), JxYhzgbh::getReviewOpinion, bo.getReviewOpinion());
lqw.eq(StringUtils.isNotBlank(bo.getReviewState()), JxYhzgbh::getReviewState, bo.getReviewState());
lqw.eq(StringUtils.isNotBlank(bo.getAbarbeitungState()), JxYhzgbh::getAbarbeitungState, bo.getAbarbeitungState());
lqw.like(StringUtils.isNotBlank(bo.getEquipmentName()), JxYhzgbh::getEquipmentName, bo.getEquipmentName());
lqw.eq(bo.getDiscoverDate() != null, JxYhzgbh::getDiscoverDate, bo.getDiscoverDate());
lqw.eq(bo.getDiscoverId() != null, JxYhzgbh::getDiscoverId, bo.getDiscoverId());
@ -211,6 +214,8 @@ public class JxYhzgbhServiceImpl extends ServiceImpl<JxYhzgbhMapper, JxYhzgbh> i
if (bo.getReviewOpinion().equals("2")) {
this.getBaseMapper().update(new LambdaUpdateWrapper<JxYhzgbh>().eq(JxYhzgbh::getId, bo.getMasterId()).set(JxYhzgbh::getAbarbeitungState,"1"));
}
this.getBaseMapper().update(new LambdaUpdateWrapper<JxYhzgbh>().eq(JxYhzgbh::getId, bo.getMasterId()).set(JxYhzgbh::getReviewOpinion,bo.getReviewOpinion()));
Long l = jxFcxxService.getBaseMapper().selectCount(new LambdaQueryWrapper<JxFcxx>().eq(JxFcxx::getMasterId, bo.getMasterId()));
bo.setSort(Integer.parseInt(l+"") + 1);
// 修改闭环状态
@ -224,7 +229,7 @@ public class JxYhzgbhServiceImpl extends ServiceImpl<JxYhzgbhMapper, JxYhzgbh> i
JxYhzgbhVo jxYhzgbhVo = this.queryById(id);
if (jxYhzgbhVo != null) {
jxZgxxOrFcxxVo.setYhzgbhVo(jxYhzgbhVo);
List<JxAqjcglWtxq> jxAqjcglWtxqs = jxAqjcglWtxqService.getBaseMapper().selectList(new LambdaQueryWrapper<JxAqjcglWtxq>().eq(JxAqjcglWtxq::getMasterId, id));
List<JxAqjcglWtxq> jxAqjcglWtxqs = jxAqjcglWtxqService.getBaseMapper().selectList(new LambdaQueryWrapper<JxAqjcglWtxq>().eq(JxAqjcglWtxq::getMasterId, jxYhzgbhVo.getMasterId()));
if (jxAqjcglWtxqs != null) {
jxZgxxOrFcxxVo.getYhzgbhVo().setWtxqList(jxAqjcglWtxqs);
}