提交 1b165851 作者: xiaowang

修改包

上级 eed4af2d
...@@ -58,7 +58,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService { ...@@ -58,7 +58,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
@Autowired private RedisTemplate redisTemplate; @Autowired private RedisTemplate redisTemplate;
@Override @Override
public ResultBody addWorkService(ServiceVO param, Integer userAccountId) { public ResultBody addWorkService(ServiceVO param, Integer userAccountId) {
ServiceDO serviceDO = new ServiceDO(param, userAccountId); ServiceDO serviceDO = new ServiceDO(param, userAccountId);
...@@ -82,13 +81,16 @@ public class BackstageTaskServiceImpl implements BackstageTaskService { ...@@ -82,13 +81,16 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
} }
@Override @Override
public ResultBody<ServiceDTO> queryById(Integer id,HttpServletRequest request) { public ResultBody<ServiceDTO> queryById(Integer id, HttpServletRequest request) {
ServiceDO serviceDO = backstageTaskServiceDao.queryById(id); ServiceDO serviceDO = backstageTaskServiceDao.queryById(id);
String token = userAppApi.getCompanyInfoById(serviceDO.getCompanyId(), request.getHeader("token")); String token =
userAppApi.getCompanyInfoById(serviceDO.getCompanyId(), request.getHeader("token"));
JSONObject jsonObject = JSONObject.parseObject(token); JSONObject jsonObject = JSONObject.parseObject(token);
CompanyInfoDTO companyInfoDTO = JSON.parseObject(String.valueOf((JSONObject) jsonObject.get("result")), CompanyInfoDTO.class); CompanyInfoDTO companyInfoDTO =
JSON.parseObject(
String.valueOf((JSONObject) jsonObject.get("result")), CompanyInfoDTO.class);
String companyName = companyInfoDTO.getCompanyName(); String companyName = companyInfoDTO.getCompanyName();
ServiceDTO serviceDTO = new ServiceDTO(serviceDO,companyName); ServiceDTO serviceDTO = new ServiceDTO(serviceDO, companyName);
Map<Integer, String> categoriesNameMap = Map<Integer, String> categoriesNameMap =
getCategoriesNameByIds( getCategoriesNameByIds(
Arrays.asList(serviceDTO.getApplicationId(), serviceDTO.getIndustryId())); Arrays.asList(serviceDTO.getApplicationId(), serviceDTO.getIndustryId()));
...@@ -102,8 +104,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService { ...@@ -102,8 +104,6 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
return ResultBody.success(serviceDTO); return ResultBody.success(serviceDTO);
} }
private Map<Integer, String> getCategoriesNameByIds(List<Integer> ids) { private Map<Integer, String> getCategoriesNameByIds(List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) { if (CollectionUtils.isEmpty(ids)) {
return new HashMap<>(); return new HashMap<>();
...@@ -121,7 +121,8 @@ public class BackstageTaskServiceImpl implements BackstageTaskService { ...@@ -121,7 +121,8 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
} }
@Override @Override
public PageResult queryServiceManagerList(ServiceQO param, Integer userAccountId, CompanyInfoVO companyInfoVO) { public PageResult queryServiceManagerList(
ServiceQO param, Integer userAccountId, CompanyInfoVO companyInfoVO) {
int count = backstageTaskServiceDao.count(param); int count = backstageTaskServiceDao.count(param);
if (count == 0) { if (count == 0) {
return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count); return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
...@@ -174,9 +175,9 @@ public class BackstageTaskServiceImpl implements BackstageTaskService { ...@@ -174,9 +175,9 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count); return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
} }
List<ServiceDO> pageList = List<ServiceDO> pageList =
backstageTaskServiceDao.queryPageByLimit(param, categoriesIds, userIds); backstageTaskServiceDao.queryPageByLimit(param, categoriesIds, userIds);
List<WorkServiceDTO> workServiceDTOList = getWorkServiceDTOS(pageList,request); List<WorkServiceDTO> workServiceDTOList = getWorkServiceDTOS(pageList, request);
return PageResult.buildPage(pageNo, param.getPageSize(), count, workServiceDTOList); return PageResult.buildPage(pageNo, param.getPageSize(), count, workServiceDTOList);
} }
...@@ -203,20 +204,26 @@ public class BackstageTaskServiceImpl implements BackstageTaskService { ...@@ -203,20 +204,26 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
@Override @Override
public ResultBody queryByIdCount(Integer companyId) { public ResultBody queryByIdCount(Integer companyId) {
return ResultBody.success(backstageTaskServiceDao.queryByIdCount( companyId)); return ResultBody.success(backstageTaskServiceDao.queryByIdCount(companyId));
} }
private List<WorkServiceDTO> getWorkServiceDTOS(List<ServiceDO> pageList,HttpServletRequest request) { private List<WorkServiceDTO> getWorkServiceDTOS(
String companyInfoVOS= userAppApi.listCompanyPage(new CompanyInfoQO(1, 100000), request.getHeader("token") ); List<ServiceDO> pageList, HttpServletRequest request) {
String companyInfoVOS =
userAppApi.listCompanyPage(new CompanyInfoQO(1, 100000), request.getHeader("token"));
JSONObject jsonObject = JSON.parseObject(companyInfoVOS); JSONObject jsonObject = JSON.parseObject(companyInfoVOS);
JSONObject jsonObject1 = JSON.parseObject(String.valueOf(jsonObject.get("result"))); JSONObject jsonObject1 = JSON.parseObject(String.valueOf(jsonObject.get("result")));
List<CompanyInfoVO> companyInfoList = new Gson().fromJson(new Gson().toJson(jsonObject1.get("list")), new TypeToken<List<CompanyInfoVO>>(){}.getType()); List<CompanyInfoVO> companyInfoList =
new Gson()
.fromJson(
new Gson().toJson(jsonObject1.get("list")),
new TypeToken<List<CompanyInfoVO>>() {}.getType());
String companyName = ""; String companyName = "";
List<WorkServiceDTO> workServiceDTOList = new ArrayList<>(); List<WorkServiceDTO> workServiceDTOList = new ArrayList<>();
for (ServiceDO item : pageList) { for (ServiceDO item : pageList) {
for (CompanyInfoVO companyInfoVO : companyInfoList) { for (CompanyInfoVO companyInfoVO : companyInfoList) {
if (item.getCompanyId().equals(companyInfoVO.getId())){ if (item.getCompanyId().equals(companyInfoVO.getId())) {
companyName=companyInfoVO.getCompanyName(); companyName = companyInfoVO.getCompanyName();
} }
} }
List<InspComtDO> inspComtDOS = generateComments(item); List<InspComtDO> inspComtDOS = generateComments(item);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论