代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -735,14 +735,14 @@ public class DeptAssessmentDeclarationController {
 	 * @return 结果
 	 */
 	@GetMapping(value = "processInformation/{instId}")
-	public JSONObject processInformation(@PathVariable String instId) {
-		JSONObject json = null;
+	public R processInformation(@PathVariable String instId) {
+		Object obj = null;
 		try {
-			json = deptAssessmentDeclarationService.processInformation(instId, request);
+			obj = deptAssessmentDeclarationService.processInformation(instId, request);
 		} catch (Exception e) {
 			log.error("错误", e);
 			return null;
 		}
-		return json;
+		return R.ok().data(obj);
 	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptAssessmentDeclarationService.java

@@ -23,5 +23,5 @@ public interface IDeptAssessmentDeclarationService extends IService<DeptAssessme
 
 	boolean editState(String id, String state, String instId);
 
-	JSONObject processInformation(String instId, HttpServletRequest request);
+	Object processInformation(String instId, HttpServletRequest request);
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptAssessmentDeclarationServiceImpl.java

@@ -19,6 +19,7 @@ import com.ims.eval.entity.DeptAssessmentDeclarationContent;
 import com.ims.eval.entity.EvaluationDept;
 import com.ims.eval.entity.EvaluationDeptRating;
 import com.ims.eval.entity.dto.request.UserDTO;
+import com.ims.eval.entity.dto.result.ResultInfo;
 import com.ims.eval.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -206,16 +207,15 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	}
 
 	@Override
-	public JSONObject processInformation(String instId, HttpServletRequest request) {
+	public Object processInformation(String instId, HttpServletRequest request) {
 		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
 		headers.add("Blade-Auth", "bearer " + request.getHeader("Blade-Auth"));
 		HttpEntity<LinkedMultiValueMap<String, Object>> param = new HttpEntity<>(null, headers);
-		ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() + "bpm/instance/getOpinion?instId={1}",
-			HttpMethod.GET, param, String.class, instId);
-
+		ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() + "bpm/instance/getOpinion?instId={1}", HttpMethod.GET, param, String.class, instId);
 		log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
 		if (200 == responseEntity2.getStatusCodeValue()) {
-			return JSON.parseObject(responseEntity2.getBody());
+			ResultInfo resultInfo = JSON.parseObject(responseEntity2.getBody(), ResultInfo.class);
+			return resultInfo.getData();
 		}
 		return null;
 	}