更新

src/main/java/com/keymobile/rest/controller/UserController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
-@Api(value = "用户/机构 控制器")
+@Api(value = "用户/机构/补录范围 控制器")
 @RestController
 @RequestMapping(path = "/api")
 public class UserController {
@@ -36,6 +36,12 @@ public class UserController {
         return ApiResponse.ok();
     }
 
+    @ApiOperation(value = "获取补录范围列表")
+    @PostMapping(value = "/extent/list")
+    public ApiResponse getExtentList() {
+//        List<User> userList = userService.findAllByRole(UserConstant.ROLE_NORMAL);
+        return ApiResponse.ok();
+    }
 
     @ApiOperation(value = "获取机构数据")
     @PostMapping(value = "/group/list")

src/main/java/com/keymobile/rest/dao/RecordScopeDao.java

+package com.keymobile.rest.dao;
+
+import com.keymobile.rest.model.RecordScope;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface RecordScopeDao extends JpaRepository<RecordScope, Long> {
+}

src/main/java/com/keymobile/rest/model/Group.java

 package com.keymobile.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -37,6 +38,12 @@ public class Group implements Serializable {
     @Column(name = "parent_id", columnDefinition = ("bigint(22) default 0 comment '父机构id'"))
     private long parentId;
 
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "group")
+    @JsonIgnore
+    private List<RecordScope> recordScopeList;
+
     @Transient
     private List<Group> children;
+
+
 }

src/main/java/com/keymobile/rest/model/RecordScope.java

+package com.keymobile.rest.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @name 补录范围
+ * @desc
+ */
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"})
+@NoArgsConstructor
+@Data
+@Entity
+@Table(name = "t_record_scope")
+public class RecordScope implements Serializable {
+
+    public static int ROLE_RECORD = 1;
+    public static int ROLE_AUDIT = 2;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column(nullable = false, columnDefinition = ("integer(2) comment '补录角色'"))
+    private int role;
+
+    @ManyToOne
+    private Group group;
+
+    @ManyToOne
+    private User user;
+}

src/main/java/com/keymobile/rest/model/User.java

 package com.keymobile.rest.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.List;
 
 @JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"})
 @NoArgsConstructor
@@ -29,4 +31,11 @@ public class User implements Serializable {
      */
     @ManyToOne(fetch = FetchType.EAGER)
     private Group group;
+
+    /**
+     * 关联的补录范围
+     */
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "user")
+    @JsonIgnore
+    private List<RecordScope> recordScopeList;
 }

src/main/java/com/keymobile/rest/service/RecordScopeService.java

+package com.keymobile.rest.service;
+
+import com.keymobile.rest.dao.RecordScopeDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RecordScopeService {
+
+    @Autowired
+    private RecordScopeDao recordScopeDao;
+
+
+}

src/main/resources/application-test.yml

@@ -18,7 +18,7 @@ spring:
     show-sql: true
     database-platform: org.hibernate.dialect.MySQL5Dialect
 #    hibernate:
-  #      ddl-auto: update
+#        ddl-auto: update
   datasource:
     url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root