增加城市代码

core/src/main/java/com/mooctest/crowd/domain/controller/CrowdTestProjectController.java

@@ -2,6 +2,7 @@ package com.mooctest.crowd.domain.controller;
 
 import com.google.gson.Gson;
 import com.mooctest.crowd.domain.domainobject.*;
+import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -224,10 +225,13 @@ public class CrowdTestProjectController {
     @RequestMapping(value = "releaseProject/{userId}/{crowdTestProjectCode}", method = RequestMethod.GET)
     public String releaseCrowdTestProject(@PathVariable("userId") Long userId,@PathVariable("crowdTestProjectCode") String crowdTestProjectCode){
         CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectCode);
-        User user = userRepo.getByID(userId);
-        CrowdTestProject crowdTestProjectResult = user.releaseCrowdTestProject(crowdTestProject);
-        crowdTestProjectRepo.saveCrowdTestProject(crowdTestProjectResult);
-        return crowdTestProjectRepo.getByProjectCode(crowdTestProjectResult.getCode()).toString();
+        if(crowdTestProject.getUserId() == userId){
+            CrowdTestProject  crowdTestProjectResult = crowdTestProject.releaseCrowdTestProject();
+            crowdTestProjectRepo.saveCrowdTestProject(crowdTestProjectResult);
+            return crowdTestProjectRepo.getByProjectCode(crowdTestProjectResult.getCode()).toString();
+        }else{
+            throw new BadRequestException("当前项目不属于此用户");
+        }
     }
 
 
@@ -235,25 +239,68 @@ public class CrowdTestProjectController {
      * 对区域管理员的操作
      */
 
+//    /**
+//     * 接收项目（区域管理员）
+//     * @param regionalManagerId
+//     * @param crowdTestProjectCode
+//     * @return
+//     */
+//    @RequestMapping(value = "receiveProject/{regionalManagerId}/{crowdTestProjectCode}", method = RequestMethod.GET)
+//    public String receiveTaskByProjectCode(@PathVariable("regionalManagerId") Long regionalManagerId, @PathVariable("crowdTestProjectCode") String crowdTestProjectCode) {
+//        User userForRegionalManager = userRepo.getByID(regionalManagerId);
+//        RegionalManager regionalManager = userForRegionalManager.getRegionalManager();
+//
+//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectCode);
+//
+//        CrowdTestProject crowdTestProjectResult = regionalManager.receiveProject(crowdTestProject);
+//        crowdTestProjectRepo.saveCrowdTestProject(crowdTestProject);
+//        return crowdTestProjectResult.toString();
+//
+//    }
+
     /**
      * 接收项目（区域管理员）
-     * @param regionalManagerId
+     * @param userForRegionalManagerId
      * @param crowdTestProjectCode
      * @return
      */
-    @RequestMapping(value = "receiveProject/{regionalManagerId}/{crowdTestProjectCode}", method = RequestMethod.GET)
-    public String receiveTaskByProjectCode(@PathVariable("regionalManagerId") Long regionalManagerId, @PathVariable("crowdTestProjectCode") String crowdTestProjectCode) {
-        User userForRegionalManager = userRepo.getByID(regionalManagerId);
-        RegionalManager regionalManager = userForRegionalManager.getRegionalManager();
-
+    @RequestMapping(value = "receiveProject/{userForRegionalManagerId}/{crowdTestProjectCode}", method = RequestMethod.GET)
+    public String receiveTaskByProjectCode(@PathVariable("userForRegionalManagerId") Long userForRegionalManagerId, @PathVariable("crowdTestProjectCode") String crowdTestProjectCode) {
         CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectCode);
-
-        CrowdTestProject crowdTestProjectResult = regionalManager.receiveProject(crowdTestProject);
+        CrowdTestProject crowdTestProjectResult = crowdTestProject.receiveProject();
+        crowdTestProjectResult.setRegionalManagerId(userForRegionalManagerId);
         crowdTestProjectRepo.saveCrowdTestProject(crowdTestProject);
         return crowdTestProjectResult.toString();
-
     }
 
+//    /**
+//     * 项目中新建任务（区域管理员拆分项目）
+//     * @param crowdTestProjectCode
+//     * @param taskName
+//     * @return
+//     */
+//    @RequestMapping(value = "createTask/{regionalManagerId}/{crowdTestProjectCode}/{taskName}", method = RequestMethod.GET)
+//    public String createCrowdTestTask(@PathVariable("regionalManagerId") Long regionalManagerId,@PathVariable("crowdTestProjectCode") String crowdTestProjectCode,@PathVariable("taskName") String taskName){
+//        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectCode);
+//
+//        //数据准备
+//        CrowdTestTask crowdTestTask = new CrowdTestTask();
+//        crowdTestTask.setCode(crowdTestProjectCode+"_TASK"+System.currentTimeMillis());
+//        crowdTestTask.setName(taskName);
+//        crowdTestTask.setCrowdTestProjectCode(crowdTestProjectCode);
+//        crowdTestTask.setQuotedPrice(200.00);
+//        crowdTestTask.setDeadTime(new Timestamp(getNextDay(new Date(System.currentTimeMillis()),1).getTime()));
+//        crowdTestTask.setCreateTime(new Timestamp(System.currentTimeMillis()));
+//
+//        //具体操作
+//        User userForRegionalManager = userRepo.getByID(regionalManagerId);
+//        RegionalManager regionalManager = userForRegionalManager.getRegionalManager();
+//
+//        CrowdTestProject crowdTestProjectResult = regionalManager.createCrowdTestTask(crowdTestProject, crowdTestTask);
+//        crowdTestProjectRepo.saveCrowdTestProject(crowdTestProjectResult);
+//        return crowdTestProjectRepo.getByProjectCode(crowdTestProjectResult.getCode()).toString();
+//    }
+
     /**
      * 项目中新建任务（区域管理员拆分项目）
      * @param crowdTestProjectCode
@@ -262,8 +309,6 @@ public class CrowdTestProjectController {
      */
     @RequestMapping(value = "createTask/{regionalManagerId}/{crowdTestProjectCode}/{taskName}", method = RequestMethod.GET)
     public String createCrowdTestTask(@PathVariable("regionalManagerId") Long regionalManagerId,@PathVariable("crowdTestProjectCode") String crowdTestProjectCode,@PathVariable("taskName") String taskName){
-        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectCode);
-
         //数据准备
         CrowdTestTask crowdTestTask = new CrowdTestTask();
         crowdTestTask.setCode(crowdTestProjectCode+"_TASK"+System.currentTimeMillis());
@@ -277,6 +322,7 @@ public class CrowdTestProjectController {
         User userForRegionalManager = userRepo.getByID(regionalManagerId);
         RegionalManager regionalManager = userForRegionalManager.getRegionalManager();
 
+        CrowdTestProject crowdTestProject = crowdTestProjectRepo.getByProjectCode(crowdTestProjectCode);
         CrowdTestProject crowdTestProjectResult = regionalManager.createCrowdTestTask(crowdTestProject, crowdTestTask);
         crowdTestProjectRepo.saveCrowdTestProject(crowdTestProjectResult);
         return crowdTestProjectRepo.getByProjectCode(crowdTestProjectResult.getCode()).toString();

core/src/main/java/com/mooctest/crowd/domain/dao/RegionalDao.java

@@ -12,7 +12,7 @@ public interface RegionalDao extends PagingAndSortingRepository<RegionalPO, Long
 
     Optional<RegionalPO> findById(Long Id);
 
-    RegionalPO findByProvince(String province);
+//    RegionalPO findByProvince(String province);
 
     @Override
     Iterable<RegionalPO> findAllById(Iterable<Long> iterable);

core/src/main/java/com/mooctest/crowd/domain/domainobject/CrowdTestProject.java

@@ -75,6 +75,34 @@ public class CrowdTestProject {
                 '}';
     }
 
+    /**
+     * 发布项目（普通用户）
+     * @return
+     */
+    public CrowdTestProject releaseCrowdTestProject() {
+        if(this.status != (CrowdTestProjectStatus.HAS_RELEASED-1)){
+            throw new CrowdTestProjectException("当前项目状态不能被发布");
+        }else{
+            this.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
+        }
+        return this;
+    }
+
+    /**
+     * 区域管理员接收项目
+     * @return
+     */
+    public CrowdTestProject receiveProject() {
+        if(this.getRegionalManagerId() != null){
+            throw new CrowdTestProjectException("项目已被接收");
+        }else if(this.getStatus() != (CrowdTestProjectStatus.HAS_RECEIVED-1)){
+            throw new CrowdTestProjectException("项目不能被接收，项目状态为: " + this.getStatus());
+        }else{
+            this.setStatus(CrowdTestProjectStatus.HAS_RECEIVED);
+        }
+        return this;
+    }
+
 
     /**
      * 更新项目信息
@@ -247,6 +275,7 @@ public class CrowdTestProject {
         return this;
     }
 
+
     public void addTask(CrowdTestTask task){
         if (this.getStatus() != CrowdTestProjectStatus.HAS_RECEIVED && this.getStatus() != CrowdTestProjectStatus.HAS_SPLITED)
             throw new BaseException("当前阶段不允许创建新任务");
@@ -268,104 +297,4 @@ public class CrowdTestProject {
         return report.get();
     }
 
-//    /**
-//     * 设置任务和报告的数据
-//     * @return
-//     */
-//    public CrowdTestProject generateDefaultTaskAndReportData() {
-//        this.setCode("PROJ-"+ this.getName()); //换成名称
-//        this.setUserId(11L);
-//        this.setRegionalManagerId(13L);
-//        this.setProjectDistributionTypeId(1L);
-//        this.setDistributionProvince("江苏");
-//        this.setDistributionCity("南京");
-//        this.setFixedPrice(100000.00);
-//        this.setQuotedPrice(100000.00);
-//        this.setStatus(CrowdTestProjectStatus.HAS_FINISHED);
-//        this.setIsDeleted(DeletedStatus.isNotDeleted);
-//        this.setCreateTime(new Timestamp(getBeforeDay(new Date(System.currentTimeMillis()),5).getTime()));
-//        this.setDeadTime(new Timestamp(getBeforeDay(new Date(System.currentTimeMillis()),1).getTime()));
-//
-//        //初始化任务
-//        int taskCount = 1;
-//        List<CrowdTestTask> crowdTestTaskList = new ArrayList<>();
-//        for(int j = 0; j < taskCount; j++){
-//            CrowdTestTask crowdTestTask = new CrowdTestTask();
-//            crowdTestTask.setCode(this.getCode()+"-TASK-任务"+(j+1));
-//            crowdTestTask.setName(this.getName() + "-任务" + (j+1));
-//            crowdTestTask.setCrowdTestProjectCode(this.getCode());
-//            crowdTestTask.setEvaluationAgencyId(12L);
-//            crowdTestTask.setType("接口测试");
-//            crowdTestTask.setDistributionType(this.getProjectDistributionTypeId());
-//            crowdTestTask.setDistributionProvince(this.getDistributionProvince());
-//            crowdTestTask.setDistributionCity(this.getDistributionCity());
-//            crowdTestTask.setDescription("这是"+this.getName()+"测试项目的第"+(j+1)+"个测试任务");
-//            crowdTestTask.setQuotedPrice(this.getQuotedPrice() / taskCount);
-//            crowdTestTask.setFixedPrice(this.getFixedPrice() / taskCount);
-//            crowdTestTask.setStatus(CrowdTestTaskStatus.HAS_FINISHED);
-//            crowdTestTask.setIsDeleted(DeletedStatus.isNotDeleted);
-//            crowdTestTask.setCreateTime(new Timestamp(getBeforeDay(new Date(System.currentTimeMillis()),4).getTime()));
-//            crowdTestTask.setDeadTime(new Timestamp(getBeforeDay(new Date(System.currentTimeMillis()),2).getTime()));
-//
-//            //初始化任务报告
-//            int reportCount = 1;
-//            List<CrowdTestReport> crowdTestReportList = new ArrayList<>();
-//
-//            for(int k = 0; k < reportCount; k++){
-//                CrowdTestReport crowdTestReport = new CrowdTestReport();
-//                crowdTestReport.setCode(crowdTestTask.getCode()+"REPO-报告"+(k+1));
-//                crowdTestReport.setName(crowdTestTask.getName()+"-报告"+(k+1));
-//                crowdTestReport.setDependencyCode(crowdTestTask.getCode());
-//                crowdTestReport.setType("测试报告");
-//                crowdTestReport.setScope(0);
-//                crowdTestReport.setContent(crowdTestTask.getDescription()+"的第"+(k+1)+"的测试报告");
-//                crowdTestReport.setConclusion("TEST SUCCESS");
-//                crowdTestReport.setIsDeleted(DeletedStatus.isNotDeleted);
-//                crowdTestReport.setCreateTime(new Timestamp(getBeforeDay(new Date(System.currentTimeMillis()),3).getTime()));
-//                crowdTestReportList.add(crowdTestReport);
-//            }
-//            crowdTestTask.setCrowdTestReportList(crowdTestReportList);
-//            crowdTestTaskList.add(crowdTestTask);
-//        }
-//        //初始化项目报告
-//        CrowdTestReport crowdTestReportForProject = new CrowdTestReport();
-//        crowdTestReportForProject.setCode(this.getCode()+"-项目报告");
-//        crowdTestReportForProject.setName(this.getName()+"-项目报告");
-//        crowdTestReportForProject.setDependencyCode(this.getCode());
-//        crowdTestReportForProject.setType("项目可行性报告");
-//        crowdTestReportForProject.setScope(0);
-//        crowdTestReportForProject.setContent(this.getName()+"的项目报告");
-//        crowdTestReportForProject.setConclusion("PROJECT TEST SUCCESS");
-//        crowdTestReportForProject.setIsDeleted(DeletedStatus.isNotDeleted);
-//        crowdTestReportForProject.setCreateTime(new Timestamp(getBeforeDay(new Date(System.currentTimeMillis()),2).getTime()));
-//
-//        this.setCrowdTestReportForProject(crowdTestReportForProject);
-//        this.setCrowdTestTaskList(crowdTestTaskList);
-//
-//        return this;
-//    }
-//
-//    /**
-//     * 计算指定时间的后几天
-//     */
-//    private Date getNextDay(Date date, int day){
-//        //计算相关的时间间隔
-//        long addTime = 24*3600*1000;
-//        addTime *= day;
-//        //把时间间隔转换为毫秒数
-//        Date nextDate=new Date(date.getTime() + addTime);
-//        return nextDate;
-//    }
-//
-//    /**
-//     * 计算指定时间的前几天
-//     */
-//    private Date getBeforeDay(Date date, int day){
-//        //计算相关的时间间隔
-//        long subTime = 24*3600*1000;
-//        subTime *= day;
-//        //把时间间隔转换为毫秒数
-//        Date beforeDate=new Date(date.getTime() - subTime);
-//        return beforeDate;
-//    }
 }

core/src/main/java/com/mooctest/crowd/domain/domainobject/Province.java

@@ -0,0 +1,21 @@
+package com.mooctest.crowd.domain.domainobject;
+
+import lombok.Data;
+
+/**
+ * @author guochao
+ * @date 2019-07-30 10:31
+ */
+@Data
+public class Province {
+    private Long code;
+    private String name;
+
+    @Override
+    public String toString() {
+        return "Province{" +
+                "code=" + code +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}

core/src/main/java/com/mooctest/crowd/domain/domainobject/Regional.java

@@ -9,15 +9,15 @@ import lombok.Data;
 @Data
 public class Regional {
     private Long id;
-    private String province;
-    private String city;
+    private Long provinceCode;
+    private String name;
 
     @Override
     public String toString() {
         return "Regional{" +
                 "id=" + id +
-                ", province='" + province + '\'' +
-                ", city='" + city + '\'' +
+                ", provinceCode=" + provinceCode +
+                ", name='" + name + '\'' +
                 '}';
     }
 }

core/src/main/java/com/mooctest/crowd/domain/domainobject/RegionalManager.java

@@ -30,33 +30,33 @@ public class RegionalManager {
     }
 
 
-    /**
-     * 区域管理员接收项目
-     * @param crowdTestProject
-     * @return
-     */
-    public CrowdTestProject receiveProject(CrowdTestProject crowdTestProject) {
-        List<Regional> regionalList = this.getRegionalList();
-        if(crowdTestProject.getRegionalManagerId() != null){
-            throw new CrowdTestProjectException("项目已被接收");
-        }else if(crowdTestProject.getStatus() != (CrowdTestProjectStatus.HAS_RECEIVED-1)){
-            throw new CrowdTestProjectException("项目不能被接收，项目状态为: " + crowdTestProject.getStatus());
-        }else{
-            boolean couldReceive = false;
-            for(Regional regional : regionalList){
-                if(crowdTestProject.getDistributionProvince().equals(regional.getProvince())&&crowdTestProject.getDistributionCity().equals(regional.getCity())){
-                    couldReceive = true;
-                }
-            }
-            if(!couldReceive){
-                throw new CrowdTestProjectException("项目区域不符合区域管理员的要求");
-            }else{
-                crowdTestProject.setRegionalManagerId(this.getUserId());
-                crowdTestProject.setStatus(CrowdTestProjectStatus.HAS_RECEIVED);
-            }
-        }
-        return crowdTestProject;
-    }
+//    /**
+//     * 区域管理员接收项目
+//     * @param crowdTestProject
+//     * @return
+//     */
+//    public CrowdTestProject receiveProject(CrowdTestProject crowdTestProject) {
+//        List<Regional> regionalList = this.getRegionalList();
+//        if(crowdTestProject.getRegionalManagerId() != null){
+//            throw new CrowdTestProjectException("项目已被接收");
+//        }else if(crowdTestProject.getStatus() != (CrowdTestProjectStatus.HAS_RECEIVED-1)){
+//            throw new CrowdTestProjectException("项目不能被接收，项目状态为: " + crowdTestProject.getStatus());
+//        }else{
+//            boolean couldReceive = false;
+//            for(Regional regional : regionalList){
+//                if(crowdTestProject.getDistributionProvince().equals(regional.getProvince())&&crowdTestProject.getDistributionCity().equals(regional.getCity())){
+//                    couldReceive = true;
+//                }
+//            }
+//            if(!couldReceive){
+//                throw new CrowdTestProjectException("项目区域不符合区域管理员的要求");
+//            }else{
+//                crowdTestProject.setRegionalManagerId(this.getUserId());
+//                crowdTestProject.setStatus(CrowdTestProjectStatus.HAS_RECEIVED);
+//            }
+//        }
+//        return crowdTestProject;
+//    }
 
     /**
      * 创建测试任务

core/src/main/java/com/mooctest/crowd/domain/domainobject/User.java

@@ -69,19 +69,6 @@ public class User {
     }
 
 
-    /**
-     * 发布项目（普通用户）
-     * @param crowdTestProject
-     * @return
-     */
-    public CrowdTestProject releaseCrowdTestProject(CrowdTestProject crowdTestProject) {
-        if(crowdTestProject.getStatus() != (CrowdTestProjectStatus.HAS_RELEASED-1)){
-            throw new CrowdTestProjectException("当前项目状态不能被发布");
-        }else{
-            crowdTestProject.setStatus(CrowdTestProjectStatus.HAS_RELEASED);
-        }
-        return crowdTestProject;
-    }
 
     /**
      * 接收任务（测评机构）
@@ -133,73 +120,6 @@ public class User {
         return crowdTestProject;
     }
 
-//    /**
-//     * 提交测试报告（测评机构）
-//     * @param crowdTestProject
-//     * @param crowdTestTaskCode
-//     * @param crowdTestReportCode
-//     * @return
-//     */
-//    public CrowdTestProject commitCrowdTestReport(CrowdTestProject crowdTestProject, String crowdTestTaskCode, String crowdTestReportCode) {
-//        List<CrowdTestTask> crowdTestTaskList = crowdTestProject.getCrowdTestTaskList();
-//        List<CrowdTestTask> crowdTestTaskListResult = new ArrayList<>();
-//        for(CrowdTestTask crowdTestTask : crowdTestTaskList){
-//            if(crowdTestTask.getCode().equals(crowdTestTaskCode)){
-//                List<CrowdTestReport> crowdTestReportList = crowdTestTask.getCrowdTestReportList();
-//                List<CrowdTestReport> crowdTestReportListResult = new ArrayList<>();
-//                for(CrowdTestReport crowdTestReport : crowdTestReportList){
-//                    if(crowdTestReportCode.equals(crowdTestReport.getCode())){
-//                        if(CrowdTestReportStatus.COMMITED.equals(crowdTestReport.getStatus())){
-//                            throw new CrowdTestReportException("报告已被提交，不能再次提交");
-//                        }else if(CrowdTestReportStatus.CREATED.equals(crowdTestReport.getStatus())){
-//                            crowdTestReport.setStatus(CrowdTestReportStatus.COMMITED);
-//                            crowdTestReportListResult.add(crowdTestReport);
-//                        }else{
-//                            throw new CrowdTestReportException("报告状态有误");
-//                        }
-//                    }
-//                }
-//
-//                crowdTestTask.setCrowdTestReportList(crowdTestReportListResult);
-//            }
-//            crowdTestTaskListResult.add(crowdTestTask);
-//        }
-//        crowdTestProject.setCrowdTestTaskList(crowdTestTaskListResult);
-//        return crowdTestProject;
-//    }
-//
-//    /**
-//     * 提交所有测试报告（测评机构）
-//     * @param crowdTestProject
-//     * @param crowdTestTaskCode
-//     * @return
-//     */
-//    public CrowdTestProject commitAllCrowdTestReport(CrowdTestProject crowdTestProject, String crowdTestTaskCode) {
-//        List<CrowdTestTask> crowdTestTaskList = crowdTestProject.getCrowdTestTaskList();
-//        List<CrowdTestTask> crowdTestTaskListResult = new ArrayList<>();
-//        for(CrowdTestTask crowdTestTask : crowdTestTaskList){
-//            if(crowdTestTask.getCode().equals(crowdTestTaskCode)){
-//                List<CrowdTestReport> crowdTestReportList = crowdTestTask.getCrowdTestReportList();
-//                List<CrowdTestReport> crowdTestReportListResult = new ArrayList<>();
-//                for(CrowdTestReport crowdTestReport : crowdTestReportList){
-//                    if(CrowdTestReportStatus.COMMITED.equals(crowdTestReport.getStatus())){
-//                        throw new CrowdTestReportException("报告已被提交，不能再次提交");
-//                    }else if(CrowdTestReportStatus.CREATED.equals(crowdTestReport.getStatus())){
-//                        crowdTestReport.setStatus(CrowdTestReportStatus.COMMITED);
-//                        crowdTestReportListResult.add(crowdTestReport);
-//                    }else{
-//                        throw new CrowdTestReportException("报告状态有误");
-//                    }
-//                }
-//
-//                crowdTestTask.setCrowdTestReportList(crowdTestReportListResult);
-//            }
-//            crowdTestTaskListResult.add(crowdTestTask);
-//        }
-//        crowdTestProject.setCrowdTestTaskList(crowdTestTaskListResult);
-//        return crowdTestProject;
-//    }
-
     /**
      * 提交测试任务
      * @param crowdTestProject

core/src/main/java/com/mooctest/crowd/domain/model/ProvincePO.java

@@ -0,0 +1,30 @@
+package com.mooctest.crowd.domain.model;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * @author guochao
+ * @date 2019-07-30 10:31
+ */
+@Data
+@Entity
+@Table(name = "province")
+public class ProvincePO {
+    @Id
+    @Column(name = "P_CODE")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long code;
+
+    @Column(name = "P_NAME")
+    private String name;
+
+    @Override
+    public String toString() {
+        return "Province{" +
+                "code=" + code +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}

core/src/main/java/com/mooctest/crowd/domain/model/RegionalManagerPO.java

@@ -14,14 +14,14 @@ import javax.persistence.*;
 public class RegionalManagerPO {
 
     @Id
-    @Column(name = "RM_ID")
+    @Column(name = "RMTP_ID")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "RM_U_ID")
+    @Column(name = "RMTP_U_ID")
     private Long userId;
 
-    @Column(name = "RM_RL_ID")
+    @Column(name = "RMTP_R_CODE")
     private Long regionalId;
 
     @Override

core/src/main/java/com/mooctest/crowd/domain/model/RegionalPO.java

@@ -13,22 +13,22 @@ import javax.persistence.*;
 @Table(name = "regional")
 public class RegionalPO {
     @Id
-    @Column(name = "RL_ID")
+    @Column(name = "R_CODE")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "RL_PROVINCE")
-    private String province;
+    @Column(name = "R_P_CODE")
+    private Long provinceCode;
 
-    @Column(name = "RL_CITY")
-    private String city;
+    @Column(name = "R_NAME")
+    private String name;
 
     @Override
     public String toString() {
-        return "Regional{" +
+        return "RegionalPO{" +
                 "id=" + id +
-                ", province='" + province + '\'' +
-                ", city='" + city + '\'' +
+                ", provinceCode=" + provinceCode +
+                ", name='" + name + '\'' +
                 '}';
     }
 }

core/src/test/java/com/mooctest/crowd/domain/domainobject/UserTest.java

@@ -56,8 +56,8 @@ public class UserTest {
         user.setRoleList(roleList);
 
         regional.setId(1L);
-        regional.setCity(user.getCity());
-        regional.setProvince(user.getProvince());
+//        regional.set(user.getCity());
+//        regional.setProvince(user.getProvince());
         regionalList.add(regional);
 
         regionalManager.setId(1L);