|
@@ -1,13 +1,17 @@
|
|
package com.fdkankan.fusion.controller;
|
|
package com.fdkankan.fusion.controller;
|
|
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.fdkankan.fusion.entity.TmProject;
|
|
import com.fdkankan.fusion.exception.BusinessException;
|
|
import com.fdkankan.fusion.exception.BusinessException;
|
|
import com.fdkankan.fusion.common.ResultData;
|
|
import com.fdkankan.fusion.common.ResultData;
|
|
import com.fdkankan.fusion.entity.CaseEntity;
|
|
import com.fdkankan.fusion.entity.CaseEntity;
|
|
import com.fdkankan.fusion.request.CaseParam;
|
|
import com.fdkankan.fusion.request.CaseParam;
|
|
|
|
+import com.fdkankan.fusion.response.CaseVo;
|
|
import com.fdkankan.fusion.service.ICaseNumService;
|
|
import com.fdkankan.fusion.service.ICaseNumService;
|
|
import com.fdkankan.fusion.service.ICaseService;
|
|
import com.fdkankan.fusion.service.ICaseService;
|
|
|
|
+import com.fdkankan.fusion.service.ITmProjectService;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -21,6 +25,8 @@ public class CaseController extends BaseController{
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
ICaseService caseService;
|
|
ICaseService caseService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ITmProjectService tmProjectService;
|
|
|
|
|
|
@PostMapping("/list")
|
|
@PostMapping("/list")
|
|
public ResultData list(@RequestBody CaseParam param ){
|
|
public ResultData list(@RequestBody CaseParam param ){
|
|
@@ -59,7 +65,17 @@ public class CaseController extends BaseController{
|
|
|
|
|
|
@GetMapping("/getInfo")
|
|
@GetMapping("/getInfo")
|
|
public ResultData getInfo(@RequestParam(required = false)Integer caseId){
|
|
public ResultData getInfo(@RequestParam(required = false)Integer caseId){
|
|
- return ResultData.ok(caseService.getById(caseId));
|
|
|
|
|
|
+ CaseEntity caseEntity = caseService.getById(caseId);
|
|
|
|
+ if(caseEntity == null){
|
|
|
|
+ return ResultData.ok();
|
|
|
|
+ }
|
|
|
|
+ CaseVo caseVo = new CaseVo();
|
|
|
|
+ BeanUtil.copyProperties(caseEntity,caseVo);
|
|
|
|
+ if(caseEntity.getTmProjectId() != null){
|
|
|
|
+ TmProject tmProject = tmProjectService.getById(caseEntity.getTmProjectId());
|
|
|
|
+ caseVo.setTmProject(tmProject);
|
|
|
|
+ }
|
|
|
|
+ return ResultData.ok(caseVo);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|