core

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkAgency.java

@@ -5,9 +5,7 @@ import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -111,6 +109,7 @@ public class QtkAgency extends StringPropertyUUIDEntity {
     private String merchantId;//商户号*/
     @NotNull
     @Column(name = "STATUS")
+    @Enumerated(EnumType.STRING)
     private EnableStatus status = EnableStatus.ENABLE;
    /* @Size(max = 64)
     @Column(name = "AGREEMENT_NAME")

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkServiceHall.java

@@ -37,7 +37,6 @@ public class QtkServiceHall extends StringPropertyUUIDEntity {
     @Size(max = 150)
     @Column(name = "NAME")
     private String name;//名称
-    @NotBlank
     @Size(max = 20)
     @Column(name = "SUPER_SERVICEHALL_ID")
     private String superServiceHallId;//上级网点

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkAgencyRepo.java

@@ -18,6 +18,8 @@ public interface QtkAgencyRepo extends AbstractJpaRepo<QtkAgency, String>{
     QtkAgency findByAgencyId(String agencyId);
 
     QtkAgency findByName(String name);
+    @Query("from QtkAgency where status = 'ENABLE' ")
+    List<QtkAgency> findAllEnable();
 
     @Query(nativeQuery = true, value = "SELECT AGENCY_ID FROM QTK_AGENCY ")
     List<String> findAllAgencyId();