功能完善

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

@@ -25,7 +25,6 @@ import com.ims.eval.service.custom.PostUserService;
 import com.ims.eval.util.ExcelUtil;
 import com.ims.eval.util.ExcelUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -416,24 +415,25 @@ public class DeptAssessmentDeclarationController {
 						 @RequestParam(value = "stage") String stage) throws IOException {
 		try {
 			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
-			HttpHeaders headers = new HttpHeaders();
-			headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-			headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
-			headers.add("code", request.getHeader("code"));
-
-			HttpEntity<Map> param = new HttpEntity<>(null, headers);
-			ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() + "/bpm/instance/getOpinion?instId={1}", HttpMethod.POST, param, String.class, deptAssessmentDeclaration.getInstId());
-			log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
-			if (200 == responseEntity2.getStatusCodeValue()) {
-				JSONObject jsonObject = JSON.parseObject(responseEntity2.getBody());
-				if ("200".equals(jsonObject.getString("code"))) {
-					String data = jsonObject.getString("data");
-					ObjectMapper objectMapper = new ObjectMapper();
-					Object[] jsonArray = objectMapper.readValue(data, Object[].class);
-					if (jsonArray.length > 1){
-						String lastItemJson = objectMapper.writeValueAsString(jsonArray[jsonArray.length - 1]);
-						//processState = JSON.parseObject(lastItemJson).getString("taskName");
-						stage = JSON.parseObject(lastItemJson).getString("taskName");
+			if (!"驳回".equals(stage)){
+				HttpHeaders headers = new HttpHeaders();
+				headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+				headers.add("Blade-Auth", request.getHeader("Blade-Auth"));
+				headers.add("code", request.getHeader("code"));
+
+				HttpEntity<Map> param = new HttpEntity<>(null, headers);
+				ResponseEntity<String> responseEntity2 = restTemplate.exchange(imaConfig.getFlowUrl() + "/bpm/instance/getOpinion?instId={1}", HttpMethod.POST, param, String.class, deptAssessmentDeclaration.getInstId());
+				log.info("\n code:{}\n header:{}\n body:{}\n", responseEntity2.getStatusCodeValue(), responseEntity2.getHeaders(), responseEntity2.getBody());
+				if (200 == responseEntity2.getStatusCodeValue()) {
+					JSONObject jsonObject = JSON.parseObject(responseEntity2.getBody());
+					if ("200".equals(jsonObject.getString("code"))) {
+						String data = jsonObject.getString("data");
+						ObjectMapper objectMapper = new ObjectMapper();
+						Object[] jsonArray = objectMapper.readValue(data, Object[].class);
+						if (jsonArray.length > 1){
+							String lastItemJson = objectMapper.writeValueAsString(jsonArray[jsonArray.length - 1]);
+							stage = JSON.parseObject(lastItemJson).getString("taskName");
+						}
 					}
 				}
 			}

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

@@ -3,20 +3,20 @@ package com.ims.eval.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.DateUtils;
 import com.ims.common.utils.StringUtils;
-import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
-import com.ims.eval.entity.EvaluationWarningInfo;
 import com.ims.eval.dao.EvaluationWarningInfoMapper;
+import com.ims.eval.entity.EvaluationWarningInfo;
 import com.ims.eval.entity.dto.response.MyuserResDTO;
 import com.ims.eval.service.IEvaluationWarningInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.eval.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 
 /**
@@ -71,9 +71,9 @@ public class EvaluationWarningInfoServiceImpl extends ServiceImpl<EvaluationWarn
 				warningInfo.setUserName(user.getName());
 				warningInfo.setUserCode(code);
 				warningInfo.setDeptId(user.getDeptId());
+				warningInfo.setConfirmTime(new Date());
 			}
 		}
-
 		return saveOrUpdate(warningInfo);
 	}
 }