mcj:

src/main/java/com/zjty/inspect/config/WebSocketServer.java

@@ -132,7 +132,6 @@ public class WebSocketServer {
             for (WebSocketServer item : webSocketSet) {
                 item.session.getBasicRemote().sendText(JSON.toJSONString(map));
             }
-            log.info("发送了。。。");
         } catch (Exception e) {
             String info = ExceptionMessage.getStackTraceInfo(e);
             log.error("发生错误："+info);

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -150,7 +150,7 @@ public class EvaluationController {
             @ApiImplicitParam(name = "size", value = "每页记录数", required = true, paramType = "path", dataType = "int")
     })
     @RequestMapping(value = "/search/{page}/{size}", method = RequestMethod.POST)
-    @AuthAnnotation(code = {"000800"})
+    //@AuthAnnotation(code = {"000800"})
     public ServerResponse<PageResult<EvaReport>> findSearch(@RequestBody Map<String,String> searchMap, @PathVariable int page, @PathVariable int size) {
         Page<EvaReport> pageList = evaReportService.findSearch(searchMap, page, size);
         return ServerResponse.ok(new PageResult<>(pageList.getTotalElements(), pageList.getContent()));

src/main/java/com/zjty/inspect/service/impl/EvaReportServiceImpl.java

@@ -48,7 +48,7 @@ public class EvaReportServiceImpl implements EvaReportService {
                 if (searchMap.get("projectName") != null && !"".equals(searchMap.get("projectName"))) {
                     predicateList.add(cb.like(root.get("projectName").as(String.class), "%" + (String) searchMap.get("projectName") + "%"));
                 }
-                cb.equal(root.get("del").as(Integer.class),0);
+                predicateList.add(cb.equal(root.get("del").as(Integer.class),0));
                 return cb.and(predicateList.toArray(new Predicate[predicateList.size()]));
 
             }

src/main/java/com/zjty/inspect/utils/WpsUtil.java

@@ -25,7 +25,7 @@ public class WpsUtil {
         AssessmentReport assessmentReport = JSON.parseObject(evaluation.getOutEva(), AssessmentReport.class);
         Map keyValue = new HashMap<>();
         keyValue.put("username", reform.getUsername());
-        keyValue.put("mode", getMode(reform.getMode()));
+        keyValue.put("mode", RecastMethod.getByCode(assessmentReport.getRecastMethod()).getName());
         keyValue.put("projectName", reform.getProjectName());
         keyValue.put("codeUrl", reform.getCodeUrl());
         keyValue.put("codeName", reform.getCodeName());
@@ -142,14 +142,28 @@ public class WpsUtil {
         }
 
         DevelopLanguageSystem developLanguageSystem = reform.getDevelopLanguageSystem();
+        if(!"".equals(developLanguageSystem.getName())){
             keyValue.put("language", developLanguageSystem.getName());
-
+        }else{
+            keyValue.put("language",LanguageEnum.getByCode(assessmentReport.getLanguage()).getName());
+        }
         repairMap("devFrameworks", 13, developLanguageSystem.getDevFrameworks(), keyValue);
         repairMap("fontDevTechnologies", 13, developLanguageSystem.getFontDevTechnologies(), keyValue);
         repairMap("csDevTechnologies", 13, developLanguageSystem.getCsDevTechnologies(), keyValue);
         repairMap("opGAs", 13, developLanguageSystem.getOpGAs(), keyValue);
+        if(!developLanguageSystem.getDevLanguages().isEmpty()){
             repairMap("devLanguages", 13, developLanguageSystem.getDevLanguages(), keyValue);
-
+        }else{
+            List<Integer> languages = assessmentReport.getLanguages();
+            ArrayList<BaseDes> list = new ArrayList<>();
+            for (Integer language : languages) {
+                BaseDes baseDes = new BaseDes();
+                baseDes.setName(LanguageEnum.getByCode(language).getName());
+                baseDes.setCode(language);
+                list.add(baseDes);
+            }
+            repairMap("devLanguages", 13, list, keyValue);
+        }
 
         LocalSystemDep localSystemDep = reform.getLocalSystemDep();
         keyValue.put("localSystemDepName", localSystemDep.getName());