Browse Source

修改测评机构资源字段

guochao 6 years ago
parent
commit
b65402ebb6

File diff suppressed because it is too large
+ 0 - 0
core/src/main/java/com/mooctest/crowd/domain/controller/TestUserController.java


+ 1 - 1
core/src/main/java/com/mooctest/crowd/domain/dao/EvaluationAgencyResourceDao.java

@@ -15,7 +15,7 @@ public interface EvaluationAgencyResourceDao extends PagingAndSortingRepository<
 
     List<EvaluationAgencyResourcePO> findByEvaluationAgencyId(Long evaluationAgencyId);
 
-    List<EvaluationAgencyResourcePO> findByCountGreaterThanEqual(int professionalsFreeCount);
+//    List<EvaluationAgencyResourcePO> findByCountGreaterThanEqual(int professionalsFreeCount);
 
     List<EvaluationAgencyResourcePO> findAll();
 

+ 9 - 9
core/src/main/java/com/mooctest/crowd/domain/domainobject/EvaluationAgencyResource.java

@@ -12,9 +12,9 @@ public class EvaluationAgencyResource {
     private Long id;
     private Long evaluationAgencyId;
     private String type;
-    private int count;
-    private int freeCount;
-    private String description;
+    private String name;
+    private int totalNum;
+    private int availableNum;
 
     @Override
     public String toString() {
@@ -22,17 +22,17 @@ public class EvaluationAgencyResource {
                 "id=" + id +
                 ", evaluationAgencyId=" + evaluationAgencyId +
                 ", type='" + type + '\'' +
-                ", count=" + count +
-                ", freeCount=" + freeCount +
-                ", description='" + description + '\'' +
+                ", name='" + name + '\'' +
+                ", totalNum=" + totalNum +
+                ", availableNum=" + availableNum +
                 '}';
     }
 
     public EvaluationAgencyResource updateEvaluationAgencyResource(String[] resource){
         this.type = resource[0];
-        this.count = Integer.valueOf(resource[1]);
-        this.freeCount = Integer.valueOf(resource[2]);
-        this.description = resource[3];
+        this.name = resource[1];
+        this.totalNum = Integer.valueOf(resource[2]);
+        this.availableNum = Integer.valueOf(resource[3]);
         return this;
     }
 }

+ 9 - 9
core/src/main/java/com/mooctest/crowd/domain/model/EvaluationAgencyResourcePO.java

@@ -23,14 +23,14 @@ public class EvaluationAgencyResourcePO {
     @Column(name = "EAR_TYPE")
     private String type;
 
-    @Column(name = "EAR_COUNT")
-    private int count;
+    @Column(name = "EAR_NAME")
+    private String name;
 
-    @Column(name = "EAR_FREE_COUNT")
-    private int freeCount;
+    @Column(name = "EAR_TOTAL_NUM")
+    private int totalNum;
 
-    @Column(name = "EAR_DESCRIPTION")
-    private String description;
+    @Column(name = "EAR_AVAILABLE_NUM")
+    private int availableNum;
 
     @Override
     public String toString() {
@@ -38,9 +38,9 @@ public class EvaluationAgencyResourcePO {
                 "id=" + id +
                 ", evaluationAgencyId=" + evaluationAgencyId +
                 ", type='" + type + '\'' +
-                ", count=" + count +
-                ", freeCount=" + freeCount +
-                ", description='" + description + '\'' +
+                ", name='" + name + '\'' +
+                ", totalNum=" + totalNum +
+                ", availableNum=" + availableNum +
                 '}';
     }
 }

+ 2 - 1
core/src/test/java/com/mooctest/crowd/domain/repository/UserRepoTest.java

@@ -132,7 +132,8 @@ public class UserRepoTest {
         evaluationAgencyResourcePO = new EvaluationAgencyResourcePO();
         evaluationAgencyResourcePO.setId(1L);
         evaluationAgencyResourcePO.setEvaluationAgencyId(1L);
-        evaluationAgencyResourcePO.setCount(10);
+        evaluationAgencyResourcePO.setTotalNum(10);
+        evaluationAgencyResourcePO.setAvailableNum(5);
         evaluationAgencyResourcePOList.add(evaluationAgencyResourcePO);
     }
 

Some files were not shown because too many files changed in this diff