学校修改

blade-service-api/blade-school-api/src/main/java/org/springblade/school/vo/SalaryItemVO.java

@@ -49,13 +49,23 @@ public class SalaryItemVO extends SalaryItem {
 	@ApiModelProperty(value = "校龄开始时间结束")
 	private String positiveTimeEnd;
 	/**
-	 * 创建日期开始
+	 * 开始年
 	 */
-	@ApiModelProperty(value = "创建日期开始")
-	private String createTimeStart;
+	@ApiModelProperty(value = "开始年")
+	private String startYear;
 	/**
-	 * 创建日期结束
+	 * 结束年
 	 */
-	@ApiModelProperty(value = "创建日期结束")
-	private String createTimeEnd;
+	@ApiModelProperty(value = "结束年")
+	private String endYear;
+	/**
+	 * 开始月
+	 */
+	@ApiModelProperty(value = "开始月")
+	private String startMonth;
+	/**
+	 * 结束月
+	 */
+	@ApiModelProperty(value = "结束月")
+	private String endMonth;
 }

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

@@ -1459,7 +1459,7 @@ public class SalaryItemController extends BladeController {
 	 */
 	@GetMapping("/salaryStatements")
 	@ApiOperationSupport(order = 80)
-	@ApiOperation(value = "分页", notes = "传入salaryItem")
+	@ApiOperation(value = "报表分析-工资明细-列表", notes = "传入salaryItem")
 	public R<IPage<SalaryItem>> salaryStatements(SalaryItemVO salaryItem, Query query) {
 		salaryItem.setTenantId(SecureUtil.getTenantId());
 		IPage<SalaryItem> pages = salaryItemService.salaryStatements(Condition.getPage(query), salaryItem);
@@ -1470,7 +1470,7 @@ public class SalaryItemController extends BladeController {
 	 */
 	@GetMapping("/export/salaryStatements")
 	@ApiOperationSupport(order = 81)
-	@ApiOperation(value = "分页", notes = "传入salaryItem")
+	@ApiOperation(value = "报表分析-工资明细-导出", notes = "传入salaryItem")
 	public void exportSalaryStatements(SalaryItemVO salaryItem,HttpServletResponse response) {
 		salaryItem.setTenantId(SecureUtil.getTenantId());
 		List<WageExcel> list = salaryItemService.exportSalaryStatements(salaryItem);

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

@@ -32,5 +32,5 @@ public class TeacherSubsidy implements Serializable {
 	 * 金额
 	 */
 	@ExcelProperty(value = "班主任补贴")
-	private BigDecimal classTeacherSubsidy;
+	private BigDecimal classTeacherFee;
 }

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

@@ -159,19 +159,25 @@
             and si.cname like CONCAT(CONCAT('%', #{salaryItem.cname}), '%')
         </if>
         <if test="salaryItem.tenantId!=null and salaryItem.tenantId != ''">
-            and si.tenant_id = #{salaryItem.tenantId})
+            and si.tenant_id = #{salaryItem.tenantId}
         </if>
         <if test="salaryItem.idNumber!=null and salaryItem.idNumber != ''">
-            and si.idNumber like CONCAT(CONCAT('%', #{salaryItem.idNumber}), '%')
+            and si.id_number like CONCAT(CONCAT('%', #{salaryItem.idNumber}), '%')
         </if>
         <if test="salaryItem.inSection!=null and salaryItem.inSection != ''">
             and sa.salary_type = #{salaryItem.inSection}
         </if>
-        <if test="salaryItem.createTimeStart!=null and salaryItem.createTimeStart != ''">
-            and sa.create_time &gt;= #{salaryItem.createTimeStart})
+        <if test="salaryItem.startYear!=null and salaryItem.startYear != ''">
+            and sa.annual &gt;= #{salaryItem.startYear}
         </if>
-        <if test="salaryItem.createTimeEnd!=null and salaryItem.createTimeEnd != ''">
-            and sa.create_time &lt;= #{salaryItem.createTimeEnd})
+        <if test="salaryItem.endYear!=null and salaryItem.endYear != ''">
+            and sa.annual &lt;= #{salaryItem.endYear}
+        </if>
+        <if test="salaryItem.startMonth!=null and salaryItem.startMonth != ''">
+            and sa.moon &gt;= #{salaryItem.startMonth}
+        </if>
+        <if test="salaryItem.endMonth!=null and salaryItem.endMonth != ''">
+            and sa.moon &lt;= #{salaryItem.endMonth}
         </if>
     </select>
     <select id="exportSalaryStatements" resultType="org.springblade.school.excel.WageExcel">
@@ -188,19 +194,25 @@
             and si.cname like CONCAT(CONCAT('%', #{salaryItem.cname}), '%')
         </if>
         <if test="salaryItem.tenantId!=null and salaryItem.tenantId != ''">
-            and si.tenant_id = #{salaryItem.tenantId})
+            and si.tenant_id = #{salaryItem.tenantId}
         </if>
         <if test="salaryItem.idNumber!=null and salaryItem.idNumber != ''">
-            and si.idNumber like CONCAT(CONCAT('%', #{salaryItem.idNumber}), '%')
+            and si.id_number like CONCAT(CONCAT('%', #{salaryItem.idNumber}), '%')
         </if>
         <if test="salaryItem.inSection!=null and salaryItem.inSection != ''">
             and sa.salary_type = #{salaryItem.inSection}
         </if>
-        <if test="salaryItem.createTimeStart!=null and salaryItem.createTimeStart != ''">
-            and sa.create_time &gt;= #{salaryItem.createTimeStart})
+        <if test="salaryItem.startYear!=null and salaryItem.startYear != ''">
+            and sa.annual &gt;= #{salaryItem.startYear}
+        </if>
+        <if test="salaryItem.endYear!=null and salaryItem.endYear != ''">
+            and sa.annual &lt;= #{salaryItem.endYear}
+        </if>
+        <if test="salaryItem.startMonth!=null and salaryItem.startMonth != ''">
+            and sa.moon &gt;= #{salaryItem.startMonth}
         </if>
-        <if test="salaryItem.createTimeEnd!=null and salaryItem.createTimeEnd != ''">
-            and sa.create_time &lt;= #{salaryItem.createTimeEnd})
+        <if test="salaryItem.endMonth!=null and salaryItem.endMonth != ''">
+            and sa.moon &lt;= #{salaryItem.endMonth}
         </if>
     </select>