学校修改

blade-service/blade-school/src/main/java/org/springblade/school/excel/AttendanceExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-出勤导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class AttendanceExcel implements Serializable {
@@ -32,6 +32,7 @@ public class AttendanceExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 级部

blade-service/blade-school/src/main/java/org/springblade/school/excel/AwardExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-奖励导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class AwardExcel implements Serializable {
@@ -32,6 +32,7 @@ public class AwardExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 备注

blade-service/blade-school/src/main/java/org/springblade/school/excel/EmployExcel.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-聘用导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class EmployExcel implements Serializable {
@@ -36,6 +36,7 @@ public class EmployExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 基础工资

blade-service/blade-school/src/main/java/org/springblade/school/excel/EomNumberExcel.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-月底人数导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class EomNumberExcel implements Serializable {
@@ -28,6 +28,7 @@ public class EomNumberExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 班级

blade-service/blade-school/src/main/java/org/springblade/school/excel/InsuranceExcel.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-保险导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class InsuranceExcel implements Serializable {
@@ -38,6 +38,7 @@ public class InsuranceExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 部门

blade-service/blade-school/src/main/java/org/springblade/school/excel/LeadExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-领导干部导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class LeadExcel implements Serializable {
@@ -27,6 +27,7 @@ public class LeadExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 职务

blade-service/blade-school/src/main/java/org/springblade/school/excel/LearningPower.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-学习强国导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class LearningPower implements Serializable {
@@ -28,6 +28,7 @@ public class LearningPower implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 学习强国

blade-service/blade-school/src/main/java/org/springblade/school/excel/OvertimeExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-周末加班导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class OvertimeExcel implements Serializable {
@@ -27,6 +27,7 @@ public class OvertimeExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 级部

blade-service/blade-school/src/main/java/org/springblade/school/excel/PayTaxes.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * 通济学校-工资管理-小学部-个税导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PayTaxes implements Serializable {
@@ -38,6 +38,7 @@ public class PayTaxes implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "证件号码(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 税款所属期起

blade-service/blade-school/src/main/java/org/springblade/school/excel/PerformanceExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-绩效、教学成绩奖导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PerformanceExcel implements Serializable {
@@ -32,6 +32,7 @@ public class PerformanceExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 等级

blade-service/blade-school/src/main/java/org/springblade/school/excel/PersonalInsurance.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-保险个人导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PersonalInsurance implements Serializable {
@@ -33,6 +33,7 @@ public class PersonalInsurance implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "证件号码(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 姓名

blade-service/blade-school/src/main/java/org/springblade/school/excel/PhoneFineExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-电话费、罚款导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PhoneFineExcel implements Serializable {
@@ -32,6 +32,7 @@ public class PhoneFineExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 电话费

blade-service/blade-school/src/main/java/org/springblade/school/excel/PositionExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-职级导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PositionExcel implements Serializable {
@@ -42,6 +42,7 @@ public class PositionExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号码(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 学科

blade-service/blade-school/src/main/java/org/springblade/school/excel/PostAllowance.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-岗位补贴导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PostAllowance implements Serializable {
@@ -27,6 +27,7 @@ public class PostAllowance implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 职务

blade-service/blade-school/src/main/java/org/springblade/school/excel/PostTrainExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-新岗岗前培训模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PostTrainExcel implements Serializable {
@@ -42,6 +42,7 @@ public class PostTrainExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 培训天数

blade-service/blade-school/src/main/java/org/springblade/school/excel/PrepareLessonsExcel.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-备课组长导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class PrepareLessonsExcel implements Serializable {
@@ -28,6 +28,7 @@ public class PrepareLessonsExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 职务

blade-service/blade-school/src/main/java/org/springblade/school/excel/ReservedFunds.java

@@ -15,7 +15,7 @@ import java.util.Date;
  * 通济学校-工资管理-小学部-公积金导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class ReservedFunds implements Serializable {
@@ -29,6 +29,7 @@ public class ReservedFunds implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "个人证件号码(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 姓名

blade-service/blade-school/src/main/java/org/springblade/school/excel/SalaryItemExcel.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * 通济学校-工资管理-小学部-工资表导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class SalaryItemExcel implements Serializable {
@@ -53,6 +53,7 @@ public class SalaryItemExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 工资拔付标准

blade-service/blade-school/src/main/java/org/springblade/school/excel/SanitationFee.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-卫生费导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class SanitationFee implements Serializable {
@@ -32,6 +32,7 @@ public class SanitationFee implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 楼座

blade-service/blade-school/src/main/java/org/springblade/school/excel/TeacherSubsidy.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-班主任补贴导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class TeacherSubsidy implements Serializable {
@@ -24,19 +24,15 @@ public class TeacherSubsidy implements Serializable {
 	@ExcelProperty(value = "班级")
 	private String grading;
 	/**
-	 * 班主任
-	 */
-	@ExcelProperty(value = "班主任")
-	private String subject;
-	/**
 	 * 姓名
 	 */
-	@ExcelProperty(value = "姓名(必填)")
+	@ExcelProperty(value = "班主任(必填)")
 	private String cname;
 	/**
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 *

blade-service/blade-school/src/main/java/org/springblade/school/excel/TeachingExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-绩效、教学成绩奖导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class TeachingExcel implements Serializable {
@@ -32,6 +32,7 @@ public class TeachingExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 等级

blade-service/blade-school/src/main/java/org/springblade/school/excel/TeamLeaderExcel.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-教研组长导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class TeamLeaderExcel implements Serializable {
@@ -28,6 +28,7 @@ public class TeamLeaderExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 职务

blade-service/blade-school/src/main/java/org/springblade/school/excel/VacationExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-假期加班导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class VacationExcel implements Serializable {
@@ -27,6 +27,7 @@ public class VacationExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 假期加班费

blade-service/blade-school/src/main/java/org/springblade/school/excel/WeChatExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-微信导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class WeChatExcel implements Serializable {
@@ -27,6 +27,7 @@ public class WeChatExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 微信奖金汇总

blade-service/blade-school/src/main/java/org/springblade/school/excel/WorkloadExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-工作量导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class WorkloadExcel implements Serializable {
@@ -27,6 +27,7 @@ public class WorkloadExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 月份课时

blade-service/blade-school/src/main/java/org/springblade/school/excel/ZhaPingExcel.java

@@ -13,7 +13,7 @@ import java.math.BigDecimal;
  * 通济学校-工资管理-小学部-查评导入模板
  */
 @Data
-@ColumnWidth(35)
+@ColumnWidth(15)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
 public class ZhaPingExcel implements Serializable {
@@ -32,6 +32,7 @@ public class ZhaPingExcel implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 级部

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -1445,8 +1445,8 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 
 		if (bladeFile != null && StringUtils.isNotBlank(bladeFile.getLink())) {
 			String link = bladeFile.getLink();
-//			String replace = link.replace("http://121.37.83.47:9000/", "https://trade.tubaosoft.com/file/");
-			String replace = link.replace("http://127.0.0.1:9000/", "http://192.168.1.12:9000/");
+			String replace = link.replace("http://121.37.83.47:9000/", "https://trade.tubaosoft.com/file/");
+//			String replace = link.replace("http://127.0.0.1:9000/", "http://192.168.1.12:9000/");
 			bladeFile.setLink(replace);
 			salaryAccessory.setUrl(bladeFile.getLink());
 		} else {