From 2ef6a9e232b300638006e0ae75c98c65f87f9310 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Fri, 25 Sep 2020 16:57:01 +0800
Subject: [PATCH] 'commit'

---
 .../ExcelStyle/tableStyleIntNormal.json       |  34 ++++++++++++++++++
 .../Config/ImportExcelTemplate/student.xlsx   | Bin 162531 -> 162531 bytes
 .../Config/ImportExcelTemplate/teacher.xlsx   | Bin 162534 -> 162534 bytes
 .../BaseStudentDao/BaseStudentDao.go          |  32 +++++++++--------
 4 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json

diff --git a/dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json b/dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json
new file mode 100644
index 00000000..7bbff5b8
--- /dev/null
+++ b/dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json
@@ -0,0 +1,34 @@
+{
+  "font": {
+    "family": "宋体",
+    "size": 14,
+    "color": "#000000"
+  },
+  "alignment": {
+    "horizontal": "center",
+    "vertical": "center"
+  },
+  "number_format": 1,
+  "border": [
+    {
+      "type": "left",
+      "color": "000000",
+      "style": 1
+    },
+    {
+      "type": "right",
+      "color": "000000",
+      "style": 1
+    },
+    {
+      "type": "top",
+      "color": "000000",
+      "style": 1
+    },
+    {
+      "type": "bottom",
+      "color": "000000",
+      "style": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx b/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx
index 45f2bc34650b7acb0ee1fcaeb0c3dc669f51a0a9..d3a10f1d4f59126eda363690047767d13276c85c 100644
GIT binary patch
delta 191
zcmaF-mGkje&J72+Hn;LAacn-oHIH$7LmAU~#)(W4o8x%YnVOf2wJ#TA+`e3l>0tbH
z{|ctI>AjUqQcTOZrmw7IvSni8nf{`Z$&JaHce+6plj`)V6+p=oLeoE106DX(n52b8
z7#J#Y^ouhRi&9g9ONuh{(u=1btY8wEE(SD*%U6tnA-*Uzr&xdb|4Js&>HZ+YOU0*W
kS28J053K@nN+hNiRx!zlu(B}#0T&Q9FflOrRsabG07a%c*#H0l

delta 182
zcmaF-mGkje&J72+Ha`-Y$GACNOr2@-0WKwu=01t`J_*L{eG*Iu<0rH5NNjEpInOxV
zzk;c4`rJw;DW+vy(|1-fsZLj@0&-k<rrT68nKR|^PA{!uQks6X0w|cxH~nJ;lP%M6
z{^<slOm0jJg3~KNI;Mkk^omWMAR#sVXa$qN^m~;|(z<0#3>7*0#Tki3sVTuFMVWc&
b#d;OFIRW0RYz#oa1%wSu3=F;%K!O1P&#gG@

diff --git a/dsBaseRpc/Config/ImportExcelTemplate/teacher.xlsx b/dsBaseRpc/Config/ImportExcelTemplate/teacher.xlsx
index 382dc93ae3cfe9b9be6b3875dfd702550105a139..aae63e5d46edafaa10ab235a7af63084929e451e 100644
GIT binary patch
delta 210
zcmaF%mGjwG&IwZ6J93y}7&l7wvTi?9#?;0*eM=dW#P-B2CUvIm=L?wrvTomz%CwSY
z`;%Oz*G$dJS=*PhGHzea%JegSdT%9@1~UT#!}J}MOiI%eDww2zCQYxYU{akvzlupp
z_$3<yL$q^#UP)?RNqk6UL27aAbb(4HJ?3@}hUt!#OlHjMIT@x`RWd0~PXVfDUdP2S
zy|Ic(Zu)beQOv6a7^bsSGAT^IRSD#Uh%!w7Udd$7%qGq--Li^Fd-_6<efAR5_f{~;
KOutmcBmw{`g+<Q*

delta 210
zcmaF%mGjwG&IwYR%NToEn<FLKBPAHOM@lgLjGxFPvH7ULN|wzFIn<dpO2sg4&J%sj
zwD|<rU)Igc>}`zGCsr_NFflMp-(A6^I(=3ZlN3`g>*Qz&sp*F+nY5Var7}(bP|2h)
zU9pl$irGDjX}Vn{lNob<Hq-R-N+!kW2^B!$yd0+KwG~WC(*=OqnNQ_1O)eA_o$gcx
z)L)a&G(EqHNqhPXpnl%11xySTIr_yVl{u-!)6Y~e=?QNtV`7MQ&d)1J%`1rysVqn>
Kj-7r6Xbb?Ra7JJN

diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
index 9b259bfb..697c5a6c 100644
--- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
+++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
@@ -181,20 +181,24 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	_ = f.AddComment(SheetName, "C201", `{"author":"示例: ","text":"填写本年级内班级的编号,如：1或2,代表本年级内的1班或2班。"}`)
 	_ = f.AddComment(SheetName, "F201", `{"author":"示例: ","text":"1980-01-01"}`)
 	//3、入学年份+班号的有效性
-	for k := 2 + ExcelUtil.HiddenRows; k <= 5000+ExcelUtil.HiddenRows; k++ {
-		//入学年份
-		dvRange := excelize.NewDataValidation(true)
-		dvRange.Sqref = "B" + CommonUtil.ConvertIntToString(k) + ":B" + CommonUtil.ConvertIntToString(k)
-		_ = dvRange.SetRange(2014, 2030, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween)
-		dvRange.SetError(excelize.DataValidationErrorStyleStop, "入学年份校验错误", "系统只支持2014-2030年度的班级！")
-		_ = f.AddDataValidation(SheetName, dvRange)
-		//班号
-		dvRange = excelize.NewDataValidation(true)
-		dvRange.Sqref = "C" + CommonUtil.ConvertIntToString(k) + ":C" + CommonUtil.ConvertIntToString(k)
-		_ = dvRange.SetRange(1, 99, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween)
-		dvRange.SetError(excelize.DataValidationErrorStyleStop, "班号录入错误", "系统只支持1-99的班号！")
-		_ = f.AddDataValidation(SheetName, dvRange)
-	}
+	//for k := 2 + ExcelUtil.HiddenRows; k <= 5000+ExcelUtil.HiddenRows; k++ {
+	//	//入学年份
+	//	dvRange := excelize.NewDataValidation(true)
+	//	dvRange.Sqref = "B" + CommonUtil.ConvertIntToString(k) + ":B" + CommonUtil.ConvertIntToString(k)
+	//	_ = dvRange.SetRange(2014, 2030, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween)
+	//	dvRange.SetError(excelize.DataValidationErrorStyleStop, "入学年份校验错误", "系统只支持2014-2030年度的班级！")
+	//	_ = f.AddDataValidation(SheetName, dvRange)
+	//	//设置单元格格式
+	//
+	//	//班号
+	//	dvRange = excelize.NewDataValidation(true)
+	//	dvRange.Sqref = "C" + CommonUtil.ConvertIntToString(k) + ":C" + CommonUtil.ConvertIntToString(k)
+	//	_ = dvRange.SetRange(1, 99, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween)
+	//	dvRange.SetError(excelize.DataValidationErrorStyleStop, "班号录入错误", "系统只支持1-99的班号！")
+	//	_ = f.AddDataValidation(SheetName, dvRange)
+	//	//设置单元格格式
+	//
+	//}
 	//4、添加是否的下拉框K--->P
 	for i := 11; i <= 16; i++ {
 		//要设置下拉框的列