fixBUG

src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveItemSaveParam.java

@@ -39,6 +39,9 @@ public class SalaryArchiveItemSaveParam {
     //生效时间
     private Date effectiveTime;
 
+    // 是否允许编辑
+    private Boolean canOperator;
+
     /**
      * 调整原因
      *
@@ -52,6 +55,8 @@ public class SalaryArchiveItemSaveParam {
     //薪资项目
     private List<SalaryArchiveItemDetailSaveParam> salaryArchiveItems;
 
+
+
     public static void checkParam(SalaryArchiveItemSaveParam saveParam) {
         if (saveParam.getSalaryArchiveId() == null) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100305, "薪资档案id必传"));

src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java

@@ -260,14 +260,18 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
                 }
             }
 
-
             // 1.检验是否可以调整
             if (effectiveSalaryItem != null) {
                 // 当前已经生效的时间
                 Date effectiveTime = effectiveSalaryItem.getEffectiveTime();
                 // 1.1 如果保存的生效日期早于<当前已生效
                 if (saveEffectiveTime.before(effectiveTime)) {
-                    throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期"));
+                    if(salaryArchiveItemSaveParam.getCanOperator() == Boolean.TRUE){
+                        throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期,仅修改备注"));
+                    }
+                    // 仅可编辑说明
+                    salaryArchiveItemMapper.updateIgnoreNull( SalaryArchiveItemPO.builder().id(salaryArchiveItemSaveParam.getSalaryArchiveItemId())
+                            .description(salaryArchiveItemSaveParam.getDescription()).build());
                 }
             }
         });