From 3e9d02e78b322831b7d346724bd2126f3b520d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 22 Apr 2022 17:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resource/sql/mysql.sql | 14 +++++++-------
.../salary/enums/salarysob/TargetTypeEnum.java | 13 +++++++------
.../service/impl/AttendQuoteDataServiceImpl.java | 8 ++++----
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/resource/sql/mysql.sql b/resource/sql/mysql.sql
index 7c688abf0..4f47ff0ed 100644
--- a/resource/sql/mysql.sql
+++ b/resource/sql/mysql.sql
@@ -1,4 +1,4 @@
---缴税人表主键自增
+# 缴税人表主键自增
alter table hrsa_tax_agent modify id bigint auto_increment;
alter table hrsa_tax_rate_base modify id bigint auto_increment;
alter table hrsa_tax_rate_detail modify id bigint auto_increment;
@@ -7,7 +7,7 @@ alter table hrsa_add_up_situation modify id bigint auto_increment;
alter table hrsa_other_deduction modify id bigint auto_increment;
alter table hrsa_attend_quote_field modify id bigint auto_increment;
alter table hrsa_attend_quote_sync_set modify id bigint auto_increment;
-alter table hrsa_attend_quote_data modify id bigint auto_increment;
+# alter table hrsa_attend_quote_data modify id bigint auto_increment;
alter table hrsa_attend_quote_data_value modify id bigint auto_increment;
alter table hrsa_salary_item modify id bigint auto_increment;
@@ -29,19 +29,19 @@ alter table hrsa_formula_var modify id bigint auto_increment;
alter table hrsa_salary_acct_result modify id bigint auto_increment;
---福利方案主键自增增加
+# 福利方案主键自增增加
alter table hrsa_social_security_scheme modify id bigint auto_increment;
alter table hrsa_scheme_detail modify id bigint auto_increment;
alter table hrsa_insurance_category modify id bigint auto_increment;
---福利档案
+# 福利档案
alter table hrsa_social_archives modify id bigint auto_increment;
alter table hrsa_fund_archives modify id bigint auto_increment;
alter table hrsa_other_archives modify id bigint auto_increment;
---福利台账
+# 福利台账
alter table hrsa_bill_batch modify id bigint auto_increment;
alter table hrsa_bill_detail modify id bigint auto_increment;
alter table hrsa_bill_detail_temp modify id bigint auto_increment;
@@ -60,12 +60,12 @@ ADD COLUMN sob_default_item_group_id bigint(0) NOT NULL COMMENT '薪资账套默
ADD COLUMN sorted_index int(0) NOT NULL COMMENT '显示顺序' AFTER sob_default_item_group_id;
--- 工资单发放
+# 工资单发放
alter table hrsa_salary_template modify id bigint auto_increment;
ALTER TABLE hrsa_salary_template MODIFY background varchar (2000);
--- 公式
+# 公式
CREATE TABLE hrsa_formula
(
id bigint NOT NULL AUTO_INCREMENT,
diff --git a/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java b/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java
index fbb11bee2..961865c72 100644
--- a/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java
+++ b/src/com/engine/salary/enums/salarysob/TargetTypeEnum.java
@@ -6,12 +6,13 @@ import com.engine.salary.enums.BaseEnum;
import java.util.Objects;
/**
- * @description: 人员范围的对象类型
- * @author: xiajun
- * @modified By: xiajun
- * @date: Created in 11/22/21 11:32 AM
- * @version:v1.0
- */
+ * 人员范围的对象类型
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
public enum TargetTypeEnum implements BaseEnum {
EMPLOYEE(1, "人员", 100133),
DEPT(2, "部门", 86185),
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index bd15e3cf5..c945a2fd2 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -360,9 +360,9 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
LocalDateRange salaryCycleRange = salarySobCycle.getSalaryCycle();
LocalDateRange attendCycleRange = salarySobCycle.getAttendCycle();
// 考勤周期
- attendQuote.setAttendCycle(attendCycleRange.getFromDate() + " ~ " + attendCycleRange.getEndDate());
+ attendQuote.setAttendCycle(SalaryDateUtil.getFormatLocalDate(attendCycleRange.getFromDate()) + " ~ " + SalaryDateUtil.getFormatLocalDate(attendCycleRange.getEndDate()));
// 薪资周期
- attendQuote.setSalaryCycle(salaryCycleRange.getFromDate() + " ~ " + salaryCycleRange.getEndDate());
+ attendQuote.setSalaryCycle(SalaryDateUtil.getFormatLocalDate(salaryCycleRange.getFromDate()) + " ~ " + SalaryDateUtil.getFormatLocalDate(salaryCycleRange.getEndDate()));
attendQuote.setSalaryYearMonth(salaryYearMonthDayDate);
// 来源：导入
attendQuote.setSourceType(sourceType.getValue());
@@ -547,7 +547,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
List employees = employeeBiz.listEmployee();
// 获取已设置的可同步的考勤字段
List attendQuoteFields = getAttendQuoteSetFields(AttendQuoteSourceTypeEnum.IMPORT);
- // 获取考勤引用
+ // 生成获取考勤引用
AttendQuotePO attendQuote = getAttendQuote(AttendQuoteSourceTypeEnum.IMPORT, salarySobId, year, month, StringUtils.EMPTY);
int total = 0;
@@ -643,7 +643,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa
errorSum += StringUtils.isEmpty(bigDecimalValue) ? 1 : 0;
if (StringUtils.isNotEmpty(bigDecimalValue)) {
values.add(AttendQuoteDataValuePO.builder()
- .id(IdGenerator.generate())
+// .id(IdGenerator.generate())
.createTime(now)
.updateTime(now)
.creator((long) user.getUID())