core

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

@@ -72,17 +72,17 @@ public class QtkServiceHall extends StringPropertyUUIDEntity {
     @Size(max = 20)
     @Column(name = "BANK_ACCOUNT")
     private String bankAccount;//银行账号
-    @Column(name = "CREATE_TIME")
-    private LocalDateTime createTime;//创建时间
-    @Size(max = 60)
-    @Column(name = "AGENCY_NAME")
-    private String agencyName;//机构名称
-    @Size(max = 20)
-    @Column(name = "AGENCY_CODE")
-    private String agencyCode;//机构代码
-    @Size(max = 32)
-    @Column(name = "DEVICE_CONFIG_FK")
-    private String deviceConfigFk;
+    //===============================用不上==============================
+//    @Size(max = 60)
+//    @Column(name = "AGENCY_NAME")
+//    private String agencyName;//机构名称
+//    @Size(max = 20)
+//    @Column(name = "AGENCY_CODE")
+//    private String agencyCode;//机构代码
+//    @Size(max = 32)
+//    @Column(name = "DEVICE_CONFIG_FK")
+//    private String deviceConfigFk;
+    //====================================================================
     @Size(max = 100)
     @Column(name = "REGION")
     private String region;//地区
@@ -96,14 +96,20 @@ public class QtkServiceHall extends StringPropertyUUIDEntity {
     @Size(max = 128)
     @Column(name = "AREA")
     private String area;//地区
-    @Column(name = "LONG_ITUDE")
-    private Double longItude;//经度
-    @Column(name = "LAT_ITUDE")
-    private Double latItude;//维度
+    @Column(name = "LONGITUDE")
+    private Double longitude;//经度
+    @Column(name = "LATITUDE")
+    private Double latitude;//维度
     @Column(name = "RADIAL")
     private Integer radial;//半径距离
     @Size(max = 255)
     @Column(name = "INFO")
     private String info;//备注
+    @Column(name = "STATE")
+    private Integer state = 1;//状态，1启用，0停用
+    @Column(name = "INSERT_TIME")
+    private LocalDateTime insertTime = LocalDateTime.now();//创建时间
+    @Column(name = "UPDATE_TIME")
+    private LocalDateTime updateTime = LocalDateTime.now();//更改时间
 
 }

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

@@ -28,10 +28,10 @@ public class QtkServicehallLocation extends StringPropertyUUIDEntity {
 	@Size(max = 11)
 	@Column(name = "AGENCY_ID")
 	private String agencyId;//渠道编号
-	@NotBlank
-	@Size(max = 150)
-	@Column(name = "AGENCY_NAME")
-	private String agencyName;//渠道名称
+//	@NotBlank
+//	@Size(max = 150)
+//	@Column(name = "AGENCY_NAME")
+//	private String agencyName;//渠道名称
 	@NotBlank
 	@Size(max = 19)
 	@Column(name = "SERVICEHALL_ID")
@@ -59,6 +59,6 @@ public class QtkServicehallLocation extends StringPropertyUUIDEntity {
 	private Integer radial;//半径距离
 	@NotNull
 	@Column(name = "INSERT_TIME")
-	private LocalDateTime insertTime;//入库时间
+	private LocalDateTime insertTime = LocalDateTime.now();//入库时间
 
 }

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

@@ -0,0 +1,36 @@
+package cn.com.taiji.core.entity.basic;
+
+import java.time.LocalDateTime;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+* 网点映射表
+*
+*/
+@Getter
+@Setter
+@Entity
+@Table(name = "QTK_SERVICEHALL_MAP")
+public class QtkServicehallMap extends StringPropertyUUIDEntity {
+
+	@Size(max = 64)
+	@Column(name = "CENTER_SERVICEHALL_ID")
+	private String centerServicehallId;
+	@Size(max = 200)
+	@Column(name = "CENTER_SERVICEHALL_NAME")
+	private String centerServicehallName;
+	@Column(name = "INSERT_TIME")
+	private LocalDateTime insertTime = LocalDateTime.now();
+
+
+
+
+
+}

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

@@ -2,7 +2,14 @@ package cn.com.taiji.core.repo.jpa.basic;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkAgency;
+import cn.com.taiji.core.entity.basic.QtkServiceHall;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 public interface QtkAgencyRepo extends AbstractJpaRepo<QtkAgency, String>{
 
+    @Query("from QtkAgency where agencyId in ?1 ")
+    List<QtkAgency> listByAgencyIds(List<String> agencyIds);
+
 }

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

@@ -2,7 +2,20 @@ package cn.com.taiji.core.repo.jpa.basic;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkServicehallLocation;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 public interface QtkServicehallLocationRepo extends AbstractJpaRepo<QtkServicehallLocation, String>{
 
+    List<QtkServicehallLocation> findByServicehallId(String hallId);
+
+    @Transactional
+    @Modifying
+    @Query("delete from QtkServicehallLocation where servicehallId=?1  ")
+    int deleteByHallId(String hallId);
+
+
 }

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

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.basic;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.basic.QtkServicehallMap;
+
+public interface QtkServicehallMapRepo extends AbstractJpaRepo<QtkServicehallMap, String>{
+
+}

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

@@ -2,7 +2,38 @@ package cn.com.taiji.core.repo.jpa.basic;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 public interface QtkServicehallRepo extends AbstractJpaRepo<QtkServiceHall, String>{
 
+    @Query("from QtkServiceHall where serviceHallId in ?1 ")
+    List<QtkServiceHall> listBySuperServiceHallIds(List<String> serviceHallIds);
+
+    /***
+     * 根据机构号获取网点编号信息
+     * @param agencyId 机构号
+     * @return 、
+     */
+    @Query("SELECT serviceHallId FROM QtkServiceHall WHERE agencyId = ?1")
+    List<String> findSerHalIdByAgencyId(String agencyId);
+
+    QtkServiceHall findByAgencyIdAndName(String agencyId, String name);
+
+    QtkServiceHall findByServiceHallId(String serviceHallId);
+
+    List<QtkServiceHall> findBySuperServiceHallId(String servicehallId);
+
+    //更改状态
+    @Modifying
+    @Transactional
+    @Query("update  QtkServiceHall set state =?1 ,updateTime = ?2 where serviceHallId = ?3")
+    int updateState(Integer state, LocalDateTime updateTime, String serviceHallId);
+
+
+
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/StaffRepo.java

@@ -10,4 +10,6 @@ public interface StaffRepo extends AbstractJpaRepo<Staff, String> {
     @Query("from Staff where openId=?1")
     Staff findByopenIdTwo(String openId);
 
+    Staff findByStaffId(String staffId);
+
 }