push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -13,6 +13,7 @@ import com.yd.csf.feign.dto.salary.ApiSalaryBatchAddDTO;
 import com.yd.csf.feign.dto.salary.CalculateTotalAmountDTO;
 import com.yd.csf.feign.dto.salaryremittance.ApiSalaryRemittanceDTO;
 import com.yd.csf.feign.dto.salaryremittance.ApiSalaryRemittanceFzDTO;
+import com.yd.csf.feign.enums.SalaryStatusEnum;
 import com.yd.csf.feign.request.salary.*;
 import com.yd.csf.feign.response.salary.ApiSalaryDetailResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
@@ -120,6 +121,8 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
         salary.setSalaryNo(CodeGenerator.generate10Code("SN"));
         //薪资单表唯一业务ID
         salary.setSalaryBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY.getCode()));
+        //1-待提交
+        salary.setStatus(SalaryStatusEnum.DTJ.getItemValue());
         iSalaryService.saveOrUpdate(salary);
 
         //保存薪资汇款明细

yd-csf-feign/src/main/java/com/yd/csf/feign/enums/SalaryStatusEnum.java

+package com.yd.csf.feign.enums;
+
+/**
+ * 薪资单状态枚举
+ */
+public enum SalaryStatusEnum {
+
+    DTJ("待提交","1"),
+    DHD("待核对","2"),
+    YHD("已核对","3"),
+    TH("退回修改","4"),
+    YTS("已推送","5"),
+    ;
+
+    //字典项标签（名称）
+    private String itemLabel;
+    //字典项值
+    private String itemValue;
+
+    //构造函数
+    SalaryStatusEnum(String itemLabel, String itemValue) {
+        this.itemLabel = itemLabel;
+        this.itemValue = itemValue;
+    }
+
+    public String getItemLabel() {
+        return itemLabel;
+    }
+
+    public String getItemValue() {
+        return itemValue;
+    }
+}

yd-csf-service/src/main/java/com/yd/csf/service/model/Salary.java

@@ -110,7 +110,7 @@ public class Salary implements Serializable {
     private String otherRemark;
 
     /**
-     * 薪资单状态：1-待审核提交 2-待审核 3-审核退回 4-待核对提交 5-待核对 6-核对退回 7-已核对 8-已推送 9-已取消
+     * 薪资单状态：1-待提交 2-待核对 3-已核对 4-退回 5-已推送
      */
     @TableField("status")
     private String status;