springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventVisitingTasksApi.java
@@ -8,10 +8,7 @@ import com.panzhihua.common.model.query.visit.EventVisitListQuery; import com.panzhihua.common.model.vos.IPageVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.visit.AppVisitTasksVO; import com.panzhihua.common.model.vos.visit.EventVisitCountVO; import com.panzhihua.common.model.vos.visit.EventVisitListVO; import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO; import com.panzhihua.common.model.vos.visit.*; import com.panzhihua.common.service.grid.GridService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -135,7 +132,7 @@ * @return */ @GetMapping("/detail/{id}") @ApiOperation(value = "待走访人员详情") @ApiOperation(value = "待走访人员详情",response = EventVisitingTasksDetailsVO.class) public R detail(@PathVariable("id") Long id){ return gridService.detail(id); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -217,7 +217,9 @@ BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO); JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()); eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson())); eventVisitingTasksDetailsVO.setOption(jsonObject.get("check") == null ?null:jsonObject.get("check").toString()); if(jsonObject != null && jsonObject.get("check") != null){ eventVisitingTasksDetailsVO.setOption(jsonObject.get("check").toString()); } return R.ok(eventVisitingTasksDetailsVO); } return R.fail();