|
@@ -133,44 +133,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
|
|
|
public Boolean insertByBo(ZEngineeringPipeJackingBo bo) {
|
|
|
ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
|
|
|
validEntityBeforeSave(add);
|
|
|
- //民用
|
|
|
- if ("民用工程".equals(bo.getType())){
|
|
|
- List<Map<String, Object>> civil = baseMapper.getCivil(bo.getEnginId());
|
|
|
- if (!civil.isEmpty()){
|
|
|
- add.setEnginAddre((String) civil.get(0).get("name"));
|
|
|
- }
|
|
|
- }
|
|
|
- //市政
|
|
|
- else if("市政工程".equals(bo.getType())){
|
|
|
- List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId());
|
|
|
- if (!civil.isEmpty()){
|
|
|
- add.setEnginAddre((String) civil.get(0).get("name"));
|
|
|
- }
|
|
|
- }
|
|
|
- //工业
|
|
|
- else if("工业工程".equals(bo.getType())){
|
|
|
- List<Map<String, Object>> civil = baseMapper.getSg(bo.getEnginId());
|
|
|
- if (!civil.isEmpty()){
|
|
|
- add.setEnginAddre((String) civil.get(0).get("name"));
|
|
|
- }
|
|
|
- }
|
|
|
- // 危险
|
|
|
- else if("危险作业工程".equals(bo.getType())){
|
|
|
- List<Map<String, Object>> civil = baseMapper.getDangerous(bo.getEnginId());
|
|
|
- if (!civil.isEmpty()){
|
|
|
- add.setEnginName((String) civil.get(0).get("name"));
|
|
|
- add.setEnginAddre((String) civil.get(0).get("address"));
|
|
|
- }
|
|
|
- }
|
|
|
- //基建
|
|
|
- else if("基建工程".equals(bo.getType())){
|
|
|
- List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
|
|
|
- if (!civil.isEmpty()){
|
|
|
- add.setEnginName((String) civil.get(0).get("name"));
|
|
|
- add.setEnginAddre((String) civil.get(0).get("address"));
|
|
|
- }
|
|
|
- }
|
|
|
- //
|
|
|
+
|
|
|
LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
|
|
|
lqw.like(StringUtils.isNotBlank(bo.getEnginId()), ZEngineeringPipeJacking::getEnginId, bo.getEnginId());
|
|
|
ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
|
|
@@ -278,7 +241,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
|
|
|
public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
|
|
|
ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
|
|
|
validEntityBeforeSave(update);
|
|
|
- update = updateEnginAddre(update, bo.getType(), bo.getEnginId());
|
|
|
+// update = updateEnginAddre(update, bo.getType(), bo.getEnginId());
|
|
|
bo.getzEngineeringNodeBo().setCivliId(bo.getId());
|
|
|
bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
|
|
|
nodeService.update(bo.getzEngineeringNodeBo());
|