Merge branch 'feature/archive' into develop

resource/sql/薪资还原脚本.sql

@@ -14,6 +14,18 @@ delete from hrsa_attend_quote_field     where 1=1
 ;
 delete from hrsa_attend_quote_sync_set     where 1=1
 ;
+
+
+delete from hrsa_scheme_detail     where 1=1
+;
+delete from hrsa_social_archives     where 1=1
+;
+delete from hrsa_fund_archives     where 1=1
+;
+delete from hrsa_other_archives     where 1=1
+;
+
+
 delete from hrsa_bill_batch     where 1=1
 ;
 
@@ -23,6 +35,10 @@ delete from hrsa_bill_detail_temp     where 1=1
 ;
 delete from hrsa_bill_inspect     where 1=1
 ;
+
+delete from hrsa_insurance_category     where 1=1
+;
+
 delete from hrsa_check_result     where 1=1
 ;
 delete from hrsa_check_result_record     where 1=1
@@ -31,10 +47,7 @@ delete from hrsa_ck_result_detail_temp     where 1=1
 ;
 delete from hrsa_excel_acct_result     where 1=1
 ;
-delete from hrsa_fund_archives     where 1=1
-;
-delete from hrsa_other_archives     where 1=1
-;
+
 delete from hrsa_other_deduction     where 1=1
 ;
 delete from hrsa_salary_acct_emp     where 1=1
@@ -71,11 +84,6 @@ delete from hrsa_salary_sob_range     where 1=1
 ;
 delete from hrsa_salary_template     where 1=1
 ;
-delete from hrsa_scheme_detail     where 1=1
-;
-delete from hrsa_social_archives     where 1=1
-;
-
 
 delete from hrsa_social_security_scheme     where 1=1
 ;
@@ -108,8 +116,6 @@ delete from hrsa_tax_rate_base     where 1=1
 ;
 delete from hrsa_tax_rate_detail     where 1=1
 ;
-delete from hrsa_insurance_category     where 1=1
-;
 delete from hrsa_salary_acct_result_report     where 1=1
 ;
 

src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveFormDTO.java

@@ -32,6 +32,11 @@ public class SalaryArchiveFormDTO {
     //基本信息
     private Map<String,Object> baseInfo;
 
+    /**
+     * 发薪设置
+     */
+    private Map<String,Object> paySet;
+
     //薪资档案
     private List<Map<String, Object>> adjustSalaryItems;
 

src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java

@@ -2,6 +2,7 @@ package com.engine.salary.entity.salaryarchive.po;
 
 import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
 import com.engine.salary.enums.salaryarchive.SalaryArchiveAddTypeEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -40,11 +41,13 @@ public class SalaryArchivePO {
     /**
      * 起始发薪日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date payStartDate;
 
     /**
      * 最后发薪日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date payEndDate;
 
     /**

src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml

@@ -555,7 +555,7 @@
         <set>
             run_status='STOP_FROM_SUSPEND'
         </set>
-        WHERE run_status = 'FIXED' and pay_end_date is not null
+        WHERE run_status = 'SUSPEND' and pay_end_date is not null
         and id IN
         <foreach collection="ids" open="(" item="id" separator="," close=")">
             #{id}

src/com/engine/salary/wrapper/SalaryArchiveWrapper.java

@@ -344,6 +344,10 @@ public class SalaryArchiveWrapper extends Service {
 
         List<Map<String, Object>> salaryItems = Lists.newArrayList();
 
+        // 2.发薪设置表单
+        Map<String,Object> paySetForm = new HashMap<>();
+        paySetForm.put("data",po);
+
 
         // 获取所有可被引用的薪资项目
         List<SalaryItemPO> salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems();
@@ -363,6 +367,7 @@ public class SalaryArchiveWrapper extends Service {
                 .id(salaryArchiveId)
                 .employeeId(employee.getEmployeeId())
                 .baseInfo(baseInfo)
+                .paySet(paySetForm)
                 .adjustSalaryItems(salaryItems)
                 .build();
     }