更新

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

@@ -9,7 +9,7 @@ public interface TemplateDao extends JpaRepository<Template, Long> {
 
     List<Template> findAllByIdIn(List<Long> ids);
 
-    List<Template> findAllByAssignmentId(long assignmentId);
+    List<Template> findAllByActivityId(long assignmentId);
 
 
 }

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

@@ -21,17 +21,17 @@ import java.util.List;
 @Entity
 public class Activity implements Serializable {
 
-    static int TYPE_AUTO = 2;
-    static int TYPE_MANUAL = 1;
+  public  static int TYPE_AUTO = 2;
+    public   static int TYPE_MANUAL = 1;
 
-    static int NEED_AUDIT = 1;
-    static int NO_NEED_AUDIT = 2;
+    public   static int NEED_AUDIT = 1;
+    public    static int NO_NEED_AUDIT = 2;
 
     // 报送频度 按年 按年 按周 按月 按日 自动推送
-    static int FREQ_YEAR = 1;
-    static int FREQ_WEEK = 2;
-    static int FREQ_MONTH = 3;
-    static int FREQ_DAY = 4;
+    public   static int FREQ_YEAR = 1;
+    public    static int FREQ_WEEK = 2;
+    public   static int FREQ_MONTH = 3;
+    public    static int FREQ_DAY = 4;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -59,7 +59,7 @@ public class Activity implements Serializable {
     @CreationTimestamp
     private Timestamp createAt;
 
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "assignment")
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "activity")
     private List<Template> templateList;
 
     /*

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

@@ -13,9 +13,9 @@ import java.io.Serializable;
 @Entity
 public class User implements Serializable {
 
-    int ROLE_NORMAL = 1;
-    int ROLE_AUDIT = 2;
-    int ROLE_MANAGER = 3;
+  public static  int ROLE_NORMAL = 1;
+    public static   int ROLE_AUDIT = 2;
+    public static   int ROLE_MANAGER = 3;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -31,5 +31,5 @@ public class User implements Serializable {
     private int role;
 
 
-    @
+
 }

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

@@ -35,10 +35,10 @@ public class AssignmentService {
         Activity activity = new Activity();
         Timestamp now = Timestamp.valueOf(DateUtil.getDateTime());
         activity.setCreateAt(now);
-        activity.setNeedAudit(AssignmentConstant.NEED_AUDIT);
+        activity.setNeedAudit(Activity.NEED_AUDIT);
         activity.setName(form.getName());
         activity.setType(form.getType());
-        if (form.getType() == AssignmentConstant.TYPE_AUTO) {
+        if (form.getType() == Activity.TYPE_AUTO) {
 
         }
         activity.setUser(form.getUser());

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

@@ -42,7 +42,7 @@ public class TemplateService {
     }
 
     public List<Template> findAllByAssignmentId(long assignmentId) {
-        return templateDao.findAllByAssignmentId(assignmentId);
+        return templateDao.findAllByActivityId(assignmentId);
     }
 
     public void saveAll(List<Template> templateList) {

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

@@ -22,19 +22,19 @@ public class UserService {
     }
 
     public User getAudit() {
-        List<User> userList = userDao.findAllByRole(UserConstant.ROLE_AUDIT);
+        List<User> userList = userDao.findAllByRole(User.ROLE_AUDIT);
         User user = userList.get(0);
         return user;
     }
 
     public User getNormalUser() {
-        List<User> userList = userDao.findAllByRole(UserConstant.ROLE_NORMAL);
+        List<User> userList = userDao.findAllByRole(User.ROLE_NORMAL);
         User user = userList.get(0);
         return user;
     }
 
     public User getManager() {
-        List<User> userList = userDao.findAllByRole(UserConstant.ROLE_MANAGER);
+        List<User> userList = userDao.findAllByRole(User.ROLE_MANAGER);
         User user = userList.get(0);
         return user;
     }