学校修改

blade-service/blade-client/src/main/java/org/springblade/client/school/feign/SchoolTeacherClient.java

@@ -49,6 +49,7 @@ public class SchoolTeacherClient implements ISchoolTeacherClient {
 		LambdaQueryWrapper<SchoolTeacher> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(SchoolTeacher::getInSection,inSection);
 		lambdaQueryWrapper.eq(SchoolTeacher::getIsDeleted,0);
+		lambdaQueryWrapper.eq(SchoolTeacher::getStatus,0);
 		lambdaQueryWrapper.eq(SchoolTeacher::getTenantId,SecureUtil.getTenantId());
 		List<SchoolTeacher> list = schoolTeacherService.list(lambdaQueryWrapper);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");

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

@@ -234,7 +234,7 @@ public class SalaryController extends BladeController {
 	 */
 	@GetMapping("/salaryDataChain")
 	@ApiOperationSupport(order = 13)
-	@ApiOperation(value = "首页统计工资环比图", notes = "传入salary")
+	@ApiOperation(value = "首页统计工资同比图", notes = "传入salary")
 	public R<SalaryDataChain> salaryDataChain(SalaryVO salary) {
 		if (StringUtils.isBlank(salary.getAnnual())){
 			throw new SecurityException("请选择查询的年份");

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

@@ -29,8 +29,94 @@ public class SalaryMessage implements Serializable {
 	@ColumnWidth(35)
 	private String idNumber;
 	/**
+	 * 工资基数
+	 */
+	@ExcelProperty(value = "基础工资")
+	private BigDecimal salaryBase;
+	/**
+	 * 工作量工资1
+	 */
+	@ExcelProperty(value = "工作量工资")
+	private BigDecimal customThree;
+	/**
+	 * 日常考核工资
+	 */
+	@ExcelProperty(value = "日常考核工资")
+	private BigDecimal dailyAssessmentSalary;
+	/**
+	 * 班主任补贴
+	 */
+	@ExcelProperty(value = "班主任津贴贴")
+	private BigDecimal classTeacherFee;
+	/**
+	 * 学期绩效工资
+	 */
+	@ExcelProperty(value = "学期绩效工资")
+	private BigDecimal termPerformanceSalary;
+	/**
+	 * 奖励1
+	 */
+	@ExcelProperty(value = "奖励工资")
+	private BigDecimal customAward;
+	/**
+	 * 领导干部补贴
+	 */
+	@ExcelProperty(value = "职务津贴")
+	private BigDecimal leadingCadreSubsidy;
+	/**
+	 * 补贴1
+	 */
+	@ExcelProperty(value = "补贴项")
+	private BigDecimal yearUpPerformance;
+	/**
+	 * 扣除1
+	 */
+	@ExcelProperty(value = "扣除项")
+	private BigDecimal ribbonOne;
+	/**
+	 * 保险单位部分
+	 */
+	@ExcelProperty(value = "保险单位部分")
+	private BigDecimal insuranceUnit;
+	/**
+	 * 保险个人部分
+	 */
+	@ExcelProperty(value = "保险个人部分")
+	private BigDecimal insurancePersonage;
+	/**
+	 * 公积金单位部分
+	 */
+	@ExcelProperty(value = "公积金单位部分")
+	private BigDecimal reservedFundsUnit;
+	/**
+	 * 公积金个人部分
+	 */
+	@ExcelProperty(value = "公积金个人部分")
+	private BigDecimal reservedFundsPersonage;
+	/**
+	 * 应发工资
+	 */
+	@ExcelProperty(value = "应发工资")
+	private BigDecimal salary;
+	/**
+	 * 个人所得税
+	 */
+	@ExcelProperty(value = "个人所得税")
+	private BigDecimal personageTaxes;
+	/**
 	 * 实发工资
 	 */
 	@ExcelProperty(value = "实发工资")
-	private BigDecimal salaryBase;
+	private BigDecimal fSalary;
+
+
+
+
+
+
+
+
+
+
+
 }

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

@@ -139,7 +139,7 @@
     </select>
     <select id="salaryDataChain" resultType="org.springblade.school.entity.SalaryDataChain">
         SELECT
-	        IFNULL(SUM(st.f_salary),0) AS fSalary,
+	        IFNULL(SUM(st.fSalary),0) AS fSalary,
 	        #只选择年 人数需要除以12 选中年和月人数不处理 选中年和学期 人数除以6
         <if test="(annual!=null) and (moon==null or moon == '') and (semester==null or semester == '')">
             IFNULL(SUM(sa.student_number),0)/12 AS studentNumber
@@ -152,9 +152,12 @@
         </if>
         FROM
 	        school_salary sa
-	    LEFT JOIN school_salary_item st ON sa.id = st.pid
-	        WHERE sa.is_deleted = 0
-	        AND st.is_deleted = 0
+        LEFT JOIN ( SELECT pid, IFNULL( SUM( f_salary ), 0 ) AS fSalary FROM school_salary_item WHERE is_deleted = 0
+        <if test="tenantId!=null and tenantId != ''">
+            and tenant_id = #{tenantId}
+        </if>
+        GROUP BY pid ) st ON sa.id = st.pid
+        WHERE sa.is_deleted = 0
         <if test="(annual!=null ) and (semester==null or semester == '')">
             and sa.annual = #{annual}
         </if>

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

@@ -2158,6 +2158,13 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			}
 			SalaryItem salaryItem = new SalaryItem();
 			BeanUtil.copy(salaryMessage,salaryItem);
+			salaryItem.setBasicsSalary(salaryItem.getSalaryBase());//基础工资
+			salaryItem.setWorkloadSalary(salaryItem.getCustomThree());//工作量工资
+			salaryItem.setClassTeacherSubsidy(salaryItem.getClassTeacherFee());//班主任津贴
+			salaryItem.setAwardSalary(salaryItem.getCustomAward());//奖励工资
+			salaryItem.setDutyAllowances(salaryItem.getLeadingCadreSubsidy());//职务津贴
+			salaryItem.setSubsidy(salaryItem.getYearUpPerformance());//补贴项
+			salaryItem.setDeductions(salaryItem.getRibbonOne());//扣除项
 			//根据身份证号查询教职工信息是否存在存在更新不存在新增
 			SalaryItem item = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salaryItem.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 				.eq("is_deleted", 0).eq("pid",id));