|
@@ -20,10 +20,7 @@ import com.ruoyi.zdsz.domain.bo.ZEngineeringReviewBo;
|
|
import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
|
|
import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
|
|
import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
|
|
import com.ruoyi.zdsz.domain.vo.ZEngineeringInfoVo;
|
|
import com.ruoyi.zdsz.enums.photoType;
|
|
import com.ruoyi.zdsz.enums.photoType;
|
|
-import com.ruoyi.zdsz.mapper.ZEngineeringInfoMapper;
|
|
|
|
-import com.ruoyi.zdsz.mapper.ZEngineeringMaterialMapper;
|
|
|
|
-import com.ruoyi.zdsz.mapper.ZEngineeringNodeMapper;
|
|
|
|
-import com.ruoyi.zdsz.mapper.ZMaterialStatisticsMapper;
|
|
|
|
|
|
+import com.ruoyi.zdsz.mapper.*;
|
|
import com.ruoyi.zdsz.service.*;
|
|
import com.ruoyi.zdsz.service.*;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -49,7 +46,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
|
|
|
|
|
|
private final ZEngineeringInfoMapper baseMapper;
|
|
private final ZEngineeringInfoMapper baseMapper;
|
|
@Resource
|
|
@Resource
|
|
- private IZEngineeringCivilService izEngineeringCivilService;
|
|
|
|
|
|
+ private ZEngineeringCivilMapper zEngineeringCivilMapper;
|
|
@Resource
|
|
@Resource
|
|
private IZEngineeringMaterialService izEngineeringMaterialService;
|
|
private IZEngineeringMaterialService izEngineeringMaterialService;
|
|
@Resource
|
|
@Resource
|
|
@@ -592,7 +589,7 @@ private ZEngineeringMaterialMapper zEngineeringMaterialMapper;
|
|
public Boolean deleteById(ZEngineeringInfoBo bo) {
|
|
public Boolean deleteById(ZEngineeringInfoBo bo) {
|
|
ZEngineeringInfo zEngineeringInfo2= baseMapper.selectById(bo.getId());
|
|
ZEngineeringInfo zEngineeringInfo2= baseMapper.selectById(bo.getId());
|
|
ZEngineeringNode zEngineeringNode=zEngineeringNodeMapper.selectById(zEngineeringInfo2.getEngInfoId());
|
|
ZEngineeringNode zEngineeringNode=zEngineeringNodeMapper.selectById(zEngineeringInfo2.getEngInfoId());
|
|
- ZEngineeringCivilVo zEngineeringCivil= izEngineeringCivilService.queryById(zEngineeringNode.getCivliId());
|
|
|
|
|
|
+ ZEngineeringCivil zEngineeringCivil=zEngineeringCivilMapper.selectById(zEngineeringNode.getCivliId());
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw3 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<ZEngineeringMaterial> lqw3 = Wrappers.lambdaQuery();
|
|
lqw3.eq(ZEngineeringMaterial::getDetailsId,zEngineeringInfo2.getId());
|
|
lqw3.eq(ZEngineeringMaterial::getDetailsId,zEngineeringInfo2.getId());
|
|
List<ZEngineeringMaterial> zEngineeringMaterialList= zEngineeringMaterialMapper.selectList(lqw3);
|
|
List<ZEngineeringMaterial> zEngineeringMaterialList= zEngineeringMaterialMapper.selectList(lqw3);
|