薪资代码

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/salary/controller/SalaryAttendanceController.java

@@ -347,14 +347,14 @@ public class SalaryAttendanceController {
         String type = salaryAttendance.getType();//月度工资单、年休工资单、加班工资单
         String yearWithMonth = salaryAttendance.getYearWithMonth();//除年休时本字段有值，2024-01；年休时为空
 
-        if(type.equals("考勤表")
-                && (yearWithMonth.equals("2024-01")
-                || yearWithMonth.equals("2024-02")
-                || yearWithMonth.equals("2024-03")
-                || yearWithMonth.equals("2024-04")
-                || yearWithMonth.equals("2024-05"))){
-            return Result.error("2024-01至2024-05为初始数据，请勿操作！！");
-        }
+//        if(type.equals("考勤表")
+//                && (yearWithMonth.equals("2024-01")
+//                || yearWithMonth.equals("2024-02")
+//                || yearWithMonth.equals("2024-03")
+//                || yearWithMonth.equals("2024-04")
+//                || yearWithMonth.equals("2024-05"))){
+//            return Result.error("2024-01至2024-05为初始数据，请勿操作！！");
+//        }
 
         if(StringUtils.isEmpty(salaryAttendance.getId()) || "false".equals(salaryAttendance.getId())){
             QueryWrapper<SalaryAttendance> queryWrapper = new QueryWrapper<>();

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/salary/service/impl/SalaryManagementServiceImpl.java

@@ -513,15 +513,15 @@ public class SalaryManagementServiceImpl extends ServiceImpl<SalaryManagementMap
         }
 
         String yearWithMonth = salaryManagement.getYearWithMonth();//除年休时本字段有值，2024-01；年休时为空
-        if(type.equals("月度工资单")
-                && (yearWithMonth.equals("2024-01")
-                || yearWithMonth.equals("2024-02")
-                || yearWithMonth.equals("2024-03")
-                || yearWithMonth.equals("2024-04")
-                || yearWithMonth.equals("2024-05"))){
-            return Result.error("2024-01至2024-05为初始数据，请勿操作！！");
-        }
-
+//        if(type.equals("月度工资单")
+//                && (yearWithMonth.equals("2024-01")
+//                || yearWithMonth.equals("2024-02")
+//                || yearWithMonth.equals("2024-03")
+//                || yearWithMonth.equals("2024-04")
+//                || yearWithMonth.equals("2024-05"))){
+//            return Result.error("2024-01至2024-05为初始数据，请勿操作！！");
+//        }
+//
 
 
         String endMonth = salaryManagement.getEndMonth(); //加班时此字段有值；其他时为空