评估报告管理页面修改

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

@@ -32,7 +32,7 @@ public class EvaluationController {
         evaluationService.save(evaluation);
         return ResponseEntity.ok(200);
     }
-    @ApiOperation("根据用户名查询输出")
+    @ApiOperation("根据用户名查询最新的报告输出")
     @GetMapping(value = "/{name}")
     public ResponseEntity getName(@PathVariable String name) {
         Evaluation evaluation = evaluationService.findByName(name);
@@ -41,10 +41,10 @@ public class EvaluationController {
         }
         return ResponseEntity.ok(null);
     }
-    @ApiOperation("根据用户名查询输如")
+    @ApiOperation("根据id查询输入")
     @GetMapping(value = "/in/{name}")
     public ResponseEntity getInName(@PathVariable String name) {
-        Evaluation evaluation = evaluationService.findByName(name);
+        Evaluation evaluation = evaluationService.findById(name);
         if(evaluation!=null){
             return ResponseEntity.ok(evaluation.getInEva());
         }

src/main/java/com/zjty/inspect/dao/EvaluationDao.java

@@ -3,9 +3,12 @@ package com.zjty.inspect.dao;
 import com.zjty.inspect.entity.Evaluation;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 public interface EvaluationDao extends JpaRepository<Evaluation,String>, JpaSpecificationExecutor<Evaluation> {
     Evaluation findByUsernameAndIdNot(String username,String id);
     Evaluation findByUsername(String username);
+    @Query(value = "SELECT * FROM evaluation WHERE username=:username AND create_time = (SELECT MAX(create_time) FROM evaluation WHERE username=:username)",nativeQuery = true)
+    Evaluation findByUsernameAndMaxCreateDate(String username);
 
 }

src/main/java/com/zjty/inspect/entity/Basis.java

 package com.zjty.inspect.entity;
 
-import com.github.junrar.Volume;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/zjty/inspect/entity/Evaluation.java

@@ -25,6 +25,8 @@ public class Evaluation {
     @Column( length = 48)
     private String id;
     private String username;
+    private Integer authority;
+    private String projectName;
     @Column(columnDefinition = "TEXT")
     private String inEva;
     @Column(columnDefinition = "TEXT")

src/main/java/com/zjty/inspect/service/EvaluationService.java

@@ -13,7 +13,7 @@ public interface EvaluationService {
     void update(Evaluation evaluation);
     void delete(String id);
     Page<Evaluation> findSearch(Map searchMap, int page, int size);
-
+    Evaluation findById(String id);
     Evaluation findByName(String name);
 
 }

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

@@ -21,6 +21,7 @@ import javax.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -29,18 +30,21 @@ public class EvaluationServiceImpl implements EvaluationService {
     private EvaluationDao evaluationDao;
     @Override
     public void save(Evaluation evaluation) {
-        Evaluation evaluation2 = evaluationDao.findByUsername(evaluation.getUsername());
-        if(evaluation2==null){
+        if(StringUtil.isNullOrEmpty(evaluation.getInEva())) {
+            return;
+        }
+        if(StringUtil.isNullOrEmpty(evaluation.getOutEva())) {
+            return;
+        }
+        if(StringUtil.isNullOrEmpty(evaluation.getUsername())){
+            return;
+        }
+        if(StringUtil.isNullOrEmpty(evaluation.getProjectName())){
+            return;
+        }
             String uuid = UUIDUtil.getUUID();
             evaluation.setId(uuid);
             evaluationDao.save(evaluation);
-        }else{
-            evaluation2.setId(evaluation2.getId());
-            evaluation2.setInEva(evaluation.getInEva());
-            evaluation2.setOutEva(evaluation.getOutEva());
-            evaluationDao.save(evaluation2);
-        }
-
     }
 
     @Override
@@ -71,9 +75,18 @@ public class EvaluationServiceImpl implements EvaluationService {
         return evaluationDao.findAll(specification, pageRequest);
     }
 
+    @Override
+    public Evaluation findById(String id) {
+        Optional<Evaluation> evaluation = evaluationDao.findById(id);
+        if(evaluation.isPresent()){
+            return evaluation.get();
+        }
+        return null;
+    }
+
     @Override
     public Evaluation findByName(String name) {
-        Evaluation evaluation = evaluationDao.findByUsername(name);
+        Evaluation evaluation = evaluationDao.findByUsernameAndMaxCreateDate(name);
         if(evaluation!=null){
             return evaluation;
         }
@@ -98,6 +111,12 @@ public class EvaluationServiceImpl implements EvaluationService {
                 if (searchMap.get("username") != null && !"".equals(searchMap.get("username"))) {
                     predicateList.add(cb.like(root.get("username").as(String.class), "%" + (String) searchMap.get("username") + "%"));
                 }
+                if (searchMap.get("projectName") != null && !"".equals(searchMap.get("projectName"))) {
+                    predicateList.add(cb.like(root.get("projectName").as(String.class), "%" + (String) searchMap.get("projectName") + "%"));
+                }
+                if (searchMap.get("projectName") != null && !"".equals(searchMap.get("projectName"))) {
+                    predicateList.add(cb.like(root.get("projectName").as(String.class), "%" + (String) searchMap.get("projectName") + "%"));
+                }
                 return cb.and(predicateList.toArray(new Predicate[predicateList.size()]));
 
             }