二开，引用上月数据功能

# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties

resource/WEB-INF/prop/hrmSalary.properties

@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=3.0.2.250430.02
+version=3.0.2.2504.03
 openFormulaForcedEditing=false

resource/sqlupgrade/Oracle/sql202504020203.sql

@@ -34,8 +34,8 @@ CREATE TABLE hrsa_push_record_detail
 )
 /
 
-ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000);
+ALTER TABLE hrsa_push_record ADD fail_reason varchar2(4000)
 /
 
-ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000);
+ALTER TABLE hrsa_push_record_detail ADD fail_reason varchar2(4000)
 /

resource/sqlupgrade/Oracle/sql202504030103.sql

@@ -1,5 +1,5 @@
-ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER;
+ALTER TABLE hrsa_push_setting_item ADD sorted_index NUMBER
 /
 
-ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0);
+ALTER TABLE hrsa_push_record_detail ADD data_id NUMBER(38,0)
 /

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

@@ -497,6 +497,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
         if (salarySendInfo == null) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));
         }
+
+        if (!Objects.equals(salarySendInfo.getSendStatus(), 1)) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100511, "工资单信息不存在"));
+        }
+
         Long employeeId = salarySendInfo.getEmployeeId();
         if (currentEmployeeId.compareTo(employeeId) != 0) {
 
@@ -1386,7 +1391,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
     }
 
 
-
     @Override
     public Map<String, Object> withdraw(SalarySendWithdrawParam param) {
         if (param.getSalarySendId() == null) {

src/com/engine/salary/util/excel/ExcelUtilPlus.java

@@ -6,6 +6,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
+import weaver.wechat.util.Utils;
 
 import java.awt.Color;
 import java.math.BigDecimal;
@@ -134,7 +135,7 @@ public class ExcelUtilPlus {
             rowZeroCell.setCellValue(columnGroupItem.getText());
             rowZeroCell.setCellStyle(titleCellStyle);
             //设置列宽
-            sheet.setColumnWidth(i, Math.min(255, Math.max(12, columnGroupItem.getText().length() * 4)) * 256);
+            sheet.setColumnWidth(i, Math.min(255, Math.max(12, Utils.null2String(columnGroupItem.getText()).length() * 4)) * 256);
             patternList.add(columnGroupItem.getPattern());
         }