|
@@ -63,6 +63,9 @@ public class TBDingController {
|
|
|
@Resource
|
|
|
TBServiceService tbServiceService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ TBCrmDetailService tbCrmDetailService;
|
|
|
+
|
|
|
@ApiOperation(value = "考勤明细")
|
|
|
@RequestMapping(value = "/detail", method = RequestMethod.POST)
|
|
|
@ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = TBDing.class) })
|
|
@@ -248,13 +251,14 @@ public class TBDingController {
|
|
|
}
|
|
|
List<SopInfoResult> sopInfo = new ArrayList<>();
|
|
|
for (String sopNo : sopNoList) {
|
|
|
+ TBCrmDetail tbCrmDetail = tbCrmDetailService.findBySopNo(sopNo);
|
|
|
SopInfoResult result = new SopInfoResult();
|
|
|
result.setSopNo(sopNo);
|
|
|
result.setCrmNo(tbCrm.getCrmNo());
|
|
|
result.setCrmName(tbCrm.getName());
|
|
|
result.setCustomId(crmProjectResult.getCustomId());
|
|
|
result.setCustomName(crmProjectResult.getCustomName());
|
|
|
- result.setCourseName(crmProjectResult.getCourseName());
|
|
|
+ result.setCourseName(tbCrmDetail.getCourseName());
|
|
|
ProductTypeEnum productTypeEnum = crmProjectResult.getCustomType();
|
|
|
if (Objects.nonNull(productTypeEnum)) {
|
|
|
result.setCustomType(productTypeEnum);
|