|
@@ -69,6 +69,9 @@ public class BmProjectServiceImpl implements IBmProjectService {
|
|
@Autowired
|
|
@Autowired
|
|
private BmProjectProductMapper bmProjectProductMapper;
|
|
private BmProjectProductMapper bmProjectProductMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private SysDictDataMapper sysDictDataMapper;
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* 查询项目(添加线索)
|
|
* 查询项目(添加线索)
|
|
@@ -78,7 +81,15 @@ public class BmProjectServiceImpl implements IBmProjectService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public BmProject selectBmProjectById(Long id) {
|
|
public BmProject selectBmProjectById(Long id) {
|
|
- return bmProjectMapper.selectBmProjectById(id);
|
|
|
|
|
|
+ BmProject bmProject = bmProjectMapper.selectBmProjectById(id);
|
|
|
|
+ List<SysDictData> dictDataList = sysDictDataMapper.selectDictDataByType("project_industry");
|
|
|
|
+ for (SysDictData sysDictData : dictDataList) {
|
|
|
|
+ if (sysDictData.getDictValue().equals(bmProject.getIndustry())){
|
|
|
|
+ bmProject.setIndustry(sysDictData.getDictLabel());
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return bmProject;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -164,7 +175,6 @@ public class BmProjectServiceImpl implements IBmProjectService {
|
|
return AjaxResult.error("项目id为NULL");
|
|
return AjaxResult.error("项目id为NULL");
|
|
}
|
|
}
|
|
Long code = bmProjectStatus.getCode();
|
|
Long code = bmProjectStatus.getCode();
|
|
-
|
|
|
|
synchronized (this) {
|
|
synchronized (this) {
|
|
BmProject bmProject = bmProjectMapper.selectBmProjectById(projectId);
|
|
BmProject bmProject = bmProjectMapper.selectBmProjectById(projectId);
|
|
//获取当前状态
|
|
//获取当前状态
|
|
@@ -271,7 +281,6 @@ public class BmProjectServiceImpl implements IBmProjectService {
|
|
bmProjectMapper.updateBmProject(bmProjectNew);
|
|
bmProjectMapper.updateBmProject(bmProjectNew);
|
|
}
|
|
}
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|