Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/SchoolTeacher.java

@@ -426,6 +426,81 @@ public class SchoolTeacher implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否享受公待遇")
 	private String enjoyOfficeTreatment;
+	/**
+	 * 工资拨付标准
+	 */
+	@ApiModelProperty(value = "工资拨付标准")
+	private String salaryWithdrawalStandardName;
+	/**
+	 * 职级拨付标准
+	 */
+	@ApiModelProperty(value = "职级拨付标准")
+	private String rankWithdrawalStandardName;
+	/**
+	 * 履约奖
+	 */
+	@ApiModelProperty(value = "履约奖")
+	private String performanceAwardName;
+	/**
+	 * 校龄工资
+	 */
+	@ApiModelProperty(value = "校龄工资")
+	private String schoolAgeSalaryName;
+	/**
+	 * 增资
+	 */
+	@ApiModelProperty(value = "增资")
+	private String capitalIncreaseName;
+	/**
+	 * 学历工资
+	 */
+	@ApiModelProperty(value = "学历工资")
+	private String educationSalaryName;
+	/**
+	 * 职级工资
+	 */
+	@ApiModelProperty(value = "职级工资")
+	private String rankSalaryName;
+	/**
+	 * 工资基数
+	 */
+	@ApiModelProperty(value = "工资基数")
+	private String salaryBaseName;
+	/**
+	 * 工作量工资
+	 */
+	@ApiModelProperty(value = "工作量工资")
+	private String workloadSalaryName;
+	/**
+	 * 日常考核标准
+	 */
+	@ApiModelProperty(value = "日常考核标准")
+	private String dailyAssessmentCriteriaName;
+	/**
+	 * 日常考核工资
+	 */
+	@ApiModelProperty(value = "日常考核工资")
+	private String dailyAssessmentSalaryName;
+	/**
+	 * 学期绩效工资
+	 */
+	@ApiModelProperty(value = "学期绩效工资")
+	private String termPerformanceSalaryName;
+	/**
+	 * 领导干部补贴
+	 */
+	@ApiModelProperty(value = "领导干部补贴")
+	private String leadingCadreSubsidyName;
+	/**
+	 * 备课组长
+	 */
+	@ApiModelProperty(value = "备课组长")
+	private String prepareLessonsName;
+	/**
+	 * 教研组长
+	 */
+	@ApiModelProperty(value = "教研组长")
+	private String teachingResearchName;
 
 
 

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -1054,7 +1054,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				{
 					throw new SecurityException("修改原数据失败");
 				}
-				sendMessage.setMessageBody("您的小学部工资请核未通过"+",销售订单号:"+auditProecess1.getBillNo()+",请查看原因");
+				sendMessage.setMessageBody("您的小学部工资请核未通过,请查看原因");
 				R save = messageClient.save(sendMessage);
 				if(!save.isSuccess())
 				{
@@ -1076,7 +1076,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				{
 					throw new SecurityException(r.getMsg());
 				}
-				sendMessage.setMessageBody("您的小学部工资请核已通过"+",销售订单号:"+auditProecess1.getBillNo()+",请继续操作");
+				sendMessage.setMessageBody("您的小学部工资请核已通过,请继续操作");
 
 				R save = messageClient.save(sendMessage);
 				if(!save.isSuccess())

blade-service/blade-client/src/main/java/org/springblade/client/school/mapper/SchoolTeacherMapper.xml

@@ -70,6 +70,22 @@
         <result column="leading_cadre_subsidy" property="leadingCadreSubsidy"/>
         <result column="prepare_lessons" property="prepareLessons"/>
         <result column="teaching_research" property="teachingResearch"/>
+        <result column="enjoy_office_treatment" property="enjoyOfficeTreatment"/>
+        <result column="salary_withdrawal_standard_name" property="salaryWithdrawalStandardName"/>
+        <result column="rank_withdrawal_standard_name" property="rankWithdrawalStandardName"/>
+        <result column="performance_award_name" property="performanceAwardName"/>
+        <result column="school_age_salary_name" property="schoolAgeSalaryName"/>
+        <result column="capital_increase_name" property="capitalIncreaseName"/>
+        <result column="education_salary_name" property="educationSalaryName"/>
+        <result column="rank_salary_name" property="rankSalaryName"/>
+        <result column="salary_base_name" property="salaryBaseName"/>
+        <result column="workload_salary_name" property="workloadSalaryName"/>
+        <result column="daily_assessment_criteria_name" property="dailyAssessmentCriteriaName"/>
+        <result column="daily_assessment_salary_name" property="dailyAssessmentSalaryName"/>
+        <result column="term_performance_salary_name" property="termPerformanceSalaryName"/>
+        <result column="leading_cadre_subsidy_name" property="leadingCadreSubsidyName"/>
+        <result column="prepare_lessons_name" property="prepareLessonsName"/>
+        <result column="teaching_research_name" property="teachingResearchName"/>
     </resultMap>
 
 

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

@@ -67,11 +67,17 @@ public class SchoolTeacherServiceImpl extends ServiceImpl<SchoolTeacherMapper, S
 	public SchoolTeacher saveTeacherMessage(SchoolTeacher schoolTeacher) {
 		SchoolTeacher teacher = baseMapper.selectOne(new QueryWrapper<SchoolTeacher>().eq("id_number", schoolTeacher.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 			.eq("is_deleted", 0));
-		if (teacher == null){
+		if (teacher == null && schoolTeacher.getId() == null){
+			schoolTeacher.setId(null);
 			schoolTeacher.setCreateTime(new Date());
 			schoolTeacher.setCreateUser(SecureUtil.getUserId());
 			schoolTeacher.setTenantId(SecureUtil.getTenantId());
 			baseMapper.insert(schoolTeacher);
+		}else if (teacher == null && schoolTeacher.getId() != null){
+			schoolTeacher.setId(schoolTeacher.getId());
+			schoolTeacher.setUpdateTime(new Date());
+			schoolTeacher.setUpdateUser(SecureUtil.getUserId());
+			baseMapper.updateById(schoolTeacher);
 		}else {
 			schoolTeacher.setId(teacher.getId());
 			schoolTeacher.setUpdateTime(new Date());

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryFeesServiceImpl.java

@@ -88,7 +88,7 @@ public class DeliveryFeesServiceImpl extends ServiceImpl<DeliveryFeesMapper, Del
 	 */
 	public List<DeliveryFees> getDeliveryFeesList(Delivery delivery){
 		List<DeliveryFees> deliveryFeesList = baseMapper.selectList(new QueryWrapper<DeliveryFees>().eq("pid", delivery.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(deliveryFeesList)){
 			deliveryFeesList.stream().forEach(item ->{
 				if (item.getItemId() != null){

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -111,7 +111,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	 */
 	public List<DeliveryItems> getDeliveryItems(Delivery delivery){
 		List<DeliveryItems> deliveryItemsList = baseMapper.selectList(new QueryWrapper<DeliveryItems>().eq("pid", delivery.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(deliveryItemsList)){
 			for (DeliveryItems deliveryItems : deliveryItemsList) {
 				if (deliveryItems.getItemId() != null){

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -221,7 +221,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		selectById.setDeliveryFeesList(deliveryFeesList);
 		//获取发货文件信息
 		List<DeliveryFiles> deliveryFilesList = deliveryFilesService.list(new QueryWrapper<DeliveryFiles>().eq("pid", delivery.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		selectById.setDeliveryFilesList(deliveryFilesList);
 		return selectById;
 	}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderFeesServiceImpl.java

@@ -85,7 +85,7 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
 	 */
 	public List<OrderFees> getOrderFees(Order order){
 		List<OrderFees> orderFeesList = baseMapper.selectList(new QueryWrapper<OrderFees>().eq("pid", order.getId())
-			.orderByAsc("fees_type").eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
+			.orderByAsc("fees_type").eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		if (CollectionUtils.isNotEmpty(orderFeesList)){
 			orderFeesList.stream().forEach(item ->{
 				if (item.getItemId() != null){

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -162,10 +162,10 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		List<OrderItems> orderItemsList = new ArrayList<>();
 		if (CollectionUtils.isEmpty(order.getOrderItemIds())){
 			orderItemsList = baseMapper.selectList(new QueryWrapper<OrderItems>().eq("pid", order.getId())
-				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
+				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
 		}else {
 			orderItemsList = baseMapper.selectList(new QueryWrapper<OrderItems>().eq("pid", order.getId())
-				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).in("id", order.getOrderItemIds()).orderByAsc("sort"));
+				.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).in("id", order.getOrderItemIds()).orderByAsc("id"));
 		}
 		if (CollectionUtils.isNotEmpty(orderItemsList)){
 			orderItemsList.stream().forEach(item ->{

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -287,11 +287,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		orderMessage.setOrderFeesList(orderFeesList);
 		//获取订单文件信息
 		List<OrderFiles> orderFilesList = orderFilesService.list(new QueryWrapper<OrderFiles>().eq("pid", order.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("sort"));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("id"));
 		orderMessage.setOrderFilesList(orderFilesList);
 		//获取订单修改日志信息
 		List<OrderModify> orderModifyList = orderModifyService.list(new QueryWrapper<OrderModify>().eq("pid", order.getId())
-			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("sort"));
+			.eq("tenant_id", SecureUtil.getTenantId()).eq("status", 0).eq("is_deleted", 0).orderByAsc("id"));
 		orderMessage.setOrderModifyList(orderModifyList);
 		return orderMessage;
 	}

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryAccessoryController.java

@@ -30,6 +30,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.school.entity.SalaryItem;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -75,6 +76,7 @@ public class SalaryAccessoryController extends BladeController {
 		LambdaQueryWrapper<SalaryAccessory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SalaryAccessory::getIsDeleted,0);
 		lambdaQueryWrapper.eq(SalaryAccessory::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(salaryAccessory.getPid()), SalaryAccessory::getPid,salaryAccessory.getPid());
 		lambdaQueryWrapper.orderByDesc(SalaryAccessory::getId);
 		IPage<SalaryAccessory> pages = salaryAccessoryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryItemController.java

@@ -17,6 +17,7 @@
 package org.springblade.school.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import io.swagger.annotations.Api;
@@ -79,8 +80,13 @@ public class SalaryItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入salaryItem")
 	public R<IPage<SalaryItem>> list(SalaryItem salaryItem, Query query) {
-		salaryItem.setTenantId(SecureUtil.getTenantId());
-		IPage<SalaryItem> pages = salaryItemService.page(Condition.getPage(query), Condition.getQueryWrapper(salaryItem));
+		LambdaQueryWrapper<SalaryItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(SalaryItem::getIsDeleted,0);
+		lambdaQueryWrapper.eq(SalaryItem::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(salaryItem.getPid()),SalaryItem::getPid,salaryItem.getPid());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(salaryItem.getCname()),SalaryItem::getCname,salaryItem.getCname());
+		lambdaQueryWrapper.orderByAsc(SalaryItem::getId);
+		IPage<SalaryItem> pages = salaryItemService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

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,10 +28,11 @@ public class LearningPower implements Serializable {
 	 * 身份证号
 	 */
 	@ExcelProperty(value = "身份证号(必填)")
+	@ColumnWidth(35)
 	private String idNumber;
 	/**
 	 * 学习强国
 	 */
-	@ApiModelProperty(value = "扣费金额")
+	@ExcelProperty(value = "扣费金额")
 	private BigDecimal learningPower;
 }

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;
 	/**
 	 * 职务
@@ -37,6 +38,6 @@ public class PrepareLessonsExcel implements Serializable {
 	/**
 	 * 金额
 	 */
-	@ApiModelProperty(value = "金额")
+	@ExcelProperty(value = "金额")
 	private BigDecimal prepareLessons;
 }

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;
 	/**
 	 * 工资拔付标准
@@ -63,7 +64,7 @@ public class SalaryItemExcel implements Serializable {
 	 * 职级类别
 	 */
 	@ExcelProperty(value = "职级类别")
-	private BigDecimal rankCategory;
+	private String rankCategory;
 	/**
 	 * 职级拨付标准
 	 */

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;
 	/**
 	 * 职务
@@ -37,7 +38,7 @@ public class TeamLeaderExcel implements Serializable {
 	/**
 	 * 金额
 	 */
-	@ApiModelProperty(value = "金额")
+	@ExcelProperty(value = "金额")
 	private BigDecimal teachingResearch;
 
 }

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 {

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

@@ -88,12 +88,19 @@ public class SalaryServiceImpl extends ServiceImpl<SalaryMapper, Salary> impleme
 				}
 				SalaryItem item = salaryItemMapper.selectOne(new QueryWrapper<SalaryItem>().eq("pid", salary.getId()).eq("tenant_id", SecureUtil.getTenantId())
 					.eq("id_number", salaryItem.getIdNumber()).eq("is_deleted", 0));
-				if (item == null){
+				if (item == null && salaryItem.getId() == null){
 					salaryItem.setPid(salary.getId());
 					salaryItem.setCreateTime(new Date());
 					salaryItem.setCreateUser(SecureUtil.getUserId());
 					salaryItem.setTenantId(SecureUtil.getTenantId());
 					salaryItemMapper.insert(salaryItem);
+				}else if (item == null && salaryItem.getId() != null){
+					salaryItem.setId(salaryItem.getId());
+					salaryItem.setPid(salary.getId());
+					salaryItem.setUpdateTime(new Date());
+					salaryItem.setUpdateUser(SecureUtil.getUserId());
+					salaryItem.setTenantId(SecureUtil.getTenantId());
+					salaryItemMapper.updateById(salaryItem);
 				}else {
 					salaryItem.setId(item.getId());
 					salaryItem.setPid(salary.getId());