core

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueSingleEquity.java

@@ -38,6 +38,7 @@ public class IssueSingleEquity extends StringPropertyUUIDEntity {
 	@Column(name = "CHARGE_TYPE")
 	private Integer chargeType;//收费类型 字典取CHARGE_TYPE
 	@Column(name = "DISCOUNT_PRICE")
+	@NotNull
 	private Long discountPrice;//优惠售价
 	@Size(max = 200)
 	@Column(name = "COST_DESCRIPTION")

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/excel/AbstractListener.java → gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/easyExcel/AbstractListener.java

@@ -1,14 +1,12 @@
-package cn.com.taiji.core.manager.tools.excel;
+package cn.com.taiji.core.manager.tools.easyExcel;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.manager.tools.excel.annotations.ExcelFiledNotBlank;
-import cn.com.taiji.core.manager.tools.excel.annotations.ExcelFiledNotNull;
+import cn.com.taiji.core.manager.tools.easyExcel.annotations.ExcelFiledNotBlank;
+import cn.com.taiji.core.manager.tools.easyExcel.annotations.ExcelFiledNotNull;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.util.ListUtils;
-import com.alibaba.fastjson2.JSON;
-import lombok.Data;
 import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/excel/LocalDateTimeConverter.java → gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/easyExcel/LocalDateTimeConverter.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.manager.tools.excel;
+package cn.com.taiji.core.manager.tools.easyExcel;
 
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.converters.ReadConverterContext;

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/excel/annotations/ExcelFiledNotBlank.java → gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/easyExcel/annotations/ExcelFiledNotBlank.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.manager.tools.excel.annotations;
+package cn.com.taiji.core.manager.tools.easyExcel.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/excel/annotations/ExcelFiledNotNull.java → gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/easyExcel/annotations/ExcelFiledNotNull.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.manager.tools.excel.annotations;
+package cn.com.taiji.core.manager.tools.easyExcel.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueMultipleEquityRepo.java

@@ -13,4 +13,8 @@ public interface IssueMultipleEquityRepo extends AbstractJpaRepo<IssueMultipleEq
     List<IssueMultipleEquity> findBySingleLike(String singleId);
 
 
+    @Query("select max(multipleEquityId) from IssueMultipleEquity where multipleEquityId like ?1 ")
+    String findSeqCodeByDate(String date);
+
+
 }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueSingleEquityRepo.java

@@ -16,4 +16,7 @@ public interface IssueSingleEquityRepo extends AbstractJpaRepo<IssueSingleEquity
 
     IssueSingleEquity findByEquityName(String equityName);
 
+    @Query(value = "select sum(discountPrice) from IssueSingleEquity where singleEquityId in ?1")
+    Long sumFeeBySingleEquityId(List<String> collect);
+
 }