|
@@ -6,8 +6,10 @@ import com.ruoyi.common.core.utils.uuid.IdUtils;
|
|
import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
|
|
import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
|
|
import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
|
|
|
|
+import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionAttach;
|
|
import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionEnterprise;
|
|
import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionEnterprise;
|
|
import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionEnterpriseMapper;
|
|
import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionEnterpriseMapper;
|
|
|
|
+import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionAttachService;
|
|
import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionEnterpriseService;
|
|
import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionEnterpriseService;
|
|
import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
|
|
import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
|
|
import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
|
|
import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
|
|
@@ -30,6 +32,9 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl extends BaseSer
|
|
@Autowired
|
|
@Autowired
|
|
private ICenterdataTEquipmentCameraService centerdataTEquipmentCameraService;
|
|
private ICenterdataTEquipmentCameraService centerdataTEquipmentCameraService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ICenterdataTHousingconstructionAttachService attachService;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 查询住建-企业信息
|
|
* 查询住建-企业信息
|
|
*
|
|
*
|
|
@@ -39,7 +44,7 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl extends BaseSer
|
|
@Override
|
|
@Override
|
|
public CenterdataTHousingconstructionEnterprise selectCenterdataTHousingconstructionEnterpriseById(String id) {
|
|
public CenterdataTHousingconstructionEnterprise selectCenterdataTHousingconstructionEnterpriseById(String id) {
|
|
CenterdataTHousingconstructionEnterprise data = centerdataTHousingconstructionEnterpriseMapper.selectCenterdataTHousingconstructionEnterpriseById(id);
|
|
CenterdataTHousingconstructionEnterprise data = centerdataTHousingconstructionEnterpriseMapper.selectCenterdataTHousingconstructionEnterpriseById(id);
|
|
-// data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
|
|
|
|
|
|
+ data.setAttachPaths(attachService.getAttachPathToStr(id));
|
|
return data;
|
|
return data;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -67,6 +72,7 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl extends BaseSer
|
|
centerdataTHousingconstructionEnterprise.setCreateTime(DateUtils.getNowDate());
|
|
centerdataTHousingconstructionEnterprise.setCreateTime(DateUtils.getNowDate());
|
|
centerdataTHousingconstructionEnterprise.setCreateBy(SecurityUtils.getUserId().toString());
|
|
centerdataTHousingconstructionEnterprise.setCreateBy(SecurityUtils.getUserId().toString());
|
|
centerdataTHousingconstructionEnterprise.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
|
|
centerdataTHousingconstructionEnterprise.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
|
|
|
|
+ addAttachPicture(centerdataTHousingconstructionEnterprise);
|
|
return centerdataTHousingconstructionEnterpriseMapper.insertCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
|
|
return centerdataTHousingconstructionEnterpriseMapper.insertCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -81,9 +87,17 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl extends BaseSer
|
|
centerdataTHousingconstructionEnterprise.setUpdateTime(DateUtils.getNowDate());
|
|
centerdataTHousingconstructionEnterprise.setUpdateTime(DateUtils.getNowDate());
|
|
centerdataTHousingconstructionEnterprise.setUpdateBy(SecurityUtils.getUserId());
|
|
centerdataTHousingconstructionEnterprise.setUpdateBy(SecurityUtils.getUserId());
|
|
centerdataTHousingconstructionEnterprise.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
|
|
centerdataTHousingconstructionEnterprise.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
|
|
|
|
+ addAttachPicture(centerdataTHousingconstructionEnterprise);
|
|
return centerdataTHousingconstructionEnterpriseMapper.updateCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
|
|
return centerdataTHousingconstructionEnterpriseMapper.updateCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private void addAttachPicture(CenterdataTHousingconstructionEnterprise centerdataTHousingconstructionEnterprise){
|
|
|
|
+ attachService.delAttachByBusId(centerdataTHousingconstructionEnterprise.getId());
|
|
|
|
+ if(StringUtils.isNotEmpty(centerdataTHousingconstructionEnterprise.getAttachPaths())){
|
|
|
|
+ attachService.addAttach(centerdataTHousingconstructionEnterprise.getAttachPaths(), centerdataTHousingconstructionEnterprise.getId(), "picture", null,"");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 批量删除住建-企业信息
|
|
* 批量删除住建-企业信息
|
|
*
|
|
*
|