|
@@ -243,13 +243,13 @@ public class TBDingController {
|
|
|
cell.setServiceUnitName(service.getName());
|
|
|
List<TBCrm> crmInServiceList = tbCrmList.stream().filter(e -> serviceUnitId.equals(e.getServiceId()))
|
|
|
.distinct().collect(Collectors.toList());
|
|
|
+ List<SopInfoResult> sopInfo = new ArrayList<>();
|
|
|
for (TBCrm tbCrm : crmInServiceList) {
|
|
|
CrmProjectResult crmProjectResult = tbCrmService.findCrmProjectInfo(null, null, tbCrm.getCrmNo());
|
|
|
List<String> sopNoList = tbSopInfoService.findFlowPassageByCrmNo(tbCrm.getCrmNo());
|
|
|
if (CollectionUtils.isEmpty(sopNoList)) {
|
|
|
continue;
|
|
|
}
|
|
|
- List<SopInfoResult> sopInfo = new ArrayList<>();
|
|
|
for (String sopNo : sopNoList) {
|
|
|
TBCrmDetail tbCrmDetail = tbCrmDetailService.findBySopNo(sopNo);
|
|
|
SopInfoResult result = new SopInfoResult();
|
|
@@ -282,7 +282,6 @@ public class TBDingController {
|
|
|
@RequestMapping(value = "/ding_find_all_sop", method = RequestMethod.POST)
|
|
|
@ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = DingElementResult.class) })
|
|
|
public Result findDingAllSop() {
|
|
|
- SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
List<DingSopInfo> resultList = new ArrayList<>();
|
|
|
List<SopInfoResult> list = tbSopInfoService.findFlowByServiceId(null);
|
|
|
List<Long> serviceUnitIdList = list.stream().map(SopInfoResult::getServiceId).distinct().collect(Collectors.toList());
|